amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-12 05:36:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1445 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2010-07-21 16:50:39 +00:00
parent a6198ddf1b
commit 4bdd0d5c01
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mse.vcproj
+3
View File
@@ -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>
src/script/parser.cpp
+2
View File
@@ -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);