[[ Bug 17690 ]] Add MCObject::getminimumstackfileversion method to return minimum stack file version required to fully encode object

livecodeian · livecodeian · commit 26f5953d6283 · 2016-07-12T10:52:25.000+01:00
diff --git a/engine/src/MCBlock.h b/engine/src/MCBlock.h
@@ -85,6 +85,8 @@ class MCBlock : public MCDLlist
 	// MCBlock functions
 	void copy(MCBlock *bptr);
 	
+	uint32_t getminimumstackfileversion(void);
+	
 	// MW-2012-03-04: [[ StackFile5500 ]] If 'is_ext' is true then this block has
 	//   an extension style attribute section.
 	IO_stat load(IO_handle stream, uint32_t version, bool is_ext);
diff --git a/engine/src/block.cpp b/engine/src/block.cpp
@@ -145,6 +145,11 @@ bool MCBlock::visit(MCObjectVisitorOptions p_options, uint32_t p_part, MCObjectV
 	return p_visitor -> OnBlock(this);
 }
 
+uint32_t MCBlock::getminimumstackfileversion(void)
+{
+		return kMCStackFileFormatMinimumExportVersion;
+}
+
 // MW-2012-03-04: [[ StackFile5500 ]] If 'is_ext' is true then the record is an extended
 //   record.
 IO_stat MCBlock::load(IO_handle stream, uint32_t version, bool is_ext)
diff --git a/engine/src/object.cpp b/engine/src/object.cpp
@@ -64,6 +64,9 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "stacksecurity.h"
 #include "stackfileformat.h"
 
+#include "paragraf.h"
+#include "MCBlock.h"
+
 #include "exec.h"
 #include "graphicscontext.h"
 
@@ -5133,6 +5136,50 @@ bool MCObject::haswidgets(void)
     return t_visitor . found_widget;
 }
 
+struct MCRequiredStackFileVersionVisitor : public MCObjectVisitor
+{
+	uint32_t required_version;
+	
+	bool OnObject(MCObject *p_object)
+	{
+		required_version = MCMax(required_version, p_object->getminimumstackfileversion());
+		
+		// keep looking if current required version is less than the maximum
+		return required_version < kMCStackFileFormatCurrentVersion;
+	}
+	
+	// make sure blocks and paragraphs are checked
+	bool OnParagraph(MCParagraph *p_paragraph)
+	{
+		required_version = MCMax(required_version, p_paragraph->getminimumstackfileversion());
+		
+		// keep looking if current required version is less than the maximum
+		return required_version < kMCStackFileFormatCurrentVersion;
+	}
+	
+	bool OnBlock(MCBlock *p_block)
+	{
+		required_version = MCMax(required_version, p_block->getminimumstackfileversion());
+		
+		// keep looking if current required version is less than the maximum
+		return required_version < kMCStackFileFormatCurrentVersion;
+	}
+};
+
+uint32_t MCObject::geteffectiveminimumstackfileversion(void)
+{
+	MCRequiredStackFileVersionVisitor t_visitor;
+	t_visitor.required_version = kMCStackFileFormatMinimumExportVersion;
+	visit(kMCObjectVisitorRecursive, 0, &t_visitor);
+	return t_visitor.required_version;
+}
+
+uint32_t MCObject::getminimumstackfileversion(void)
+{
+	// Default minimum stack file version
+	return kMCStackFileFormatMinimumExportVersion;
+}
+
 // AL-2015-06-30: [[ Bug 15556 ]] Refactored function to sync mouse focus
 void MCObject::sync_mfocus(void)
 {
diff --git a/engine/src/object.h b/engine/src/object.h
@@ -922,6 +922,14 @@ class MCObject : public MCDLlist
     //   a widget.
     virtual bool haswidgets(void);
     
+	// IM-2016-07-06: [[ Bug 17690 ]] Return the minimum stack file version that can fully
+	//   encode this object and its properties.
+	virtual uint32_t getminimumstackfileversion(void);
+	
+	// IM-2016-07-06: [[ Bug 17690 ]] Returns the minimum stack file version of this object
+	//   and any child objects.
+	uint32_t geteffectiveminimumstackfileversion(void);
+	
     // Currently non-functional: always returns false
     bool is_rtl() const { return false; }
     
diff --git a/engine/src/paragraf.cpp b/engine/src/paragraf.cpp
@@ -464,6 +464,11 @@ bool MCParagraph::visit(MCObjectVisitorOptions p_options, uint32_t p_part, MCObj
 	return t_continue;
 }
 
+uint32_t MCParagraph::getminimumstackfileversion(void)
+{
+	return kMCStackFileFormatMinimumExportVersion;
+}
+
 // **** mutate blocks
 IO_stat MCParagraph::load(IO_handle stream, uint32_t version, bool is_ext)
 {
diff --git a/engine/src/paragraf.h b/engine/src/paragraf.h
@@ -279,6 +279,8 @@ class MCParagraph : public MCDLlist
 	
 	bool visit(MCObjectVisitorOptions p_options, uint32_t p_part, MCObjectVisitor* p_visitor);
 
+	uint32_t getminimumstackfileversion(void);
+	
 	// MW-2012-03-04: [[ StackFile5500 ]] If 'is_ext' is true then this paragraph
 	//   has an attribute extension.
 	IO_stat load(IO_handle stream, uint32_t version, bool is_ext);
diff --git a/engine/src/widget.cpp b/engine/src/widget.cpp
@@ -753,6 +753,11 @@ Exec_stat MCWidget::handle(Handler_type p_type, MCNameRef p_method, MCParameter
 	return MCControl::handle(p_type, p_method, p_parameters, p_passing_object);
 }
 
+uint32_t MCWidget::getminimumstackfileversion(void)
+{
+	return kMCStackFileFormatVersion_8_0;
+}
+
 IO_stat MCWidget::load(IO_handle p_stream, uint32_t p_version)
 {
 	IO_stat t_stat;
diff --git a/engine/src/widget.h b/engine/src/widget.h
@@ -162,6 +162,9 @@ class MCWidget: public MCControl
     
 	virtual Exec_stat handle(Handler_type, MCNameRef, MCParameter *, MCObject *pass_from);
 
+	// IM-2016-07-07: [[ Bug 17690 ]] Override - widgets not available before v8.0
+	virtual uint32_t getminimumstackfileversion(void);
+	
 	virtual IO_stat save(IO_handle stream, uint4 p_part, bool p_force_ext, uint32_t p_version);
 	virtual IO_stat load(IO_handle stream, uint32_t p_version);
 

Original file line number	Diff line number	Diff line change
`@@ -464,6 +464,11 @@ bool MCParagraph::visit(MCObjectVisitorOptions p_options, uint32_t p_part, MCObj`
`464`	`464`	`return t_continue;`
`465`	`465`	`}`
`466`	`466`
	`467`	`+uint32_t MCParagraph::getminimumstackfileversion(void)`
	`468`	`+{`
	`469`	`+ return kMCStackFileFormatMinimumExportVersion;`
	`470`	`+}`
	`471`	`+`
`467`	`472`	`// **** mutate blocks`
`468`	`473`	`IO_stat MCParagraph::load(IO_handle stream, uint32_t version, bool is_ext)`
`469`	`474`	`{`
Original file line number	Diff line number	Diff line change
`@@ -753,6 +753,11 @@ Exec_stat MCWidget::handle(Handler_type p_type, MCNameRef p_method, MCParameter`
`753`	`753`	`return MCControl::handle(p_type, p_method, p_parameters, p_passing_object);`
`754`	`754`	`}`
`755`	`755`
	`756`	`+uint32_t MCWidget::getminimumstackfileversion(void)`
	`757`	`+{`
	`758`	`+ return kMCStackFileFormatVersion_8_0;`
	`759`	`+}`
	`760`	`+`
`756`	`761`	`IO_stat MCWidget::load(IO_handle p_stream, uint32_t p_version)`
`757`	`762`	`{`
`758`	`763`	`IO_stat t_stat;`