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

Use smart_less when sorting collections

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@967 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-06-03 19:26:23 +00:00
parent 92947dc5b8
commit aa950d1821
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script/functions/basic.cpp
+5 -1
View File
@@ -201,6 +201,10 @@ int position_in_vector(const ScriptValueP& of, const ScriptValueP& in, const Scr
return -1; // TODO? return -1; // TODO?
} }
inline bool smart_less_first(const pair<String,ScriptValueP>& a, const pair<String,ScriptValueP>& b) {
return smart_less(a.first, b.first);
}
// sort a script list // sort a script list
ScriptValueP sort_script(Context& ctx, const ScriptValueP& list, ScriptValue& order_by) { ScriptValueP sort_script(Context& ctx, const ScriptValueP& list, ScriptValue& order_by) {
ScriptType list_t = list->type(); ScriptType list_t = list->type();
@@ -219,7 +223,7 @@ ScriptValueP sort_script(Context& ctx, const ScriptValueP& list, ScriptValue& or
ctx.setVariable(set ? _("card") : _("input"), v); ctx.setVariable(set ? _("card") : _("input"), v);
values.push_back(make_pair(order_by.eval(ctx)->toString(), v)); values.push_back(make_pair(order_by.eval(ctx)->toString(), v));
} }
sort(values.begin(), values.end()); sort(values.begin(), values.end(), smart_less_first);
// return collection // return collection
intrusive_ptr<ScriptCustomCollection> ret(new ScriptCustomCollection()); intrusive_ptr<ScriptCustomCollection> ret(new ScriptCustomCollection());
FOR_EACH(v, values) { FOR_EACH(v, values) {