Skip to content

Commit 906c708

Browse files
Merge branch 'refactor-syntax_unicode_shims_cmdsm' into refactor-syntax_unicode_shims
Conflicts: engine/src/cmdsm.cpp
2 parents 0666520 + 7610263 commit 906c708

2 files changed

Lines changed: 210 additions & 230 deletions

File tree

engine/src/cmds.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1578,7 +1578,7 @@ class MCAdd : public MCStatement
15781578
}
15791579
virtual ~MCAdd();
15801580
virtual Parse_stat parse(MCScriptPoint &);
1581-
virtual Exec_stat exec(MCExecPoint &);
1581+
virtual void exec_ctxt(MCExecContext &ctxt);
15821582
virtual void compile(MCSyntaxFactoryRef);
15831583
};
15841584

@@ -1598,7 +1598,7 @@ class MCDivide : public MCStatement
15981598
}
15991599
virtual ~MCDivide();
16001600
virtual Parse_stat parse(MCScriptPoint &);
1601-
virtual Exec_stat exec(MCExecPoint &);
1601+
virtual void exec_ctxt(MCExecContext &ctxt);
16021602
virtual void compile(MCSyntaxFactoryRef);
16031603
};
16041604

@@ -1618,7 +1618,7 @@ class MCMultiply : public MCStatement
16181618
}
16191619
virtual ~MCMultiply();
16201620
virtual Parse_stat parse(MCScriptPoint &);
1621-
virtual Exec_stat exec(MCExecPoint &);
1621+
virtual void exec_ctxt(MCExecContext &ctxt);
16221622
virtual void compile(MCSyntaxFactoryRef);
16231623
};
16241624

@@ -1638,7 +1638,7 @@ class MCSubtract : public MCStatement
16381638
}
16391639
virtual ~MCSubtract();
16401640
virtual Parse_stat parse(MCScriptPoint &);
1641-
virtual Exec_stat exec(MCExecPoint &);
1641+
virtual void exec_ctxt(MCExecContext &ctxt);
16421642
virtual void compile(MCSyntaxFactoryRef);
16431643
};
16441644

@@ -1681,7 +1681,7 @@ class MCArrayOp : public MCStatement
16811681
}
16821682
virtual ~MCArrayOp();
16831683
virtual Parse_stat parse(MCScriptPoint &);
1684-
virtual Exec_stat exec(MCExecPoint &);
1684+
virtual void exec_ctxt(MCExecContext &ctxt);
16851685
virtual void compile(MCSyntaxFactoryRef);
16861686
};
16871687

@@ -1720,7 +1720,7 @@ class MCSetOp : public MCStatement
17201720
}
17211721
virtual ~MCSetOp();
17221722
virtual Parse_stat parse(MCScriptPoint &);
1723-
virtual Exec_stat exec(MCExecPoint &);
1723+
virtual void exec_ctxt(MCExecContext &ctxt);
17241724
virtual void compile(MCSyntaxFactoryRef);
17251725
};
17261726

0 commit comments

Comments
 (0)