0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed behavior of map function

Browse source
This commit is contained in:
David White 2008-04-02 05:33:53 +00:00
parent 6ab91803ef
commit a86d16a8db
5 changed files with 42 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/formula_callable.hpp
View file

@ -118,7 +118,26 @@ public:
{}
};
class formula_variant_callable_with_backup : public formula_callable {
variant var_;
const formula_callable& backup_;
variant get_value(const std::string& key) const {
variant var = var_.get_member(key);
if(var.is_null()) {
return backup_.query_value(key);
}
return var;
}
void get_inputs(std::vector<formula_input>* inputs) const {
backup_.get_inputs(inputs);
}
public:
formula_variant_callable_with_backup(const variant& var, const formula_callable& backup) : formula_callable(false), var_(var), backup_(backup)
{}
};
class map_formula_callable : public formula_callable {
public:

14
src/formula_function.cpp
View file

@ -271,7 +271,7 @@ private:
int max_index = -1;
variant max_value;
for(int n = 0; n != items.num_elements(); ++n) {
const variant val = args()[1]->evaluate(formula_callable_with_backup(*items[n].as_callable(), variables));
const variant val = args()[1]->evaluate(formula_variant_callable_with_backup(items[n], variables));
if(max_index == -1 || val > max_value) {
max_index = n;
max_value = val;
@ -366,7 +366,7 @@ private:
const variant items = args()[0]->evaluate(variables);
if(args().size() == 2) {
for(int n = 0; n != items.num_elements(); ++n) {
const variant val = args()[1]->evaluate(formula_callable_with_backup(*items[n].as_callable(), variables));
const variant val = args()[1]->evaluate(formula_variant_callable_with_backup(items[n], variables));
if(val.as_bool()) {
vars.push_back(items[n]);
}
@ -376,7 +376,7 @@ private:
const std::string self = args()[1]->evaluate(variables).as_string();
for(int n = 0; n != items.num_elements(); ++n) {
self_callable.add(self, items[n]);
const variant val = args()[2]->evaluate(formula_callable_with_backup(self_callable, formula_callable_with_backup(*items[n].as_callable(), variables)));
const variant val = args()[2]->evaluate(formula_callable_with_backup(self_callable, formula_variant_callable_with_backup(items[n], variables)));
if(val.as_bool()) {
vars.push_back(items[n]);
}
@ -399,7 +399,7 @@ private:
if(args().size() == 2) {
for(int n = 0; n != items.num_elements(); ++n) {
const variant val = args()[1]->evaluate(formula_callable_with_backup(*items[n].as_callable(), variables));
const variant val = args()[1]->evaluate(formula_variant_callable_with_backup(items[n], variables));
if(val.as_bool()) {
return items[n];
}
@ -409,7 +409,7 @@ private:
const std::string self = args()[1]->evaluate(variables).as_string();
for(int n = 0; n != items.num_elements(); ++n) {
self_callable.add(self, items[n]);
const variant val = args().back()->evaluate(formula_callable_with_backup(self_callable, formula_callable_with_backup(*items[n].as_callable(), variables)));
const variant val = args().back()->evaluate(formula_callable_with_backup(self_callable, formula_variant_callable_with_backup(items[n], variables)));
if(val.as_bool()) {
return items[n];
}
@ -432,7 +432,7 @@ private:
if(args().size() == 2) {
for(int n = 0; n != items.num_elements(); ++n) {
const variant val = args().back()->evaluate(formula_callable_with_backup(*items[n].as_callable(), variables));
const variant val = args().back()->evaluate(formula_variant_callable_with_backup(items[n], variables));
vars.push_back(val);
}
} else {
@ -440,7 +440,7 @@ private:
const std::string self = args()[1]->evaluate(variables).as_string();
for(int n = 0; n != items.num_elements(); ++n) {
self_callable.add(self, items[n]);
const variant val = args().back()->evaluate(formula_callable_with_backup(self_callable, formula_callable_with_backup(*items[n].as_callable(), variables)));
const variant val = args().back()->evaluate(formula_callable_with_backup(self_callable, formula_variant_callable_with_backup(items[n], variables)));
vars.push_back(val);
}
}

1
src/server/simple_wml.cpp
View file

@ -847,6 +847,7 @@ void document::generate_root()
output_ = uncompressed_buf.begin();
}
assert(root_ == NULL);
const char* cbuf = output_;
root_ = new node(*this, NULL, &cbuf);
}

13
src/variant.cpp
View file

@ -202,6 +202,19 @@ size_t variant::num_elements() const
return list_->elements.size();
}
variant variant::get_member(const std::string& str) const
{
if(is_callable()) {
return callable_->query_value(str);
}
if(str == "self") {
return *this;
} else {
return variant();
}
}
bool variant::as_bool() const
{
switch(type_) {

2
src/variant.hpp
View file

@ -46,6 +46,8 @@ public:
const variant& operator[](size_t n) const;
size_t num_elements() const;
variant get_member(const std::string& str) const;
bool is_string() const { return type_ == TYPE_STRING; }
bool is_null() const { return type_ == TYPE_NULL; }
bool is_int() const { return type_ == TYPE_INT; }