Merge remote-tracking branch 'upstream/develop-9.0' into merge-develop_9.0_05.06.18

livecodeali · livecodeali · commit 6240042cda04 · 2018-06-05T21:33:24.000+01:00
diff --git a/.gitmodules b/.gitmodules
@@ -1,11 +1,11 @@
 [submodule "ide"]
 	path = ide
 	url = https://github.com/livecode/livecode-ide
-	branch = develop
+	branch = develop-9.0
 [submodule "thirdparty"]
 	path = thirdparty
 	url = https://github.com/livecode/livecode-thirdparty
-	branch = develop
+	branch = develop-9.0
 [submodule "libcpptest/googletest"]
 	path = libcpptest/googletest
 	url = https://github.com/google/googletest.git
diff --git a/docs/lcb/notes/feature-nullable_aggregate_fields.md b/docs/lcb/notes/feature-nullable_aggregate_fields.md
@@ -0,0 +1,4 @@
+# LiveCode Builder Language
+## Nullable aggregate fields
+* Aggregate fields of Pointer type can now contain `nothing`, 
+  i.e. null pointers
diff --git a/docs/notes/bugfix-21326.md b/docs/notes/bugfix-21326.md
@@ -0,0 +1 @@
+# Ensure binary strings remain so when binary string is appended or prepended 
diff --git a/engine/src/exec-engine.cpp b/engine/src/exec-engine.cpp
@@ -704,7 +704,8 @@ void MCEngineExecPutIntoVariable(MCExecContext& ctxt, MCExecValue p_value, int p
 	else
     {
         if (MCValueGetTypeCode(p_var . mark . text) == kMCValueTypeCodeData &&
-            p_value . type == kMCExecValueTypeDataRef)
+            MCExecTypeIsValueRef(p_value.type) &&
+            MCValueGetTypeCode(p_value.valueref_value) == kMCValueTypeCodeData)
         {
             // AL-2014-11-20: Make sure the incoming exec value is released.
             MCAutoDataRef t_value_data;
diff --git a/engine/src/variable.cpp b/engine/src/variable.cpp
@@ -613,7 +613,8 @@ bool MCVariable::modify_ctxt(MCExecContext& ctxt, MCExecValue p_value, MCVariabl
 
 bool MCVariable::modify_ctxt(MCExecContext& ctxt, MCExecValue p_value, MCSpan<MCNameRef> p_path, MCVariableSettingStyle p_setting)
 {
-    if (p_value . type == kMCExecValueTypeDataRef)
+    if (MCExecTypeIsValueRef(p_value.type) &&
+        MCValueGetTypeCode(p_value.valueref_value) == kMCValueTypeCodeData)
     {
         if (can_become_data(ctxt, p_path))
         {
diff --git a/libcpptest/googletest b/libcpptest/googletest
@@ -1 +1 @@
-Subproject commit 6c73adfc03e277f55cb1e4947b3a5e6c5ff4fe46
+Subproject commit 98a0d007d7092b72eea0e501bb9ad17908a1a036
diff --git a/libfoundation/src/foundation-foreign.cpp b/libfoundation/src/foundation-foreign.cpp
@@ -1294,9 +1294,16 @@ static bool _aggregate_export(const MCForeignTypeDescriptor* desc, MCValueRef p_
             const MCForeignTypeDescriptor *t_field_desc = MCForeignTypeInfoGetDescriptor(t_field_type);
             if (t_element_type == t_field_desc->bridgetype)
             {
-                if (!t_field_desc->doexport(t_field_desc, t_element, false, t_ptr))
+                if (t_element_type == kMCNullTypeInfo)
                 {
-                    t_success = false;
+                     MCMemoryClear(t_ptr, t_size);
+                }
+                else
+                {
+                    if (!t_field_desc->doexport(t_field_desc, t_element, false, t_ptr))
+                    {
+                        t_success = false;
+                    }
                 }
             }
             else if (MCTypeInfoIsForeign(t_element_type))
diff --git a/tests/lcb/vm/foreign-aggregate.lcb b/tests/lcb/vm/foreign-aggregate.lcb
@@ -26,4 +26,18 @@ public handler TestForeignAggregate_Roundtrip()
 	end repeat
 end handler
 
+public foreign type AggregateWithPointer binds to "MCAggregateTypeInfo:r"
+constant kAggregateWithNullPointer is [nothing]
+
+public handler TestForeignAggregateNullPointerRoundTrip()
+	variable tAggregate as AggregateWithPointer
+	put kAggregateWithNullPointer into tAggregate
+	
+	variable tList as List
+	put tAggregate into tList
+	
+	test "aggregate containing null pointer roundtrips" when \
+		tList[1] is kAggregateWithNullPointer[1]
+end handler
+
 end module
diff --git a/tests/lcs/core/engine/put.livecodescript b/tests/lcs/core/engine/put.livecodescript
@@ -0,0 +1,55 @@
+﻿script "CoreEnginePut"
+/*
+Copyright (C) 2018 LiveCode Ltd.
+
+This file is part of LiveCode.
+
+LiveCode is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License v3 as published by the Free
+Software Foundation.
+
+LiveCode is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
+
+// Test MCVariable::modify variant
+on TestPutAfterData
+	local tVar
+	put numToByte(1) into tVar
+	put numToByte(1) after tVar
+	TestAssert "put after preserves binary string", \
+		tVar is strictly a binary string
+end TestPutAfterData
+
+// Test MCEngineExecPutIntoVariable ValueRef chunk variant
+on TestPutAfterDataChunk
+	local tVar, tArray
+	put numToByte(1) into tVar
+	put numToByte(1) after byte 1 of tVar
+	TestAssert "put after chunk preserves binary string", \
+		tVar is strictly a binary string
+end TestPutAfterDataChunk
+
+// Test MCVariable::modify_ctxt variant
+on TestPutAfterDataExecValue
+	local tVar, tArray
+	put numToByte(1) into tVar
+	put numToByte(1) into tArray[1]
+	put tArray[1] after tVar
+	TestAssert "put as execvalue after preserves binary string", \
+		tVar is strictly a binary string
+end TestPutAfterDataExecValue
+
+// Test MCEngineExecPutIntoVariable ExecValue chunk variant
+on TestPutAfterDataChunkExecValue
+	local tVar, tArray
+	put numToByte(1) into tVar
+	put numToByte(1) into tArray[1]
+	put tArray[1] after byte 1 of tVar
+	TestAssert "put as execvalue after chunk preserves binary string", \
+		tVar is strictly a binary string
+end TestPutAfterDataChunkExecValue

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Ensure binary strings remain so when binary string is appended or prepended`
Original file line number	Diff line number	Diff line change
`@@ -704,7 +704,8 @@ void MCEngineExecPutIntoVariable(MCExecContext& ctxt, MCExecValue p_value, int p`
`704`	`704`	`else`
`705`	`705`	`{`
`706`	`706`	`if (MCValueGetTypeCode(p_var . mark . text) == kMCValueTypeCodeData &&`
`707`		`- p_value . type == kMCExecValueTypeDataRef)`
	`707`	`+ MCExecTypeIsValueRef(p_value.type) &&`
	`708`	`+ MCValueGetTypeCode(p_value.valueref_value) == kMCValueTypeCodeData)`
`708`	`709`	`{`
`709`	`710`	`// AL-2014-11-20: Make sure the incoming exec value is released.`
`710`	`711`	`MCAutoDataRef t_value_data;`
Original file line number	Diff line number	Diff line change
`@@ -613,7 +613,8 @@ bool MCVariable::modify_ctxt(MCExecContext& ctxt, MCExecValue p_value, MCVariabl`
`613`	`613`
`614`	`614`	`bool MCVariable::modify_ctxt(MCExecContext& ctxt, MCExecValue p_value, MCSpan<MCNameRef> p_path, MCVariableSettingStyle p_setting)`
`615`	`615`	`{`
`616`		`- if (p_value . type == kMCExecValueTypeDataRef)`
	`616`	`+ if (MCExecTypeIsValueRef(p_value.type) &&`
	`617`	`+ MCValueGetTypeCode(p_value.valueref_value) == kMCValueTypeCodeData)`
`617`	`618`	`{`
`618`	`619`	`if (can_become_data(ctxt, p_path))`
`619`	`620`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1294,9 +1294,16 @@ static bool _aggregate_export(const MCForeignTypeDescriptor* desc, MCValueRef p_`
`1294`	`1294`	`const MCForeignTypeDescriptor *t_field_desc = MCForeignTypeInfoGetDescriptor(t_field_type);`
`1295`	`1295`	`if (t_element_type == t_field_desc->bridgetype)`
`1296`	`1296`	`{`
`1297`		`- if (!t_field_desc->doexport(t_field_desc, t_element, false, t_ptr))`
	`1297`	`+ if (t_element_type == kMCNullTypeInfo)`
`1298`	`1298`	`{`
`1299`		`- t_success = false;`
	`1299`	`+ MCMemoryClear(t_ptr, t_size);`
	`1300`	`+ }`
	`1301`	`+ else`
	`1302`	`+ {`
	`1303`	`+ if (!t_field_desc->doexport(t_field_desc, t_element, false, t_ptr))`
	`1304`	`+ {`
	`1305`	`+ t_success = false;`
	`1306`	`+ }`
`1300`	`1307`	`}`
`1301`	`1308`	`}`
`1302`	`1309`	`else if (MCTypeInfoIsForeign(t_element_type))`