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

Optimize default arguments (@ operator) into script rules.

Browse Source 
The plan is to deprecate rule form completely, so instead of replace_rule(match:..) write replace_text@(match: ...)

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@987 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-06-18 19:25:18 +00:00
parent 50b09c7673
commit 2662f9d4bf
9 changed files with 122 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script/context.cpp
+6 -40
View File
@@ -12,8 +12,6 @@
#include <util/error.hpp>
#include <iostream>
DECLARE_TYPEOF_COLLECTION(pair<Variable COMMA ScriptValueP>);
// ----------------------------------------------------------------------------- : Context
Context::Context()
@@ -290,41 +288,6 @@ class ScriptCompose : public ScriptValue {
ScriptValueP a,b;
};
// ----------------------------------------------------------------------------- : Closures
/// A closure around a function
class ScriptClosure : public ScriptValue {
public:
ScriptClosure(ScriptValueP fun) : fun(fun) {}
/// Add a binding
void bind(Variable v, const ScriptValueP& value) {
bindings.push_back(make_pair(v,value));
}
/// Apply the bindings
void applyBindings(Context& ctx) const {
FOR_EACH_CONST(b, bindings) {
if (ctx.getVariableScope(b.first) != 0) {
ctx.setVariable(b.first, b.second);
}
}
}
virtual ScriptType type() const { return SCRIPT_FUNCTION; }
virtual String typeName() const { return _("function closure"); }
virtual ScriptValueP eval(Context& ctx) const {
applyBindings(ctx);
return fun->eval(ctx);
}
virtual ScriptValueP dependencies(Context& ctx, const Dependency& dep) const {
applyBindings(ctx);
return fun->dependencies(ctx, dep);
}
private:
ScriptValueP fun;
vector<pair<Variable,ScriptValueP> > bindings;
};
// ----------------------------------------------------------------------------- : Simple instructions : binary
// operator on ints
@@ -459,11 +422,14 @@ void Context::makeObject(size_t n) {
void Context::makeClosure(size_t n, const Instruction*& instr) {
intrusive_ptr<ScriptClosure> closure(new ScriptClosure(stack[stack.size() - n - 1]));
for (size_t j = 0 ; j < n ; ++j) {
closure->bind((Variable)instr[n - j - 1].data, stack.back());
closure->addBinding((Variable)instr[n - j - 1].data, stack.back());
stack.pop_back();
}
// skip arguments
instr += n;
// set value
stack.back() = closure;
// set value, try to simplify
stack.back() = closure->simplify();
if (!stack.back()) {
stack.back() = closure;
}
}