[[ Element Chunk ]] Abstract some chunk parsing checks

livecodeali · livecodeali · commit 84ef6e7cbe64 · 2015-12-02T11:23:27.000Z
diff --git a/engine/src/chunk.cpp b/engine/src/chunk.cpp
@@ -224,8 +224,7 @@ Parse_stat MCChunk::parse(MCScriptPoint &sp, Boolean doingthe)
 			{
 				if (need_target)
 				{
-					if (desttype == DT_ISDEST && stack == NULL && background == NULL
-					        && card == NULL && group == NULL && object == NULL)
+					if (desttype == DT_ISDEST && noobjectchunks())
 					{
 						MCExpression *newfact = NULL;
 						// MW-2011-06-22: [[ SERVER ]] Update to use SP findvar method to take into account
@@ -269,13 +268,7 @@ Parse_stat MCChunk::parse(MCScriptPoint &sp, Boolean doingthe)
 				//   then it should be evaluated as a string. However, if the string chunk
 				//   is of a previously parsed object then we must pass as a dest so the
 				//   object resolves correctly.
-				if (desttype != DT_ISDEST && (cline != NULL || paragraph != NULL || sentence != NULL
-				                              || item != NULL || word != NULL || trueword != NULL
-				                              || token != NULL || character != NULL || codepoint != NULL
-                                              || codeunit != NULL || byte != NULL) &&
-											 (stack == nil && background == nil &&
-											  card == nil && group == nil &&
-											  object == nil))
+				if (desttype != DT_ISDEST && !notextchunks() && noobjectchunks())
 				{
 					sp.backup();
 					if (sp.parseexp(True, False, &source) != PS_NORMAL)
@@ -544,9 +537,7 @@ Parse_stat MCChunk::parse(MCScriptPoint &sp, Boolean doingthe)
 						if (function == F_SELECTED_LINE || function == F_SELECTED_CHUNK)
 						{}
 					}
-					else if (cline != NULL || paragraph != NULL || sentence != NULL || item != NULL
-                             || trueword != NULL || word != NULL || token != NULL || character != NULL
-                             || codepoint != NULL || codeunit != NULL || byte != NULL)
+					else if (!notextchunks())
 					{
 						sp.backup();
 						if (sp.parseexp(True, False, &source) != PS_NORMAL)
@@ -650,8 +641,7 @@ Parse_stat MCChunk::parse(MCScriptPoint &sp, Boolean doingthe)
 			default: /* factor */
 				if (need_target)
 				{
-					if (stack != NULL || background != NULL || card != NULL
-					        || group != NULL || object != NULL)
+					if (!noobjectchunks())
 					{
 						MCperror->add
 						(PE_CHUNK_NOCHUNK, sp);
@@ -681,8 +671,7 @@ Parse_stat MCChunk::parse(MCScriptPoint &sp, Boolean doingthe)
 		{ /* token type != ST_ID */
 			if (need_target)
 			{
-				if (stack != NULL || background != NULL || card != NULL
-				        || group != NULL || object != NULL)
+				if (!noobjectchunks())
 				{
 					MCperror->add(PE_CHUNK_NOCHUNK, sp);
 					return PS_ERROR;
@@ -1037,7 +1026,7 @@ void MCChunk::getoptionalobj(MCExecContext& ctxt, MCObjectPtr &r_object, Boolean
                 break;
         }
     }
-    else if (stack == nil && background == nil && card == nil && group == nil && object == nil)
+    else if (noobjectchunks())
     {
         // Optional obj: this doesn't throw an error
         //  but rather leave r_object . object set to nil
@@ -3197,8 +3186,7 @@ void MCChunk::eval_ctxt(MCExecContext &ctxt, MCExecValue &r_text)
 
         if (t_object . object == nil)
         {
-            if (url == NULL || stack != NULL || background != NULL ||
-                card != NULL || group != NULL || object != NULL)
+            if (url == NULL || !noobjectchunks())
             {
                 ctxt . LegacyThrow(EE_CHUNK_CANTFINDOBJECT);
                 return;
@@ -4253,9 +4241,7 @@ bool MCChunk::getobjforprop(MCExecContext& ctxt, MCObject*& r_object, uint4& r_p
         && function != F_SELECTED_IMAGE
         && function != F_DRAG_SOURCE && function != F_DRAG_DESTINATION)
 		tfunction = True;
-	if (!tfunction && cline == nil && paragraph == nil && sentence == nil
-        && item == nil && trueword == nil && word == nil && token == nil
-        && character == nil && codepoint == nil && codeunit == nil && byte == nil)
+	if (!tfunction && notextchunks())
 	{
 		r_object = objptr;
 		r_parid = parid;
diff --git a/engine/src/cmds.cpp b/engine/src/cmds.cpp
@@ -2360,7 +2360,7 @@ void MCSort::exec_ctxt(MCExecContext& ctxt)
 		else
 		{
 			MCField *fptr = (MCField *)optr;
-			if (optr->gettype() != CT_FIELD || !of->nochunks()
+			if (optr->gettype() != CT_FIELD || !of->notextchunks()
 			        || fptr->sort(ep, parid, chunktype, direction,
 			                      format, by) != ES_NORMAL)
 			{
@@ -2431,7 +2431,7 @@ void MCSort::exec_ctxt(MCExecContext& ctxt)
 	}
 	else
 	{
-		if (t_object . object->gettype() != CT_FIELD || !of->nochunks())
+		if (t_object . object->gettype() != CT_FIELD || !of->notextchunks())
 		{
             ctxt . LegacyThrow(EE_SORT_CANTSORT);
 			return;

Original file line number	Diff line number	Diff line change
`@@ -224,8 +224,7 @@ Parse_stat MCChunk::parse(MCScriptPoint &sp, Boolean doingthe)`
`224`	`224`	`{`
`225`	`225`	`if (need_target)`
`226`	`226`	`{`
`227`		`- if (desttype == DT_ISDEST && stack == NULL && background == NULL`
`228`		`- && card == NULL && group == NULL && object == NULL)`
	`227`	`+ if (desttype == DT_ISDEST && noobjectchunks())`
`229`	`228`	`{`
`230`	`229`	`MCExpression *newfact = NULL;`
`231`	`230`	`// MW-2011-06-22: [[ SERVER ]] Update to use SP findvar method to take into account`
`@@ -269,13 +268,7 @@ Parse_stat MCChunk::parse(MCScriptPoint &sp, Boolean doingthe)`
`269`	`268`	`// then it should be evaluated as a string. However, if the string chunk`
`270`	`269`	`// is of a previously parsed object then we must pass as a dest so the`
`271`	`270`	`// object resolves correctly.`
`272`		`- if (desttype != DT_ISDEST && (cline != NULL \|\| paragraph != NULL \|\| sentence != NULL`
`273`		`- \|\| item != NULL \|\| word != NULL \|\| trueword != NULL`
`274`		`- \|\| token != NULL \|\| character != NULL \|\| codepoint != NULL`
`275`		`- \|\| codeunit != NULL \|\| byte != NULL) &&`
`276`		`- (stack == nil && background == nil &&`
`277`		`- card == nil && group == nil &&`
`278`		`- object == nil))`
	`271`	`+ if (desttype != DT_ISDEST && !notextchunks() && noobjectchunks())`
`279`	`272`	`{`
`280`	`273`	`sp.backup();`
`281`	`274`	`if (sp.parseexp(True, False, &source) != PS_NORMAL)`
`@@ -544,9 +537,7 @@ Parse_stat MCChunk::parse(MCScriptPoint &sp, Boolean doingthe)`
`544`	`537`	`if (function == F_SELECTED_LINE \|\| function == F_SELECTED_CHUNK)`
`545`	`538`	`{}`
`546`	`539`	`}`
`547`		`- else if (cline != NULL \|\| paragraph != NULL \|\| sentence != NULL \|\| item != NULL`
`548`		`- \|\| trueword != NULL \|\| word != NULL \|\| token != NULL \|\| character != NULL`
`549`		`- \|\| codepoint != NULL \|\| codeunit != NULL \|\| byte != NULL)`
	`540`	`+ else if (!notextchunks())`
`550`	`541`	`{`
`551`	`542`	`sp.backup();`
`552`	`543`	`if (sp.parseexp(True, False, &source) != PS_NORMAL)`
`@@ -650,8 +641,7 @@ Parse_stat MCChunk::parse(MCScriptPoint &sp, Boolean doingthe)`
`650`	`641`	`default: /* factor */`
`651`	`642`	`if (need_target)`
`652`	`643`	`{`
`653`		`- if (stack != NULL \|\| background != NULL \|\| card != NULL`
`654`		`- \|\| group != NULL \|\| object != NULL)`
	`644`	`+ if (!noobjectchunks())`
`655`	`645`	`{`
`656`	`646`	`MCperror->add`
`657`	`647`	`(PE_CHUNK_NOCHUNK, sp);`
`@@ -681,8 +671,7 @@ Parse_stat MCChunk::parse(MCScriptPoint &sp, Boolean doingthe)`
`681`	`671`	`{ /* token type != ST_ID */`
`682`	`672`	`if (need_target)`
`683`	`673`	`{`
`684`		`- if (stack != NULL \|\| background != NULL \|\| card != NULL`
`685`		`- \|\| group != NULL \|\| object != NULL)`
	`674`	`+ if (!noobjectchunks())`
`686`	`675`	`{`
`687`	`676`	`MCperror->add(PE_CHUNK_NOCHUNK, sp);`
`688`	`677`	`return PS_ERROR;`
`@@ -1037,7 +1026,7 @@ void MCChunk::getoptionalobj(MCExecContext& ctxt, MCObjectPtr &r_object, Boolean`
`1037`	`1026`	`break;`
`1038`	`1027`	`}`
`1039`	`1028`	`}`
`1040`		`- else if (stack == nil && background == nil && card == nil && group == nil && object == nil)`
	`1029`	`+ else if (noobjectchunks())`
`1041`	`1030`	`{`
`1042`	`1031`	`// Optional obj: this doesn't throw an error`
`1043`	`1032`	`// but rather leave r_object . object set to nil`
`@@ -3197,8 +3186,7 @@ void MCChunk::eval_ctxt(MCExecContext &ctxt, MCExecValue &r_text)`
`3197`	`3186`
`3198`	`3187`	`if (t_object . object == nil)`
`3199`	`3188`	`{`
`3200`		`- if (url == NULL \|\| stack != NULL \|\| background != NULL \|\|`
`3201`		`- card != NULL \|\| group != NULL \|\| object != NULL)`
	`3189`	`+ if (url == NULL \|\| !noobjectchunks())`
`3202`	`3190`	`{`
`3203`	`3191`	`ctxt . LegacyThrow(EE_CHUNK_CANTFINDOBJECT);`
`3204`	`3192`	`return;`
`@@ -4253,9 +4241,7 @@ bool MCChunk::getobjforprop(MCExecContext& ctxt, MCObject*& r_object, uint4& r_p`
`4253`	`4241`	`&& function != F_SELECTED_IMAGE`
`4254`	`4242`	`&& function != F_DRAG_SOURCE && function != F_DRAG_DESTINATION)`
`4255`	`4243`	`tfunction = True;`
`4256`		`- if (!tfunction && cline == nil && paragraph == nil && sentence == nil`
`4257`		`- && item == nil && trueword == nil && word == nil && token == nil`
`4258`		`- && character == nil && codepoint == nil && codeunit == nil && byte == nil)`
	`4244`	`+ if (!tfunction && notextchunks())`
`4259`	`4245`	`{`
`4260`	`4246`	`r_object = objptr;`
`4261`	`4247`	`r_parid = parid;`
Original file line number	Diff line number	Diff line change
`@@ -2360,7 +2360,7 @@ void MCSort::exec_ctxt(MCExecContext& ctxt)`
`2360`	`2360`	`else`
`2361`	`2361`	`{`
`2362`	`2362`	`MCField fptr = (MCField )optr;`
`2363`		`- if (optr->gettype() != CT_FIELD \|\| !of->nochunks()`
	`2363`	`+ if (optr->gettype() != CT_FIELD \|\| !of->notextchunks()`
`2364`	`2364`	`\|\| fptr->sort(ep, parid, chunktype, direction,`
`2365`	`2365`	`format, by) != ES_NORMAL)`
`2366`	`2366`	`{`
`@@ -2431,7 +2431,7 @@ void MCSort::exec_ctxt(MCExecContext& ctxt)`
`2431`	`2431`	`}`
`2432`	`2432`	`else`
`2433`	`2433`	`{`
`2434`		`- if (t_object . object->gettype() != CT_FIELD \|\| !of->nochunks())`
	`2434`	`+ if (t_object . object->gettype() != CT_FIELD \|\| !of->notextchunks())`
`2435`	`2435`	`{`
`2436`	`2436`	`ctxt . LegacyThrow(EE_SORT_CANTSORT);`
`2437`	`2437`	`return;`