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

dependencies of extra card fields are now also added and updated;

Browse Source 
this fixes combined_editor in extra fields.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1036 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-08-02 19:16:30 +00:00
parent 7aef2948e2
commit 2f5666ac5b
6 changed files with 47 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script/dependency.cpp
+7 -2
View File
@@ -20,6 +20,8 @@ DECLARE_TYPEOF_COLLECTION(Context::Binding);
// ----------------------------------------------------------------------------- : Dummy values
extern ScriptValueP dependency_dummy;
// A dummy type used during dependency analysis,
// it simply supresses all error messages.
class DependencyDummy : public ScriptIterator {
@@ -27,6 +29,7 @@ class DependencyDummy : public ScriptIterator {
virtual ScriptType type() const { return SCRIPT_DUMMY; }
virtual String typeName() const { return _("dummy"); }
virtual ScriptValueP next() { return ScriptValueP(); }
virtual ScriptValueP dependencyName(const ScriptValue&, const Dependency&) const { return dependency_dummy; }
};
ScriptValueP dependency_dummy(new DependencyDummy);
@@ -55,6 +58,9 @@ class DependencyUnion : public ScriptValue {
virtual ScriptValueP dependencyMember(const String& name, const Dependency& dep) const {
return unified(a->dependencyMember(name,dep), b->dependencyMember(name,dep));
}
virtual ScriptValueP dependencyName(const ScriptValue& container, const Dependency& dep) const {
return unified(a->dependencyName(container,dep), b->dependencyName(container,dep));
}
private:
ScriptValueP a, b;
};
@@ -297,8 +303,7 @@ ScriptValueP Context::dependencies(const Dependency& dep, const Script& script)
a = rangeIterator(0,0); // values don't matter
break;
case I_MEMBER: {
String name = *b;
a = a->dependencyMember(name, dep); // dependency on member
a = b->dependencyName(*a, dep); // dependency on member
break;
} case I_ADD:
unify(a, b); // may be function composition