Merge remote-tracking branch 'origin/develop-7.0' into develop

livecodesebastien · livecodesebastien · commit b1c13996ed0a · 2015-11-18T18:12:10.000Z
Unreviewed changes:
 * `config/linux.gypi`: changes ported to `config/linux-settings.gypi`

 * docs/dictionary/operator/bitNot.xml: changes ported to `bitNot.lcdoc`

 * engine/src/osxprinter.cpp
 * engine/src/stackcache.cpp
 * engine/src/sysspec.cpp
 * libfoundation/src/foundation-value.cpp

Changes to be committed:
	modified:   config/ios.gypi
	modified:   config/linux-settings.gypi
The following files had to be modified to cope with `-Werror=tautological-compare` flag on iOS and Mac
 * libbrowser/src/libbrowser.cpp
 * libbrowser/src/libbrowser_android.cpp
 * libbrowser/src/libbrowser_desktop_factories.cpp
 * libbrowser/src/libbrowser_internal.h
 * libbrowser/src/libbrowser_ios_factories.cpp
diff --git a/config/ios.gypi b/config/ios.gypi
@@ -192,6 +192,7 @@
 							'-Wno-unused-parameter',
 							'-Werror=uninitialized',
 							'-Werror=return-type',
+							'-Werror=tautological-compare',
 						],
 					},
 				},
diff --git a/config/linux-settings.gypi b/config/linux-settings.gypi
@@ -68,6 +68,9 @@
 					'-Wall',
 					'-Wextra',
 					'-Wno-unused-parameter',	# Just contributes build noise
+					'-Wno-return-type',
+					'-Werror=uninitialized',
+					'-Werror=return-type',
 				],
 			},
 			{
@@ -76,8 +79,6 @@
 					'-w',						# Disable warnings
 					'-fpermissive',				# Be more lax with old code
 					'-Wno-return-type',
-					'-Werror=uninitialized',
-					'-Werror=return-type',
 				],
 				
 				'cflags_c':
diff --git a/config/mac.gypi b/config/mac.gypi
@@ -121,6 +121,7 @@
 							'-Wno-unused-parameter',
 							'-Werror=uninitialized',
 							'-Werror=return-type',
+							'-Werror=tautological-compare',
 						],
 					},
 				},
diff --git a/docs/dictionary/operator/bitNot.lcdoc b/docs/dictionary/operator/bitNot.lcdoc
@@ -4,7 +4,7 @@ Type: operator
 
 Syntax: bitNot <number> 
 
-Summary: Performs a "bitwise not" <operation> on the <binary> representation of a number.
+Summary: Performs a "bitwise not" <operation> on the <binary> representation of a number as an unsigned, 32-bit integer
 
 Introduced: 1.0
 
@@ -13,10 +13,10 @@ OS: mac,windows,linux,ios,android
 Platforms: desktop,server,web,mobile
 
 Example:
-bitNot 1 -- evaluates to 0
+bitNot 1 -- evaluates to 4294967294
 
 Example:
-bitNot 14 -- in binary: bitNot 1110; evaluates to 0001; converted to 1
+bitNot 14 -- in binary: bitNot 0000000000001110; evaluates to 1111111111110001; converted to 4294967281
 
 Parameters:
 number: A number, or an expression that evaluates to a number, between zero and 4,294,967,295 (2^32 - 1).
diff --git a/docs/notes/bugfix-16223.md b/docs/notes/bugfix-16223.md
@@ -0,0 +1 @@
+# 'the folders' doesn't return ".." if there are no other folders on MacOSX
diff --git a/docs/notes/bugfix-16278.md b/docs/notes/bugfix-16278.md
@@ -0,0 +1 @@
+# Release Notes should clearly state supported Xcode versions
diff --git a/docs/notes/bugfix-16288.md b/docs/notes/bugfix-16288.md
@@ -0,0 +1 @@
+# Crash on standalone shutdown
diff --git a/docs/notes/bugfix-16308.md b/docs/notes/bugfix-16308.md
@@ -0,0 +1 @@
+# Incomplete RTF generated when text contains hyperlinks
diff --git a/docs/notes/bugfix-16395.md b/docs/notes/bugfix-16395.md
@@ -0,0 +1 @@
+# bitNot dictionary example incorrect
diff --git a/docs/notes/bugfix-16445.md b/docs/notes/bugfix-16445.md
@@ -0,0 +1 @@
+# setting hiliteFill of a button sets its autoArm property
diff --git a/docs/notes/platforms.md b/docs/notes/platforms.md
@@ -36,4 +36,22 @@ The Mac engine supports:
 *10.7.x (Lion) on Intel
 *10.8.x (Mountain Lion) on Intel
 *10.9.x (Mavericks) on Intel
+*10.10.x (Yosemite) on Intel
+*10.11.x (El Capitan) on Intel
 * **Note:** The engine runs as a 32-bit application regardless of the capabilities of the underlying processor.*
+## iOS
+iOS deployment is possible when running LiveCode IDE on a Mac, and provided Xcode is installed and has been set in LiveCode *Preferences* (in the *Mobile Support* pane).
+Currently, the supported versions of Xcode are:
+*Xcode 4.6 on MacOS X 10.7
+*Xcode 5.1 on MacOS X 10.8
+*Xcode 6.2 on MacOS X 10.9
+*Xcode 6.2, 6.4 and 7.1 on Mac OS X 10.10
+*Xcode 7.1 on MacOS X 10.11
+
+It is also possible to set other versions of Xcode, to allow testing on a wider range of iOS simulators. For instance, on Yosemite, you can add *Xcode 5.1* in the *Mobile Support* preferences, to let you test your stack on the *iOS Simulator 7.1*.
+We currently support the following iOS Simulators:
+*6.1
+*7.1
+*8.2
+*8.4
+*9.1
diff --git a/engine/src/deploy_capsule.cpp b/engine/src/deploy_capsule.cpp
@@ -542,7 +542,7 @@ bool MCDeployCapsuleGenerate(MCDeployCapsuleRef self, MCDeployFileRef p_file, MC
 			
 			// This is a section for which data has been supplied so first write
 			// out the header.
-			if (t_section -> length >= 1 << 24 || t_section -> type >= 128)
+			if (t_section -> length >= 1 << 24 || (integer_t)t_section -> type >= 128)
 			{
 				// MW-2009-07-14: Probably best to make sure we fill the *right* indices in the
 				//   header array :o)
diff --git a/engine/src/dskmac.cpp b/engine/src/dskmac.cpp
@@ -6113,8 +6113,8 @@ struct MCMacDesktop: public MCSystemInterface, public MCMacSystemService
         
         FSRef t_defaultfolder_fsref;
         OSErr t_os_error;
-        if (t_defaultfolder != NULL)
-            t_os_error = FSPathMakeRef((const UInt8 *)t_defaultfolder, &t_defaultfolder_fsref, NULL);
+        
+        t_os_error = FSPathMakeRef((const UInt8 *)t_defaultfolder, &t_defaultfolder_fsref, NULL);
 		
         FSCatalogInfo t_catalog_info;
         if (t_os_error == noErr)
diff --git a/engine/src/exec-interface-button.cpp b/engine/src/exec-interface-button.cpp
@@ -409,12 +409,12 @@ void MCButton::SetHiliteBorder(MCExecContext& ctxt, bool setting)
 
 void MCButton::GetHiliteFill(MCExecContext& ctxt, bool& r_setting)
 {
-	r_setting = getflag(F_AUTO_ARM);
+	r_setting = getflag(F_HILITE_FILL);
 }
 
 void MCButton::SetHiliteFill(MCExecContext& ctxt, bool setting)
 {
-	if (changeflag(setting, F_AUTO_ARM))
+	if (changeflag(setting, F_HILITE_FILL))
 		Redraw();
 }
 
diff --git a/engine/src/exec-interface-graphic.cpp b/engine/src/exec-interface-graphic.cpp
@@ -1044,9 +1044,7 @@ MCExecEnumTypeInfo *kMCInterfaceGradientFillQualityTypeInfo = &_kMCInterfaceGrad
 void MCGraphic::SetForeColor(MCExecContext& ctxt, const MCInterfaceNamedColor& color)
 {
     // PM-2015-21-01: When the graphic has a strokegradient, make sure we can set a fore color of the form "rrr,ggg,bbb" (where color.name == nil)
-    bool t_has_color;
-    t_has_color = &color . color != NULL;
-    if (t_has_color && m_stroke_gradient != nil)
+    if (m_stroke_gradient != nil)
     {
         MCGradientFillFree(m_stroke_gradient);
         m_stroke_gradient = nil;
@@ -1058,9 +1056,7 @@ void MCGraphic::SetBackColor(MCExecContext& ctxt, const MCInterfaceNamedColor& c
 {
     // PM-2015-21-01: [[ Bug 14399 ]] Remove fillgradient when setting the bg color of a graphic
     // Also make sure we can set a bg color of the form "rrr,ggg,bbb" (where color.name == nil)
-    bool t_has_color;
-    t_has_color = &color . color != NULL;
-    if (t_has_color && m_fill_gradient != nil)
+    if (m_fill_gradient != nil)
     {
         MCGradientFillFree(m_fill_gradient);
         m_fill_gradient = nil;
diff --git a/engine/src/exec.cpp b/engine/src/exec.cpp
@@ -2657,7 +2657,7 @@ void MCExecStoreProperty(MCExecContext& ctxt, const MCPropertyInfo *prop, void *
         {
             uinteger_t t_value;
             MCExecTypeConvertAndReleaseAlways(ctxt, p_value . type, &p_value, kMCExecValueTypeUInt, &t_value);
-            if (t_value < 0 || t_value > 65535)
+            if (t_value > 65535)
                 ctxt . LegacyThrow(EE_PROPERTY_NAN);
             if (!ctxt . HasError())
                 ((void(*)(MCExecContext&, void *, uinteger_t))prop -> setter)(ctxt, mark, t_value);
@@ -2904,7 +2904,7 @@ void MCExecStoreProperty(MCExecContext& ctxt, const MCPropertyInfo *prop, void *
             {
                 t_value_ptr = &t_value;
                 MCExecTypeConvertAndReleaseAlways(ctxt, p_value . type, &p_value, kMCExecValueTypeUInt, &t_value);
-                if (t_value < 0 || t_value > 255)
+                if (t_value > 255)
                     ctxt . LegacyThrow(EE_PROPERTY_NAN);
             }
             
@@ -2944,7 +2944,7 @@ void MCExecStoreProperty(MCExecContext& ctxt, const MCPropertyInfo *prop, void *
             {
                 t_value_ptr = &t_value;
                 MCExecTypeConvertAndReleaseAlways(ctxt, p_value . type, &p_value, kMCExecValueTypeUInt, &t_value);
-                if (t_value < 0 || t_value > 65535)
+                if (t_value > 65535)
                     ctxt . LegacyThrow(EE_PROPERTY_NAN);
             }
             
diff --git a/engine/src/fieldrtf.cpp b/engine/src/fieldrtf.cpp
@@ -429,6 +429,25 @@ static void export_rtf_emit_char_style_changes(MCStringRef p_buffer, export_rtf_
 		/* UNCHECKED */ MCStringAppendFormat(p_buffer, "\\cb%d\\chcbpat%d ", p_new . background_color_index + 1, p_new . background_color_index + 1);
 }
 
+// Properly close any open style.
+static void close_open_styles(export_rtf_t& ctxt)
+{
+    // We close all the previous styles when a link is over
+    while(ctxt . style_index > 0)
+    {
+        if (ctxt . styles[ctxt . style_index - 1] . metadata != ctxt . styles[ctxt.style_index] . metadata)
+            /* UNCHECKED */ MCStringAppend(ctxt . m_text, MCSTR("}}"));
+        
+        if (ctxt . styles[ctxt . style_index - 1] . link_text != ctxt . styles[ctxt.style_index] . link_text)
+            /* UNCHECKED */ MCStringAppend(ctxt . m_text, MCSTR("}}"));
+        
+        if (ctxt . styles[ctxt . style_index - 1] . background_color_index != ctxt . styles[ctxt.style_index] . background_color_index)
+            /* UNCHECKED */ MCStringAppend(ctxt . m_text, MCSTR("}"));
+        
+        ctxt . style_index -= 1;
+    }
+}
+
 // Emit the paragraph content. This is the second pass of rtf generation, the
 // first pass constructs the necessary tables.
 static bool export_rtf_emit_paragraphs(void *p_context, MCFieldExportEventType p_event_type, const MCFieldExportEventData& p_event_data)
@@ -673,17 +692,7 @@ static bool export_rtf_emit_paragraphs(void *p_context, MCFieldExportEventType p
 	}
 	else if (p_event_type == kMCFieldExportEventEndParagraph)
 	{
-		// Make sure any nested styles are finished.
-		while(ctxt . style_index > 0)
-		{
-            // MW-2014-06-11: [[ Bug 12556 ]] Make sure the metadata field is synced.
-            if (ctxt . styles[ctxt . style_index] . metadata != nil)
-                /* UNCHECKED */ MCStringAppendFormat(ctxt.m_text, "}");
-            if (ctxt . styles[ctxt . style_index] . link_text != nil)
-                /* UNCHECKED */ MCStringAppendFormat(ctxt.m_text, "}");
-			/* UNCHECKED */ MCStringAppendFormat(ctxt.m_text, "}");
-			ctxt . style_index -= 1;
-		}
+        close_open_styles(ctxt);
 		
 		if (ctxt . has_metadata)
 			/* UNCHECKED */ MCStringAppendFormat(ctxt.m_text, "}");
@@ -698,27 +707,28 @@ static bool export_rtf_emit_paragraphs(void *p_context, MCFieldExportEventType p
 		// with tags.
 		export_rtf_char_style_t t_new_style;
 		export_rtf_fetch_char_style(ctxt, t_new_style, p_event_data . character_style);
+
+        // SN-2015-11-17: [[ Bug 16308 ]] Fix RTF export with styles
+        // For any change in either the background colour, the metadata or the
+        // link associated with the text, we want to reset the style and start
+        // with all of them synchronised.
+        // That may not be the most efficient way, but that allows styles to
+        // overlap without any friction.
+        if (t_new_style . link_text != ctxt . styles[ctxt . style_index] . link_text
+                || t_new_style . metadata != ctxt . styles[ctxt . style_index] . metadata
+                || t_new_style . background_color_index != ctxt . styles[ctxt . style_index] . background_color_index)
+            close_open_styles(ctxt);
         
 		// Handle a change in link text.
 		if (t_new_style . link_text != ctxt . styles[ctxt . style_index] . link_text)
-		{
-            // MW-2014-06-11: [[ Bug 12556 ]] Make sure the link_text field is synced.
-			if (ctxt . styles[ctxt . style_index] . link_text != nil)
-				/* UNCHECKED */ MCStringAppendFormat(ctxt.m_text, "}}");
-
-			while(ctxt . style_index > 0)
-			{
-				/* UNCHECKED */ MCStringAppendFormat(ctxt.m_text, "}");
-				ctxt . style_index -= 1;
-			}
-
+        {
 			if (t_new_style . link_text != nil)
 			{
 				/* UNCHECKED */ MCStringAppendFormat(ctxt.m_text,
 													 "{\\field{\\*\\fldinst %s \"%@\"}{\\fldrslt ",
 													 t_new_style . link_on ? "HYPERLINK" : "LCANCHOR",
 													 t_new_style . link_text);
-				ctxt . styles[ctxt . style_index] = ctxt . styles[ctxt . style_index];
+				ctxt . styles[ctxt . style_index + 1] = ctxt . styles[ctxt . style_index];
                 ctxt . styles[ctxt . style_index + 1] . link_text = t_new_style . link_text;
 				ctxt . style_index += 1;
 			}
@@ -727,16 +737,6 @@ static bool export_rtf_emit_paragraphs(void *p_context, MCFieldExportEventType p
 		// Handle a change in metadata.
 		if (t_new_style . metadata != ctxt . styles[ctxt . style_index] . metadata)
 		{
-            // MW-2014-06-11: [[ Bug 12556 ]] Make sure the metadata field is synced.
-			if (ctxt . styles[ctxt . style_index] . metadata != nil)
-				/* UNCHECKED */ MCStringAppendFormat(ctxt.m_text, "}}");
-
-			while(ctxt . style_index > 0 && ctxt . styles[ctxt . style_index] . link_text == nil)
-			{
-				/* UNCHECKED */ MCStringAppendFormat(ctxt.m_text, "}");
-				ctxt . style_index -= 1;
-			}
-
 			if (t_new_style . metadata != nil)
 			{
 				/* UNCHECKED */ MCStringAppendFormat(ctxt.m_text, 
@@ -751,12 +751,7 @@ static bool export_rtf_emit_paragraphs(void *p_context, MCFieldExportEventType p
 		// Handle a change in background color.
 		if (t_new_style . background_color_index != ctxt . styles[ctxt . style_index] . background_color_index)
 		{
-			if (t_new_style . background_color_index == -1)
-			{
-				/* UNCHECKED */ MCStringAppendFormat(ctxt.m_text, "}");
-				ctxt . style_index -= 1;
-			}
-			else if (ctxt . styles[ctxt . style_index] . background_color_index == -1)
+            if (t_new_style . background_color_index != -1)
 			{
                 /* UNCHECKED */ MCStringAppendFormat(ctxt.m_text, "{");
 				ctxt . styles[ctxt . style_index + 1] = ctxt . styles[ctxt . style_index];
diff --git a/engine/src/mac-menu.mm b/engine/src/mac-menu.mm
@@ -324,9 +324,10 @@ - (void)quitMenuItemSelected: (id)sender
 //  so we quit!
 - (void)quitApplicationSelected: (id)sender
 {
-    NSApplication* t_app = [NSApplication sharedApplication];
-    
-    [t_app terminate:t_app];
+	// IM-2015-11-13: [[ Bug 16288 ]] Send shutdown request rather than terminating immediately
+	//    to allow shutdown in orderly fashion.
+	bool t_shutdown;
+	MCPlatformCallbackSendApplicationShutdownRequest(t_shutdown);
 }
 
 // SN-2014-11-10: [[ Bug 13836 ]] The menubar should be updated if left item is clicked
diff --git a/engine/src/operator.h b/engine/src/operator.h
@@ -242,6 +242,9 @@ class MCMultiBinaryCommutativeOperatorCtxt: public MCMultiBinaryOperator
     virtual void eval_ctxt(MCExecContext &ctxt, MCExecValue &r_value)
     {
         MCExecValue t_left, t_right;
+		t_left . type = kMCExecValueTypeNone;
+		t_right . type = kMCExecValueTypeNone;
+		
         Boolean t_old_expectation;
         
         t_old_expectation = ctxt . GetNumberExpected();
diff --git a/engine/src/osxprinter.cpp b/engine/src/osxprinter.cpp
@@ -588,7 +588,7 @@ void MCMacOSXPrinter::SetProperties(bool p_include_output)
 
 	PDEBUG(stderr, "SetProperties: PMGetDuplex\n");
 	PMDuplexMode t_pm_duplex;
-	if (PMGetDuplex != NULL && PMGetDuplex(m_settings, &t_pm_duplex) == noErr)
+	if (PMGetDuplex(m_settings, &t_pm_duplex) == noErr)
 		t_job_duplex = t_pm_duplex == kPMDuplexNone ? PRINTER_DUPLEX_MODE_SIMPLEX : (t_pm_duplex == kPMDuplexNoTumble ? PRINTER_DUPLEX_MODE_LONG_EDGE : PRINTER_DUPLEX_MODE_SHORT_EDGE);
 	else
 		t_job_duplex = PRINTER_DEFAULT_JOB_DUPLEX;
@@ -922,6 +922,7 @@ void MCMacOSXPrinter::ResetSession(void)
 	PMPrintSession t_session;
 	PMCreateSession(&t_session);
     PMSessionSetCurrentPMPrinter(t_session, m_printer);
+
 	PMSessionValidatePrintSettings(t_session, m_settings, kPMDontWantBoolean);
 	PMSessionValidatePageFormat(t_session, m_page_format, kPMDontWantBoolean);
 	
diff --git a/engine/src/path.cpp b/engine/src/path.cpp
@@ -145,19 +145,13 @@ static inline void __path_append_arc(uint1*& pr_commands, int4*& pr_data, int4 c
 
 void MCPath::release(void)
 {
-	if (this == NULL)
-		return;
-
 	f_references -= 1;
 	if (f_references == 0)
 		free(this);
 }
 
 void MCPath::retain(void)
 {
-	if (this == NULL)
-		return;
-
 	f_references += 1;
 }
 
@@ -600,17 +594,11 @@ MCPath *MCPath::create_empty(void)
 
 void MCPath::fill(MCCombiner *p_combiner, const MCRectangle& clip, bool p_even_odd)
 {
-	if (this == NULL)
-		return;
-
 	fill(f_commands, f_data, p_combiner, clip, p_even_odd);
 }
 
 void MCPath::stroke(MCCombiner *p_combiner, const MCRectangle& clip, MCStrokeStyle *p_stroke)
 {
-	if (this == NULL)
-		return;
-
 	uint2 t_width = p_stroke->width;
 	p_stroke->width *= 256;
 	stroke(f_commands, f_data, p_combiner, clip, p_stroke);
diff --git a/engine/src/syscfdate.cpp b/engine/src/syscfdate.cpp
@@ -399,12 +399,6 @@ static bool osx_cf_cache_locale(MCDateTimeLocale *p_info)
 	bool t_success;
 	t_success = true;
 	
-	if (t_success)
-	{
-		if (CFDateFormatterCreate == NULL)
-			t_success = false;
-	}
-	
 	CFLocaleRef t_locale;
 	t_locale = NULL;
 	if (t_success)
diff --git a/engine/src/sysspec.cpp b/engine/src/sysspec.cpp
diff --git a/libbrowser/src/libbrowser.cpp b/libbrowser/src/libbrowser.cpp
diff --git a/libbrowser/src/libbrowser_android.cpp b/libbrowser/src/libbrowser_android.cpp
diff --git a/libbrowser/src/libbrowser_desktop_factories.cpp b/libbrowser/src/libbrowser_desktop_factories.cpp
diff --git a/libbrowser/src/libbrowser_internal.h b/libbrowser/src/libbrowser_internal.h
diff --git a/libbrowser/src/libbrowser_ios_factories.cpp b/libbrowser/src/libbrowser_ios_factories.cpp
diff --git a/libfoundation/src/foundation-value.cpp b/libfoundation/src/foundation-value.cpp
diff --git a/tests/lcs/core/field/rtfText.livecodescript b/tests/lcs/core/field/rtfText.livecodescript
diff --git a/tests/lcs/core/files/files.livecodescript b/tests/lcs/core/files/files.livecodescript

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# 'the folders' doesn't return ".." if there are no other folders on MacOSX`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Release Notes should clearly state supported Xcode versions`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Incomplete RTF generated when text contains hyperlinks`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# setting hiliteFill of a button sets its autoArm property`