[[ Bug 14485 ]] Errors in parsing expressions involving widget.

runrevmark · runrevmark · commit c40dafc8a8d4 · 2015-02-04T17:30:34.000Z
The MCChunk object is highly dependent on the order of CT_* enum for controls. In particular, CT_FIELD must be the last object type as there is a comparison which depends on it being a text chunk. Therefore CT_FIELD has been moved to after CT_WIDGET and aliased with CT_FIRST_TEXT_CHUNK. Places in the code which were comparing with CT_FIELD to get a control have been updated to CT_LAST_CONTROL, and places which were comparing to CT_FIELD as a text chunk have been updated to use CT_FIRST_TEXT_CHUNK.

In particular, this fixes the issue with parsing chunk lists such as 'widget 1 and button 2' - which was parsing 'widget (1 and button 2)' rather than 'widget (1) and button (2)'.
diff --git a/engine/src/chunk.cpp b/engine/src/chunk.cpp
@@ -369,7 +369,7 @@ Parse_stat MCChunk::parse(MCScriptPoint &sp, Boolean doingthe)
 						{
 							if (sp.lookup(SP_FACTOR, ite) == PS_NORMAL
 							        && ite->type == TT_CHUNK
-							        && ite->which >= CT_LAYER && ite->which <= CT_FIELD)
+							        && ite->which >= CT_LAYER && ite->which <= CT_LAST_CONTROL)
 							{
 								curref->ptype = curref->otype;
 								nterm = curref->otype = (Chunk_term)ite->which;
@@ -384,7 +384,7 @@ Parse_stat MCChunk::parse(MCScriptPoint &sp, Boolean doingthe)
 							curref->etype = CT_ID;
 						else
 							curref->etype = CT_EXPRESSION;
-						if (sp.parseexp(curref->otype <= CT_FIELD, False,
+						if (sp.parseexp(curref->otype <= CT_LAST_CONTROL, False,
 						                &curref->startpos) != PS_NORMAL)
 						{
 							MCperror->add(PE_CHUNK_NOSTARTEXP, sp);
diff --git a/engine/src/cmdsc.cpp b/engine/src/cmdsc.cpp
@@ -2607,7 +2607,7 @@ void MCMakeGroup::exec_ctxt(MCExecContext& ctxt)
 			
 			// MW-2013-06-20: [[ Bug 10863 ]] Only objects which are controls, and have a
 			//   parent are groupable.
-			if (optr->gettype() > CT_FIELD ||
+			if (optr->gettype() > CT_LAST_CONTROL ||
 				optr->gettype() < CT_GROUP ||
 				optr->getparent() == NULL ||
 				optr->getparent()->gettype() != CT_CARD)
diff --git a/engine/src/cmdss.cpp b/engine/src/cmdss.cpp
@@ -335,7 +335,7 @@ Parse_stat MCGo::parse(MCScriptPoint &sp)
 					curref = new MCCRef;
 					if (oterm == CT_UNDEFINED)
 					{
-						if (nterm >= CT_FIELD || nterm == CT_URL)
+						if (nterm >= CT_FIRST_TEXT_CHUNK || nterm == CT_URL)
 						{
 							sp.backup();
 							nterm = CT_CARD;
diff --git a/engine/src/sellst.cpp b/engine/src/sellst.cpp
@@ -281,7 +281,7 @@ MCControl *MCSellist::clone(MCObject *target)
 Exec_stat MCSellist::group(uint2 line, uint2 pos)
 {
 	MCresult->clear(False);
-	if (objects != NULL && objects->ref->gettype() <= CT_FIELD
+	if (objects != NULL && objects->ref->gettype() <= CT_LAST_CONTROL
 	        && objects->ref->gettype() >= CT_GROUP)
 	{
 		MCObject *parent = objects->ref->getparent();
diff --git a/engine/src/sysdefs.h b/engine/src/sysdefs.h
@@ -1332,9 +1332,10 @@ enum Chunk_term {
     CT_EPS,
     CT_MAGNIFY,
     CT_COLOR_PALETTE,
-    CT_FIELD,
     CT_WIDGET,
-	CT_LAST_CONTROL = CT_WIDGET,
+    CT_FIELD,
+	CT_LAST_CONTROL = CT_FIELD,
+    CT_FIRST_TEXT_CHUNK = CT_FIELD,
     CT_LINE,
     CT_PARAGRAPH,
     CT_SENTENCE,

Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ Parse_stat MCChunk::parse(MCScriptPoint &sp, Boolean doingthe)`
`369`	`369`	`{`
`370`	`370`	`if (sp.lookup(SP_FACTOR, ite) == PS_NORMAL`
`371`	`371`	`&& ite->type == TT_CHUNK`
`372`		`- && ite->which >= CT_LAYER && ite->which <= CT_FIELD)`
	`372`	`+ && ite->which >= CT_LAYER && ite->which <= CT_LAST_CONTROL)`
`373`	`373`	`{`
`374`	`374`	`curref->ptype = curref->otype;`
`375`	`375`	`nterm = curref->otype = (Chunk_term)ite->which;`
`@@ -384,7 +384,7 @@ Parse_stat MCChunk::parse(MCScriptPoint &sp, Boolean doingthe)`
`384`	`384`	`curref->etype = CT_ID;`
`385`	`385`	`else`
`386`	`386`	`curref->etype = CT_EXPRESSION;`
`387`		`- if (sp.parseexp(curref->otype <= CT_FIELD, False,`
	`387`	`+ if (sp.parseexp(curref->otype <= CT_LAST_CONTROL, False,`
`388`	`388`	`&curref->startpos) != PS_NORMAL)`
`389`	`389`	`{`
`390`	`390`	`MCperror->add(PE_CHUNK_NOSTARTEXP, sp);`
Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ Parse_stat MCGo::parse(MCScriptPoint &sp)`
`335`	`335`	`curref = new MCCRef;`
`336`	`336`	`if (oterm == CT_UNDEFINED)`
`337`	`337`	`{`
`338`		`- if (nterm >= CT_FIELD \|\| nterm == CT_URL)`
	`338`	`+ if (nterm >= CT_FIRST_TEXT_CHUNK \|\| nterm == CT_URL)`
`339`	`339`	`{`
`340`	`340`	`sp.backup();`
`341`	`341`	`nterm = CT_CARD;`
Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ MCControl MCSellist::clone(MCObject target)`
`281`	`281`	`Exec_stat MCSellist::group(uint2 line, uint2 pos)`
`282`	`282`	`{`
`283`	`283`	`MCresult->clear(False);`
`284`		`- if (objects != NULL && objects->ref->gettype() <= CT_FIELD`
	`284`	`+ if (objects != NULL && objects->ref->gettype() <= CT_LAST_CONTROL`
`285`	`285`	`&& objects->ref->gettype() >= CT_GROUP)`
`286`	`286`	`{`
`287`	`287`	`MCObject *parent = objects->ref->getparent();`