Re-name a variable in a header to avoid Objective-C compile errors

Fraser J. Gordon · Fraser J. Gordon · commit d784baab126a · 2015-01-19T16:48:22.000Z
diff --git a/engine/src/cmds.h b/engine/src/cmds.h
@@ -962,11 +962,11 @@ class MCBreakPoint : public MCStatement
 
 class MCCancel : public MCStatement
 {
-	MCExpression *id;
+	MCExpression *m_id;
 public:
 	MCCancel()
 	{
-		id = NULL;
+		m_id = NULL;
 	}
 	virtual ~MCCancel();
 	virtual Parse_stat parse(MCScriptPoint &);
diff --git a/engine/src/cmdse.cpp b/engine/src/cmdse.cpp
@@ -267,17 +267,17 @@ void MCBreakPoint::compile(MCSyntaxFactoryRef ctxt)
 
 MCCancel::~MCCancel()
 {
-	delete id;
+	delete m_id;
 }
 
 Parse_stat MCCancel::parse(MCScriptPoint &sp)
 {
 	initpoint(sp);
 	if (sp . skip_token(SP_RESET, TT_UNDEFINED, RT_PRINTING) == PS_NORMAL)
 	{
-		id = NULL;
+		m_id = NULL;
 	}
-	else if (sp.parseexp(False, True, &id) != PS_NORMAL)
+	else if (sp.parseexp(False, True, &m_id) != PS_NORMAL)
 	{
 		MCperror->add(PE_CANCEL_BADEXP, sp);
 		return PS_ERROR;
@@ -310,13 +310,13 @@ void MCCancel::exec_ctxt(MCExecContext& ctxt)
 	return ES_NORMAL;
 #endif /* MCCancel */
 
-    if (id == NULL)
+    if (m_id == NULL)
 		MCPrintingExecCancelPrinting(ctxt);
 	
 	else
 	{
         integer_t t_id;
-        if (!ctxt . EvalExprAsInt(id, EE_CANCEL_IDNAN, t_id))
+        if (!ctxt . EvalExprAsInt(m_id, EE_CANCEL_IDNAN, t_id))
             return;
         MCEngineExecCancelMessage(ctxt, t_id);
     }
@@ -326,11 +326,11 @@ void MCCancel::compile(MCSyntaxFactoryRef ctxt)
 {
 	MCSyntaxFactoryBeginStatement(ctxt, line, pos);
 
-	if (id == nil)
+	if (m_id == nil)
 		MCSyntaxFactoryExecMethod(ctxt, kMCPrintingExecCancelPrintingMethodInfo);
 	else
 	{
-		id -> compile(ctxt);
+		m_id -> compile(ctxt);
 		
 		MCSyntaxFactoryExecMethod(ctxt, kMCEngineExecCancelMessageMethodInfo);
 	}

Original file line number	Diff line number	Diff line change
`@@ -962,11 +962,11 @@ class MCBreakPoint : public MCStatement`
`962`	`962`
`963`	`963`	`class MCCancel : public MCStatement`
`964`	`964`	`{`
`965`		`- MCExpression *id;`
	`965`	`+ MCExpression *m_id;`
`966`	`966`	`public:`
`967`	`967`	`MCCancel()`
`968`	`968`	`{`
`969`		`- id = NULL;`
	`969`	`+ m_id = NULL;`
`970`	`970`	`}`
`971`	`971`	`virtual ~MCCancel();`
`972`	`972`	`virtual Parse_stat parse(MCScriptPoint &);`
Original file line number	Diff line number	Diff line change
`@@ -267,17 +267,17 @@ void MCBreakPoint::compile(MCSyntaxFactoryRef ctxt)`
`267`	`267`
`268`	`268`	`MCCancel::~MCCancel()`
`269`	`269`	`{`
`270`		`- delete id;`
	`270`	`+ delete m_id;`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`Parse_stat MCCancel::parse(MCScriptPoint &sp)`
`274`	`274`	`{`
`275`	`275`	`initpoint(sp);`
`276`	`276`	`if (sp . skip_token(SP_RESET, TT_UNDEFINED, RT_PRINTING) == PS_NORMAL)`
`277`	`277`	`{`
`278`		`- id = NULL;`
	`278`	`+ m_id = NULL;`
`279`	`279`	`}`
`280`		`- else if (sp.parseexp(False, True, &id) != PS_NORMAL)`
	`280`	`+ else if (sp.parseexp(False, True, &m_id) != PS_NORMAL)`
`281`	`281`	`{`
`282`	`282`	`MCperror->add(PE_CANCEL_BADEXP, sp);`
`283`	`283`	`return PS_ERROR;`
`@@ -310,13 +310,13 @@ void MCCancel::exec_ctxt(MCExecContext& ctxt)`
`310`	`310`	`return ES_NORMAL;`
`311`	`311`	`#endif /* MCCancel */`
`312`	`312`
`313`		`- if (id == NULL)`
	`313`	`+ if (m_id == NULL)`
`314`	`314`	`MCPrintingExecCancelPrinting(ctxt);`
`315`	`315`
`316`	`316`	`else`
`317`	`317`	`{`
`318`	`318`	`integer_t t_id;`
`319`		`- if (!ctxt . EvalExprAsInt(id, EE_CANCEL_IDNAN, t_id))`
	`319`	`+ if (!ctxt . EvalExprAsInt(m_id, EE_CANCEL_IDNAN, t_id))`
`320`	`320`	`return;`
`321`	`321`	`MCEngineExecCancelMessage(ctxt, t_id);`
`322`	`322`	`}`
`@@ -326,11 +326,11 @@ void MCCancel::compile(MCSyntaxFactoryRef ctxt)`
`326`	`326`	`{`
`327`	`327`	`MCSyntaxFactoryBeginStatement(ctxt, line, pos);`
`328`	`328`
`329`		`- if (id == nil)`
	`329`	`+ if (m_id == nil)`
`330`	`330`	`MCSyntaxFactoryExecMethod(ctxt, kMCPrintingExecCancelPrintingMethodInfo);`
`331`	`331`	`else`
`332`	`332`	`{`
`333`		`- id -> compile(ctxt);`
	`333`	`+ m_id -> compile(ctxt);`
`334`	`334`
`335`	`335`	`MCSyntaxFactoryExecMethod(ctxt, kMCEngineExecCancelMessageMethodInfo);`
`336`	`336`	`}`