[[ Element Chunk ]] Don't allow range expression for element chunk

livecodeali · livecodeali · commit 0cfb4a28138c · 2015-12-02T13:59:40.000Z
diff --git a/engine/src/chunk.cpp b/engine/src/chunk.cpp
@@ -291,7 +291,7 @@ Parse_stat MCChunk::parse(MCScriptPoint &sp, Boolean doingthe)
 				sp.backup();
 				return PS_NORMAL;
 			case TT_TO:
-				if (curref != NULL && lterm >= CT_LINE)
+				if (curref != NULL && MCChunkTermHasRange(lterm))
 				{
 					if (curref->etype == CT_RANGE)
 					{
@@ -5828,3 +5828,8 @@ bool MCChunkTermIsNestable(Chunk_term p_chunk_term)
             return false;
     }
 }
+
+bool MCChunkTermHasRange(Chunk_term p_chunk_term)
+{
+    return p_chunk_term >= CT_LINE && p_chunk_term < CT_ELEMENT;
+}
diff --git a/engine/src/chunk.h b/engine/src/chunk.h
@@ -265,5 +265,6 @@ class MCChunk : public MCExpression
 
 MCChunkType MCChunkTypeFromChunkTerm(Chunk_term p_chunk_term);
 bool MCChunkTermIsNestable(Chunk_term p_chunk_term);
+bool MCChunkTermHasRange(Chunk_term p_chunk_term);
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ Parse_stat MCChunk::parse(MCScriptPoint &sp, Boolean doingthe)`
`291`	`291`	`sp.backup();`
`292`	`292`	`return PS_NORMAL;`
`293`	`293`	`case TT_TO:`
`294`		`- if (curref != NULL && lterm >= CT_LINE)`
	`294`	`+ if (curref != NULL && MCChunkTermHasRange(lterm))`
`295`	`295`	`{`
`296`	`296`	`if (curref->etype == CT_RANGE)`
`297`	`297`	`{`
`@@ -5828,3 +5828,8 @@ bool MCChunkTermIsNestable(Chunk_term p_chunk_term)`
`5828`	`5828`	`return false;`
`5829`	`5829`	`}`
`5830`	`5830`	`}`
	`5831`	`+`
	`5832`	`+bool MCChunkTermHasRange(Chunk_term p_chunk_term)`
	`5833`	`+{`
	`5834`	`+ return p_chunk_term >= CT_LINE && p_chunk_term < CT_ELEMENT;`
	`5835`	`+}`