From 4bdd0d5c0174f4f80e0fa6bd118bcdbacea9ab65 Mon Sep 17 00:00:00 2001
From: twanvl <twanvl@0fc631ac-6414-0410-93d0-97cfa31319b6>
Date: Wed, 21 Jul 2010 16:50:39 +0000
Subject: [PATCH] perhaps "orelse" is better syntax then "or else"?

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1445 0fc631ac-6414-0410-93d0-97cfa31319b6
---
 src/mse.vcproj        | 3 +++
 src/script/parser.cpp | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/mse.vcproj b/src/mse.vcproj
index 61894524..7fa98e8d 100644
--- a/src/mse.vcproj
+++ b/src/mse.vcproj
@@ -4006,6 +4006,9 @@
 			<Filter
 				Name="test"
 				Filter="">
+				<File
+					RelativePath="..\data\magic-test.mse-style\magic-script-tests">
+				</File>
 				<File
 					RelativePath="..\data\magic-test.mse-style\script-language-tests">
 				</File>
diff --git a/src/script/parser.cpp b/src/script/parser.cpp
index 815fa2fe..fbb6b5c0 100644
--- a/src/script/parser.cpp
+++ b/src/script/parser.cpp
@@ -662,11 +662,13 @@ void parseOper(TokenIterator& input, Script& script, Precedence minPrec, Instruc
 			script.getInstructions().pop_back();
 			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==_("or" )) {
 			Token t = input.peek();
 			if (t == _("else")) {// or else
 				input.read(); // skip else
+				// TODO: deprecate "or else" in favor of "orelse"
 				parseOper(input, script, PREC_ADD,   I_BINARY, I_OR_ELSE);
 			} else {
 				parseOper(input, script, PREC_CMP,   I_BINARY, I_OR);