com.livecode.list: Workaround for compiler bug 14931.

peter-b · peter-b · commit 9f4ab59c2267 · 2015-03-13T11:15:35.000Z
diff --git a/libscript/src/list.mlc b/libscript/src/list.mlc
@@ -76,11 +76,11 @@ public foreign handler MCListExecDeleteLastElementOf(inout Target as List) as un
 
 public foreign handler MCListEvalIndexOfElement(in IsLast as CBool, in Needle as any, in Haystack as List, out Index as LCUIndex) as undefined binds to "<builtin>"
 public foreign handler MCListEvalIndexOfElementAfter(in IsLast as CBool, in Needle as any, in After as LCIndex, in Haystack as List, out Index as LCUIndex) as undefined binds to "<builtin>"
-public foreign handler MCListEvalIndexOfElementBefore(in IsLast as CBool, in Needle as any, in Before as LCIndex, in Haystack as List, out Index as LCUIndex) as undefined binds to "<builtin>"
+public foreign handler MCListEvalIndexOfElementBefore(in IsFirst as CBool, in Needle as any, in Before as LCIndex, in Haystack as List, out Index as LCUIndex) as undefined binds to "<builtin>"
 
 public foreign handler MCListEvalOffsetOfList(in IsLast as CBool, in Needle as List, in Haystack as List, out Index as LCUIndex) as undefined binds to "<builtin>"
 public foreign handler MCListEvalOffsetOfListAfter(in IsLast as CBool, in Needle as List, in After as LCIndex, in Haystack as List, out Index as LCUIndex) as undefined binds to "<builtin>"
-public foreign handler MCListEvalOffsetOfListBefore(in IsLast as CBool, in Needle as List, in Before as LCIndex, in Haystack as List, out Index as LCUIndex) as undefined binds to "<builtin>"
+public foreign handler MCListEvalOffsetOfListBefore(in IsFirst as CBool, in Needle as List, in Before as LCIndex, in Haystack as List, out Index as LCUIndex) as undefined binds to "<builtin>"
 
 --
 
@@ -963,9 +963,9 @@ specified, the last matching element is found.
 Tags: Lists
 */
 syntax ListIndexBefore is prefix operator with precedence 1
-	"the" ( "first" <IsLast=false> | "last" <IsLast=true> | <IsLast=true> ) "index" "of" <Needle: Expression> "before" <Before: Expression> "in" <Haystack: Expression>
+	"the" ( "first" <IsFirst=true> | "last" <IsFirst=false> | <IsFirst=false> ) "index" "of" <Needle: Expression> "before" <Before: Expression> "in" <Haystack: Expression>
 begin
-	MCListEvalIndexOfElementBefore(IsLast, Needle, Before, Haystack, output)
+	MCListEvalIndexOfElementBefore(IsFirst, Needle, Before, Haystack, output)
 end syntax
 
 ----------------------------------------------------------------
@@ -1075,9 +1075,9 @@ is equal to <Needle>, the return value is 0.  If neither "first" nor
 Tags: Lists
 */
 syntax ListOffsetBefore is prefix operator with precedence 1
-	"the" ( "first" <IsLast=false> | "last" <IsLast=true> | <IsLast=true> ) "offset" "of" <Needle: Expression> "before" <Before: Expression> "in" <Haystack: Expression>
+	"the" ( "first" <IsFirst=true> | "last" <IsFirst=false> | <IsFirst=false> ) "offset" "of" <Needle: Expression> "before" <Before: Expression> "in" <Haystack: Expression>
 begin
-	MCListEvalOffsetOfListBefore(IsLast, Needle, Before, Haystack, output)
+	MCListEvalOffsetOfListBefore(IsFirst, Needle, Before, Haystack, output)
 end syntax
 
 end module
diff --git a/libscript/src/module-list.cpp b/libscript/src/module-list.cpp
@@ -504,7 +504,7 @@ MCListEvalIndexOfElementAfter (bool p_is_last,
 }
 
 extern "C" MC_DLLEXPORT void
-MCListEvalIndexOfElementBefore (bool p_is_last,
+MCListEvalIndexOfElementBefore (bool p_is_first,
                                MCValueRef p_needle,
                                index_t p_before,
                                MCProperListRef p_haystack,
@@ -522,7 +522,7 @@ MCListEvalIndexOfElementBefore (bool p_is_last,
 		return;
 	}
 
-	MCListEvalIndexOfElementInRange (p_is_last, p_needle, p_haystack,
+	MCListEvalIndexOfElementInRange (!p_is_first, p_needle, p_haystack,
 	                                 MCRangeMake(0, t_start),
 	                                 r_output);
 }
@@ -590,7 +590,7 @@ MCListEvalOffsetOfListAfter (bool p_is_last,
 }
 
 extern "C" MC_DLLEXPORT void
-MCListEvalOffsetOfListBefore (bool p_is_last,
+MCListEvalOffsetOfListBefore (bool p_is_first,
                               MCProperListRef p_needle,
                               index_t p_before,
                               MCProperListRef p_haystack,
@@ -608,7 +608,7 @@ MCListEvalOffsetOfListBefore (bool p_is_last,
 		return;
 	}
 
-	MCListEvalOffsetOfListInRange (p_is_last, p_needle, p_haystack,
+	MCListEvalOffsetOfListInRange (!p_is_first, p_needle, p_haystack,
 	                               MCRangeMake(0, t_start),
 	                               r_output);
 }

Original file line number	Diff line number	Diff line change
`@@ -504,7 +504,7 @@ MCListEvalIndexOfElementAfter (bool p_is_last,`
`504`	`504`	`}`
`505`	`505`
`506`	`506`	`extern "C" MC_DLLEXPORT void`
`507`		`-MCListEvalIndexOfElementBefore (bool p_is_last,`
	`507`	`+MCListEvalIndexOfElementBefore (bool p_is_first,`
`508`	`508`	`MCValueRef p_needle,`
`509`	`509`	`index_t p_before,`
`510`	`510`	`MCProperListRef p_haystack,`
`@@ -522,7 +522,7 @@ MCListEvalIndexOfElementBefore (bool p_is_last,`
`522`	`522`	`return;`
`523`	`523`	`}`
`524`	`524`
`525`		`- MCListEvalIndexOfElementInRange (p_is_last, p_needle, p_haystack,`
	`525`	`+ MCListEvalIndexOfElementInRange (!p_is_first, p_needle, p_haystack,`
`526`	`526`	`MCRangeMake(0, t_start),`
`527`	`527`	`r_output);`
`528`	`528`	`}`
`@@ -590,7 +590,7 @@ MCListEvalOffsetOfListAfter (bool p_is_last,`
`590`	`590`	`}`
`591`	`591`
`592`	`592`	`extern "C" MC_DLLEXPORT void`
`593`		`-MCListEvalOffsetOfListBefore (bool p_is_last,`
	`593`	`+MCListEvalOffsetOfListBefore (bool p_is_first,`
`594`	`594`	`MCProperListRef p_needle,`
`595`	`595`	`index_t p_before,`
`596`	`596`	`MCProperListRef p_haystack,`
`@@ -608,7 +608,7 @@ MCListEvalOffsetOfListBefore (bool p_is_last,`
`608`	`608`	`return;`
`609`	`609`	`}`
`610`	`610`
`611`		`- MCListEvalOffsetOfListInRange (p_is_last, p_needle, p_haystack,`
	`611`	`+ MCListEvalOffsetOfListInRange (!p_is_first, p_needle, p_haystack,`
`612`	`612`	`MCRangeMake(0, t_start),`
`613`	`613`	`r_output);`
`614`	`614`	`}`