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

Make == script operator to work correctly on collections (lists)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@992 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-06-18 23:11:26 +00:00
parent b7ffca6cfc
commit a9c5f72fdc
5 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script/context.cpp
+6 -3
View File
@@ -251,7 +251,10 @@ ScriptValueP Context::makeClosure(const ScriptValueP& fun) {
if (variables[var].level < level) break;
closure->addBinding(var, variables[var].value);
}
return closure;
// can we simplify?
ScriptValueP better = closure->simplify();
if (better) return better;
else return closure;
}
@@ -392,8 +395,8 @@ void instrBinary (BinaryInstructionType i, ScriptValueP& a, const ScriptValueP&
case I_AND: OPERATOR_I(&&);
case I_OR: OPERATOR_I(||);
case I_XOR: a = to_script((bool)*a != (bool)*b); break;
case I_EQ: a = to_script( equal(*a,*b)); break;
case I_NEQ: a = to_script(!equal(*a,*b)); break;
case I_EQ: a = to_script( equal(a,b)); break;
case I_NEQ: a = to_script(!equal(a,b)); break;
case I_LT: OPERATOR_DI(<);
case I_GT: OPERATOR_DI(>);
case I_LE: OPERATOR_DI(<=);