Commit 83ded30c authored by twanvl's avatar twanvl

perhaps "orelse" is better syntax then "or else"?

parent d5b2e7d7
...@@ -4006,6 +4006,9 @@ ...@@ -4006,6 +4006,9 @@
<Filter <Filter
Name="test" Name="test"
Filter=""> Filter="">
<File
RelativePath="..\data\magic-test.mse-style\magic-script-tests">
</File>
<File <File
RelativePath="..\data\magic-test.mse-style\script-language-tests"> RelativePath="..\data\magic-test.mse-style\script-language-tests">
</File> </File>
......
...@@ -662,11 +662,13 @@ void parseOper(TokenIterator& input, Script& script, Precedence minPrec, Instruc ...@@ -662,11 +662,13 @@ void parseOper(TokenIterator& input, Script& script, Precedence minPrec, Instruc
script.getInstructions().pop_back(); script.getInstructions().pop_back();
parseOper(input, script, PREC_SET, I_SET_VAR, instr.data); parseOper(input, script, PREC_SET, I_SET_VAR, instr.data);
} }
else if (minPrec <= PREC_AND && token==_("orelse"))parseOper(input, script, PREC_ADD, I_BINARY, I_OR_ELSE);
else if (minPrec <= PREC_AND && token==_("and")) parseOper(input, script, PREC_CMP, I_BINARY, I_AND); else if (minPrec <= PREC_AND && token==_("and")) parseOper(input, script, PREC_CMP, I_BINARY, I_AND);
else if (minPrec <= PREC_AND && token==_("or" )) { else if (minPrec <= PREC_AND && token==_("or" )) {
Token t = input.peek(); Token t = input.peek();
if (t == _("else")) {// or else if (t == _("else")) {// or else
input.read(); // skip else input.read(); // skip else
// TODO: deprecate "or else" in favor of "orelse"
parseOper(input, script, PREC_ADD, I_BINARY, I_OR_ELSE); parseOper(input, script, PREC_ADD, I_BINARY, I_OR_ELSE);
} else { } else {
parseOper(input, script, PREC_CMP, I_BINARY, I_OR); parseOper(input, script, PREC_CMP, I_BINARY, I_OR);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment