[[ Cleanup ]] libscript: Don't store 64-bit pointers in 32-bit integers.

peter-b · peter-b · commit d3a292e4a426 · 2014-12-12T15:30:48.000Z
diff --git a/libscript/src/module-byte.cpp b/libscript/src/module-byte.cpp
@@ -147,8 +147,8 @@ extern "C" MC_DLLEXPORT void MCByteStoreByteOf(MCDataRef p_value, index_t p_inde
 
 extern "C" MC_DLLEXPORT bool MCByteRepeatForEachByte(void*& x_iterator, MCDataRef& r_iterand, MCDataRef p_data)
 {
-    uindex_t t_offset;
-    t_offset = (uindex_t)x_iterator;
+    uintptr_t t_offset;
+    t_offset = (uintptr_t)x_iterator;
     
     if (t_offset == MCDataGetLength(p_data))
         return false;
diff --git a/libscript/src/module-char.cpp b/libscript/src/module-char.cpp
@@ -153,8 +153,8 @@ extern "C" MC_DLLEXPORT void MCCharEvalNewlineCharacter(MCStringRef& r_output)
 // Will result in tChar containing the value it had at the point of end repeat.
 extern "C" MC_DLLEXPORT bool MCCharRepeatForEachChar(void*& x_iterator, MCStringRef& r_iterand, MCStringRef p_string)
 {
-    uindex_t t_offset;
-    t_offset = (uindex_t)x_iterator;
+    uintptr_t t_offset;
+    t_offset = (uintptr_t)x_iterator;
     
     if (t_offset == MCStringGetLength(p_string))
         return false;
diff --git a/libscript/src/module-list.cpp b/libscript/src/module-list.cpp
@@ -333,8 +333,8 @@ extern "C" MC_DLLEXPORT void MCListEvalEmpty(MCProperListRef& r_output)
 
 extern "C" bool MCListRepeatForEachElement(void*& x_iterator, MCValueRef& r_iterand, MCProperListRef p_list)
 {
-    uindex_t t_offset;
-    t_offset = (uindex_t)x_iterator;
+    uintptr_t t_offset;
+    t_offset = (uintptr_t)x_iterator;
     
     if (t_offset == MCProperListGetLength(p_list))
         return false;

Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,8 @@ extern "C" MC_DLLEXPORT void MCByteStoreByteOf(MCDataRef p_value, index_t p_inde`
`147`	`147`
`148`	`148`	`extern "C" MC_DLLEXPORT bool MCByteRepeatForEachByte(void*& x_iterator, MCDataRef& r_iterand, MCDataRef p_data)`
`149`	`149`	`{`
`150`		`- uindex_t t_offset;`
`151`		`- t_offset = (uindex_t)x_iterator;`
	`150`	`+ uintptr_t t_offset;`
	`151`	`+ t_offset = (uintptr_t)x_iterator;`
`152`	`152`
`153`	`153`	`if (t_offset == MCDataGetLength(p_data))`
`154`	`154`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -333,8 +333,8 @@ extern "C" MC_DLLEXPORT void MCListEvalEmpty(MCProperListRef& r_output)`
`333`	`333`
`334`	`334`	`extern "C" bool MCListRepeatForEachElement(void*& x_iterator, MCValueRef& r_iterand, MCProperListRef p_list)`
`335`	`335`	`{`
`336`		`- uindex_t t_offset;`
`337`		`- t_offset = (uindex_t)x_iterator;`
	`336`	`+ uintptr_t t_offset;`
	`337`	`+ t_offset = (uintptr_t)x_iterator;`
`338`	`338`
`339`	`339`	`if (t_offset == MCProperListGetLength(p_list))`
`340`	`340`	`return false;`