Merge remote-tracking branch 'upstream/develop-8.0' into merge-develop-8.0-25.07.2016

livecodepanos · livecodepanos · commit dac38a1c8ebd · 2016-07-25T13:10:42.000+01:00
diff --git a/builder/tools_builder.livecodescript b/builder/tools_builder.livecodescript
@@ -78,7 +78,13 @@ end toolsBuilderRunBundle
 
 private command toolsBuilderFilterExternals pFolder, pPlatform
    -- Enter the extension directory
+   local tOldFolder
+   put the defaultFolder into tOldFolder
    set the defaultFolder to pFolder
+   if the result is not empty then
+      builderLog "error", merge("Failed to enter '[[pFolder]]': [[the result]]")
+      exit toolsBuilderFilterExternals
+   end if
 
    local tFiles
    -- Remove any iOS code if we're not building the OSX installer
@@ -101,15 +107,20 @@ private command toolsBuilderFilterExternals pFolder, pPlatform
          revZipCloseArchive pFolder & slash & tLCExt
          
          if tArchiveFiles is not empty then
-            get shell(merge("rm -f '[[ tLCExt ]]'"))
+            get shell(merge("rm -fv '[[ tLCExt ]]'"))
          end if
       end repeat
    end if
 
    -- If the directory contains no code any more, remove it
    put the files & return & the folders into tFiles
    filter lines of tFiles with regex pattern "^.*\.(so|dylib|bundle|dll|lcext)$"
-   
+
+   set the defaultFolder to tOldFolder
+   if the result is not empty then
+      builderLog "error", merge("Failed to enter '[[tOldFolder]]': [[the result]]")
+   end if
+
    return tFiles is not empty
 end toolsBuilderFilterExternals
 
diff --git a/docs/notes/bugfix-17633.md b/docs/notes/bugfix-17633.md
@@ -0,0 +1 @@
+# Fix long delay when launching standalone displaying a browser widget
diff --git a/docs/notes/bugfix-18045.md b/docs/notes/bugfix-18045.md
@@ -0,0 +1 @@
+# Make sure cookie filePath is set correctly
diff --git a/engine/src/module-engine.cpp b/engine/src/module-engine.cpp
@@ -750,9 +750,15 @@ extern "C" MC_DLLEXPORT_DEF bool MCEngineRunloopWait()
 	return true;
 }
 
+static void break_no_op(void*)
+{
+}
+
 extern "C" MC_DLLEXPORT_DEF void MCEngineRunloopBreakWait()
 {
-	MCNotifyPing(false);
+	// IM-2016-07-21: [[ Bug 17633 ]] Need to give notify dispatch something
+	//    to do as just pinging the queue doesn't break out of the wait loop.
+	MCNotifyPush(break_no_op, nil, false, true);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/engine/src/srvoutput.cpp b/engine/src/srvoutput.cpp
@@ -511,7 +511,7 @@ bool MCServerSetCookie(MCStringRef p_name, MCStringRef p_value, uint32_t p_expir
 	{
         MCservercgicookies[t_index].name = MCStringIsEmpty(p_name) ? strdup("") : strdup(MCStringGetCString(p_name));
 		MCservercgicookies[t_index].value = strdup(MCStringGetCString(*t_encoded));
-        MCservercgicookies[t_index].path = MCStringIsEmpty(p_domain) ? strdup("") : strdup(MCStringGetCString(p_path));
+        MCservercgicookies[t_index].path = MCStringIsEmpty(p_path) ? strdup("") : strdup(MCStringGetCString(p_path));
         MCservercgicookies[t_index].domain = MCStringIsEmpty(p_domain) ? strdup("") : strdup(MCStringGetCString(p_domain));
 
 		MCservercgicookies[t_index].expires = p_expires;
diff --git a/extensions/widgets/switchbutton/notes/18054.md b/extensions/widgets/switchbutton/notes/18054.md
@@ -0,0 +1 @@
+# [18054] Ensure that appearance reflects loaded state
diff --git a/extensions/widgets/switchbutton/switchbutton.lcb b/extensions/widgets/switchbutton/switchbutton.lcb
@@ -224,8 +224,12 @@ public handler OnSave(out rProperties as Array)
 end handler
 
 public handler OnLoad(in pProperties as Array)
-	put pProperties["highlight"] into mSwitchIsOn
-	put pProperties["showBorder"] into mShowFrameBorder
+	if "highlight" is among the keys of pProperties then
+		setSwitch(pProperties["highlight"])
+	end if
+	if "showBorder" is among the keys of pProperties then
+		setShowFrameBorder(pProperties["showBorder"])
+	end if
 end handler
 
 public handler OnCreate() returns nothing
diff --git a/libscript/src/arithmetic.lcb b/libscript/src/arithmetic.lcb
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2015 LiveCode Ltd.
+/* Copyright (C) 2003-2016 LiveCode Ltd.
  
  This file is part of LiveCode.
  
@@ -532,8 +532,10 @@ The result:	<Operand> formatted as a string.
 
 Example:
 	variable tNum as Number
+	variable tString as String
 	put 5 into tNum
-	format tNum as string -- the result contains "5"
+	format tNum as string into tString
+	-- tString contains "5"
 
 Description:
 Use <FormatNumberAsString> when you want to manipulate a numeric value as text.
@@ -591,11 +593,11 @@ Example:
 	parse tString as Number -- the result is 5.6
 
 Example:
-	variable tResult as String
+	variable tResult as optional String
 	variable tNum as optional Number
-	parse "aaaa" as Number
+	parse "aaaa" as Number into tNum
 	
-	if the result is nothing then
+	if tNum is nothing then
 		put "unable to parse string" into tResult
 	end if
 
@@ -658,7 +660,8 @@ Example:
 	variable tListOfString as List
 	variable tListOfNum as List
 	split "1,2,3,4" by "," into tListOfString
-	parse tListOfString as list of number -- the result contains [ 1, 2, 3, 4 ]
+	parse tListOfString as list of number into tListOfNum
+	-- tListOfNum contains [ 1, 2, 3, 4 ]
 
 Description:
 Use <ParseListOfStringAsListOfNumber> when you want to interpret pieces of text numerically. If the input list contains elements which cannot be parsed as numbers, the corresponding element will be nothing.
diff --git a/libscript/src/logic.lcb b/libscript/src/logic.lcb
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2015 LiveCode Ltd.
+/* Copyright (C) 2003-2016 LiveCode Ltd.
  
  This file is part of LiveCode.
  
@@ -169,8 +169,7 @@ The result:	"true" or "false"
 
 Example:
 	variable tVar as String
-	parse 1 = 0 as String
-	put the result into tVar
+	format 1 = 0 as String into tVar
 	put "e" into char 3 of tVar -- tVar is "tree"
 
 Description:
@@ -225,8 +224,9 @@ Example:
 
 Example:
 	variable tResult as String
-	parse "sdfsdf" as Boolean
-	if the result is nothing then
+	variable tCheck as optional Boolean
+	parse "sdfsdf" as boolean into tCheck
+	if tCheck is nothing then
 		put "not a valid boolean" into tResult
 	end if
 
diff --git a/libscript/src/type-convert.lcb b/libscript/src/type-convert.lcb
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2015 LiveCode Ltd.
+/* Copyright (C) 2003-2016 LiveCode Ltd.
  
  This file is part of LiveCode.
  
@@ -38,8 +38,7 @@ Example:
 	variable tVar as String
     put "first,second,third,fourth,fifth" into tVar
     variable tSplit as List
-    split tVar by ","
-    put the result into tSplit
+    split tVar by "," into tSplit
     put element 1 of tSplit into tFirstElement // tFirstElement contains "first"
     
 Description:
@@ -64,13 +63,13 @@ Delimiter:      An expression that evaluates to a string.
 The result: 	The combined string.
 
 Example:
-	variable tDigits as List
-	put [1,2,3,4,5,6,7,8,9] into tDigits
+	variable tWords as List
+	put ["A","List","of","words"] into tWords
 	
 	variable tString as String
-    combine tDigits with "|" 
-    put the result into tString // tString contains "1|2|3|4|5|6|7|8|9"
-            
+	combine tWords with " " into tString
+	-- tString contains "A List of words"
+
 Description:
 Use the combine command to convert a list into a string representation of the list.
 
diff --git a/tests/lcb/stdlib/arithmetic.lcb b/tests/lcb/stdlib/arithmetic.lcb
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2015 LiveCode Ltd.
+Copyright (C) 2015-2016 LiveCode Ltd.
 
 This file is part of LiveCode.
 
@@ -208,9 +208,17 @@ public handler TestLessThanEqual()
 end handler
 
 public handler TestFormatString()
-	test "format as string (int)" when (-1) formatted as string is "-1"
+	test "formatted as string (int)" when (-1) formatted as string is "-1"
 
-	test "format as string (real)" when (-1.1) formatted as string is "-1.1"
+	test "formatted as string (real)" when (-1.1) formatted as string is "-1.1"
+
+	variable tString as String
+
+	format -1 as string into tString
+	test "format as string (int)" when tString is "-1"
+
+	format -1.1 as string into tString
+	test "format as string (real)" when tString is "-1.1"
 end handler
 
 public handler TestParseString()
diff --git a/tests/lcb/stdlib/logic.lcb b/tests/lcb/stdlib/logic.lcb
@@ -0,0 +1,24 @@
+module com.livecode.logic.tests
+
+public handler TestFormatString()
+	test "formatted as string" when true formatted as string is "true"
+
+	variable tString as String
+
+	format false as string into tString
+	test "format as string" when tString is "false"
+end handler
+
+public handler TestParseString()
+	test "parsed as boolean" when "true" parsed as boolean
+
+	variable tBool as optional Boolean
+
+	parse "false" as boolean into tBool
+	test "parse as boolean" when not tBool
+
+	parse "sdfthtoeu" as boolean into tBool
+	test "parse as boolean (invalid)" when tBool is nothing
+end handler
+
+end module
diff --git a/tests/lcb/stdlib/typeconvert.lcb b/tests/lcb/stdlib/typeconvert.lcb
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2015 LiveCode Ltd.
+Copyright (C) 2015-2016 LiveCode Ltd.
 
 This file is part of LiveCode.
 
@@ -17,6 +17,8 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 module com.livecode.typeconvert.tests
 
+use com.livecode.__INTERNAL._testlib
+
 public handler TestSplit()
 	-- Bug 15440
 	variable tString
@@ -35,4 +37,23 @@ public handler TestSplitEmpty()
 	test "split (empty)" when the number of elements in tList is 1
 end handler
 
+private handler TestCombine_NonString()
+	variable tString
+	combine [1, 2, 3] with "," into tString
+end handler
+
+public handler TestCombine()
+	variable tString
+	variable tList
+	put ["a", "b", "c"] into tList
+
+	combine tList with "," into tString
+	test "combine (comma)" when the number of chars in tString is 5
+
+	combine tList with "" into tString
+	test "combine (empty)" when the number of chars in tString is 3
+
+	MCUnitTestHandlerThrows(TestCombine_NonString, "combine non-string")
+end handler
+
 end module

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix long delay when launching standalone displaying a browser widget`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Make sure cookie filePath is set correctly`
Original file line number	Diff line number	Diff line change
`@@ -750,9 +750,15 @@ extern "C" MC_DLLEXPORT_DEF bool MCEngineRunloopWait()`
`750`	`750`	`return true;`
`751`	`751`	`}`
`752`	`752`
	`753`	`+static void break_no_op(void*)`
	`754`	`+{`
	`755`	`+}`
	`756`	`+`
`753`	`757`	`extern "C" MC_DLLEXPORT_DEF void MCEngineRunloopBreakWait()`
`754`	`758`	`{`
`755`		`- MCNotifyPing(false);`
	`759`	`+ // IM-2016-07-21: [[ Bug 17633 ]] Need to give notify dispatch something`
	`760`	`+ // to do as just pinging the queue doesn't break out of the wait loop.`
	`761`	`+ MCNotifyPush(break_no_op, nil, false, true);`
`756`	`762`	`}`
`757`	`763`
`758`	`764`	`////////////////////////////////////////////////////////////////////////////////`
Original file line number	Diff line number	Diff line change
`@@ -511,7 +511,7 @@ bool MCServerSetCookie(MCStringRef p_name, MCStringRef p_value, uint32_t p_expir`
`511`	`511`	`{`
`512`	`512`	`MCservercgicookies[t_index].name = MCStringIsEmpty(p_name) ? strdup("") : strdup(MCStringGetCString(p_name));`
`513`	`513`	`MCservercgicookies[t_index].value = strdup(MCStringGetCString(*t_encoded));`
`514`		`- MCservercgicookies[t_index].path = MCStringIsEmpty(p_domain) ? strdup("") : strdup(MCStringGetCString(p_path));`
	`514`	`+ MCservercgicookies[t_index].path = MCStringIsEmpty(p_path) ? strdup("") : strdup(MCStringGetCString(p_path));`
`515`	`515`	`MCservercgicookies[t_index].domain = MCStringIsEmpty(p_domain) ? strdup("") : strdup(MCStringGetCString(p_domain));`
`516`	`516`
`517`	`517`	`MCservercgicookies[t_index].expires = p_expires;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# [18054] Ensure that appearance reflects loaded state`