Skip to content

Commit

Permalink
Made formula_callable::get_inputs and add_input take a reference inst…
Browse files Browse the repository at this point in the history 
…ead of a pointer
  • Loading branch information
@Vultraz
Vultraz committed Apr 3, 2017
1 parent 7660089 commit 92d0be3
Show file tree
Hide file tree
Showing 14 changed files with 62 additions and 62 deletions.
2 changes: 1 addition & 1 deletion src/ai/default/attack.cpp
View file
Expand Up @@ -386,7 +386,7 @@ wfl::variant attack_analysis::get_value(const std::string& key) const
}
}

void attack_analysis::get_inputs(wfl::formula_input_vector* inputs) const
void attack_analysis::get_inputs(wfl::formula_input_vector& inputs) const
{
add_input(inputs, "target");
add_input(inputs, "movements");
Expand Down
2 changes: 1 addition & 1 deletion src/ai/default/contexts.hpp
View file
Expand Up @@ -86,7 +86,7 @@ class attack_analysis : public wfl::action_callable

double rating(double aggression, const readonly_context& ai_obj) const;
wfl::variant get_value(const std::string& key) const;
void get_inputs(wfl::formula_input_vector* inputs) const;
void get_inputs(wfl::formula_input_vector& inputs) const;

bool attack_close(const map_location& loc) const;

Expand Down
2 changes: 1 addition & 1 deletion src/ai/formula/ai.cpp
View file
Expand Up @@ -562,7 +562,7 @@ variant formula_ai::get_value(const std::string& key) const
return variant();
}

void formula_ai::get_inputs(formula_input_vector* inputs) const
void formula_ai::get_inputs(formula_input_vector& inputs) const
{
add_input(inputs, "aggression");
add_input(inputs, "leader_aggression");
Expand Down
2 changes: 1 addition & 1 deletion src/ai/formula/ai.hpp
View file
Expand Up @@ -163,7 +163,7 @@ class formula_ai : public readonly_context_proxy, public wfl::formula_callable {
void display_message(const std::string& msg) const;
virtual wfl::variant get_value(const std::string& key) const;
void set_value(const std::string& key, const wfl::variant& value);
virtual void get_inputs(wfl::formula_input_vector* inputs) const;
virtual void get_inputs(wfl::formula_input_vector& inputs) const;

mutable wfl::variant keeps_cache_;

Expand Down
16 changes: 8 additions & 8 deletions src/ai/formula/callable_objects.cpp
View file
Expand Up @@ -63,7 +63,7 @@ variant move_map_callable::get_value(const std::string& key) const
}
}

void move_map_callable::get_inputs(formula_input_vector* inputs) const
void move_map_callable::get_inputs(formula_input_vector& inputs) const
{
add_input(inputs, "moves");
}
Expand Down Expand Up @@ -134,7 +134,7 @@ variant position_callable::get_value(const std::string& key) const {
}
}

void position_callable::get_inputs(formula_input_vector* inputs) const {
void position_callable::get_inputs(formula_input_vector& inputs) const {
add_input(inputs, "chance");
}

Expand All @@ -150,7 +150,7 @@ variant outcome_callable::get_value(const std::string& key) const {
}
}

void outcome_callable::get_inputs(formula_input_vector* inputs) const {
void outcome_callable::get_inputs(formula_input_vector& inputs) const {
add_input(inputs, "hitpoints_left");
add_input(inputs, "probability");
add_input(inputs, "possible_status");
Expand Down Expand Up @@ -179,7 +179,7 @@ variant attack_callable::get_value(const std::string& key) const {
}
}

void attack_callable::get_inputs(formula_input_vector* inputs) const {
void attack_callable::get_inputs(formula_input_vector& inputs) const {
add_input(inputs, "attack_from");
add_input(inputs, "defender");
add_input(inputs, "move_from");
Expand Down Expand Up @@ -264,7 +264,7 @@ variant attack_map_callable::get_value(const std::string& key) const {
}
}

void attack_map_callable::get_inputs(formula_input_vector* inputs) const {
void attack_map_callable::get_inputs(formula_input_vector& inputs) const {
add_input(inputs, "attacks");
}

Expand Down Expand Up @@ -301,7 +301,7 @@ variant recall_callable::get_value(const std::string& key) const {
return variant();
}

void recall_callable::get_inputs(formula_input_vector* inputs) const {
void recall_callable::get_inputs(formula_input_vector& inputs) const {
add_input(inputs, "id");
add_input(inputs, "loc");
}
Expand All @@ -328,7 +328,7 @@ variant recruit_callable::get_value(const std::string& key) const {
return variant();
}

void recruit_callable::get_inputs(formula_input_vector* inputs) const {
void recruit_callable::get_inputs(formula_input_vector& inputs) const {
add_input(inputs, "unit_type");
add_input(inputs, "recruit_loc");
}
Expand Down Expand Up @@ -364,7 +364,7 @@ variant set_unit_var_callable::get_value(const std::string& key) const {
return variant();
}

void set_unit_var_callable::get_inputs(formula_input_vector* inputs) const {
void set_unit_var_callable::get_inputs(formula_input_vector& inputs) const {
add_input(inputs, "loc");
add_input(inputs, "key");
add_input(inputs, "value");
Expand Down
20 changes: 10 additions & 10 deletions src/ai/formula/callable_objects.hpp
View file
Expand Up @@ -39,7 +39,7 @@ class attack_map_callable : public formula_callable {

variant get_value(const std::string& key) const;

void get_inputs(formula_input_vector* inputs) const;
void get_inputs(formula_input_vector& inputs) const;

/* add to vars all attacks on enemy units around <attack_position> tile. attacker_location is tile where unit is currently standing. It's moved to attack_position first and then performs attack.*/
void collect_possible_attacks(std::vector<variant>& vars, map_location attacker_location, map_location attack_position) const;
Expand All @@ -50,7 +50,7 @@ class attack_callable : public action_callable {
battle_context bc_;
variant get_value(const std::string& key) const;

void get_inputs(formula_input_vector* inputs) const;
void get_inputs(formula_input_vector& inputs) const;
public:
attack_callable(const map_location& move_from,
const map_location& src, const map_location& dst, int weapon);
Expand Down Expand Up @@ -79,7 +79,7 @@ class move_callable : public action_callable {
return variant();
}
}
void get_inputs(formula_input_vector* inputs) const {
void get_inputs(formula_input_vector& inputs) const {
add_input(inputs, "src");
add_input(inputs, "dst");
}
Expand Down Expand Up @@ -108,7 +108,7 @@ class move_partial_callable : public action_callable {
return variant();
}
}
void get_inputs(formula_input_vector* inputs) const {
void get_inputs(formula_input_vector& inputs) const {
add_input(inputs, "src");
add_input(inputs, "dst");
}
Expand All @@ -132,7 +132,7 @@ class recall_callable : public action_callable {

variant get_value(const std::string& key) const;

void get_inputs(formula_input_vector* inputs) const;
void get_inputs(formula_input_vector& inputs) const;
public:
recall_callable(const map_location& loc, const std::string& id)
: loc_(loc), id_(id)
Expand All @@ -149,7 +149,7 @@ class recruit_callable : public action_callable {

variant get_value(const std::string& key) const;

void get_inputs(formula_input_vector* inputs) const;
void get_inputs(formula_input_vector& inputs) const;
public:
recruit_callable(const map_location& loc, const std::string& type)
: loc_(loc), type_(type)
Expand All @@ -166,7 +166,7 @@ class set_unit_var_callable : public action_callable {
map_location loc_;
variant get_value(const std::string& key) const;

void get_inputs(formula_input_vector* inputs) const;
void get_inputs(formula_input_vector& inputs) const;
public:
set_unit_var_callable(const std::string& key, const variant& value, const map_location& loc)
: key_(key), value_(value), loc_(loc)
Expand All @@ -193,7 +193,7 @@ class move_map_callable : public formula_callable {
const unit_map& units_;

variant get_value(const std::string& key) const;
void get_inputs(formula_input_vector* inputs) const;
void get_inputs(formula_input_vector& inputs) const;
public:
move_map_callable(const move_map& srcdst, const move_map& dstsrc, const unit_map& units)
: srcdst_(srcdst), dstsrc_(dstsrc), units_(units)
Expand All @@ -210,7 +210,7 @@ class position_callable : public formula_callable {
int chance_;
variant get_value(const std::string& key) const;

void get_inputs(formula_input_vector* inputs) const;
void get_inputs(formula_input_vector& inputs) const;
public:
position_callable(/*unit_map* units,*/ int chance) :
//units_(),
Expand Down Expand Up @@ -241,7 +241,7 @@ class outcome_callable : public formula_callable {
std::vector<variant> hitLeft_, prob_, status_;
variant get_value(const std::string& key) const;

void get_inputs(formula_input_vector* inputs) const;
void get_inputs(formula_input_vector& inputs) const;
public:
outcome_callable( const std::vector<variant>& hitLeft,
const std::vector<variant>& prob,
Expand Down
14 changes: 7 additions & 7 deletions src/formula/callable.hpp
View file
Expand Up @@ -62,11 +62,11 @@ class formula_callable
formula_input_vector inputs() const
{
formula_input_vector res;
get_inputs(&res);
get_inputs(res);
return res;
}

virtual void get_inputs(formula_input_vector* /*inputs*/) const {}
virtual void get_inputs(formula_input_vector& /*inputs*/) const {}

bool equals(const formula_callable* other) const
{
Expand Down Expand Up @@ -124,9 +124,9 @@ class formula_callable
return variant(tmp);
}

static inline void add_input(formula_input_vector* inputs, const std::string& key, FORMULA_ACCESS_TYPE access_type = FORMULA_READ_ONLY)
static inline void add_input(formula_input_vector& inputs, const std::string& key, FORMULA_ACCESS_TYPE access_type = FORMULA_READ_ONLY)
{
inputs->push_back(formula_input(key, access_type));
inputs.push_back(formula_input(key, access_type));
}

virtual void set_value(const std::string& key, const variant& /*value*/)
Expand Down Expand Up @@ -193,7 +193,7 @@ class formula_callable_with_backup : public formula_callable
return var;
}

void get_inputs(formula_input_vector* inputs) const
void get_inputs(formula_input_vector& inputs) const
{
main_.get_inputs(inputs);
backup_.get_inputs(inputs);
Expand Down Expand Up @@ -221,7 +221,7 @@ class formula_variant_callable_with_backup : public formula_callable
return var;
}

void get_inputs(formula_input_vector* inputs) const
void get_inputs(formula_input_vector& inputs) const
{
backup_.get_inputs(inputs);
}
Expand Down Expand Up @@ -277,7 +277,7 @@ class map_formula_callable : public formula_callable
return variant();
}

void get_inputs(formula_input_vector* inputs) const
void get_inputs(formula_input_vector& inputs) const
{
if(fallback_) {
fallback_->get_inputs(inputs);
Expand Down
22 changes: 11 additions & 11 deletions src/formula/callable_objects.cpp
View file
Expand Up @@ -39,7 +39,7 @@ variant location_callable::get_value(const std::string& key) const
return variant();
}

void location_callable::get_inputs(formula_input_vector* inputs) const
void location_callable::get_inputs(formula_input_vector& inputs) const
{
add_input(inputs, "x");
add_input(inputs, "y");
Expand Down Expand Up @@ -103,7 +103,7 @@ variant attack_type_callable::get_value(const std::string& key) const
return variant();
}

void attack_type_callable::get_inputs(formula_input_vector* inputs) const
void attack_type_callable::get_inputs(formula_input_vector& inputs) const
{
add_input(inputs, "name");
add_input(inputs, "type");
Expand Down Expand Up @@ -265,7 +265,7 @@ variant unit_callable::get_value(const std::string& key) const
return variant();
}

void unit_callable::get_inputs(formula_input_vector* inputs) const
void unit_callable::get_inputs(formula_input_vector& inputs) const
{
add_input(inputs, "x");
add_input(inputs, "y");
Expand Down Expand Up @@ -369,7 +369,7 @@ variant unit_type_callable::get_value(const std::string& key) const
return variant();
}

void unit_type_callable::get_inputs(formula_input_vector* inputs) const
void unit_type_callable::get_inputs(formula_input_vector& inputs) const
{
add_input(inputs, "id");
add_input(inputs, "type");
Expand Down Expand Up @@ -457,7 +457,7 @@ variant config_callable::get_value(const std::string& key) const
return variant();
}

void config_callable::get_inputs(formula_input_vector* inputs) const
void config_callable::get_inputs(formula_input_vector& inputs) const
{
add_input(inputs, "__all_children");
add_input(inputs, "__children");
Expand Down Expand Up @@ -517,7 +517,7 @@ variant terrain_callable::get_value(const std::string& key) const
return variant();
}

void terrain_callable::get_inputs(formula_input_vector* inputs) const
void terrain_callable::get_inputs(formula_input_vector& inputs) const
{
add_input(inputs, "x");
add_input(inputs, "y");
Expand Down Expand Up @@ -545,7 +545,7 @@ int terrain_callable::do_compare(const formula_callable* callable) const
return loc_.do_compare(other_loc);
}

void gamemap_callable::get_inputs(formula_input_vector* inputs) const
void gamemap_callable::get_inputs(formula_input_vector& inputs) const
{
add_input(inputs, "gamemap");
add_input(inputs, "terrain");
Expand Down Expand Up @@ -577,7 +577,7 @@ variant gamemap_callable::get_value(const std::string& key) const
}
}

void team_callable::get_inputs(formula_input_vector* inputs) const
void team_callable::get_inputs(formula_input_vector& inputs) const
{
add_input(inputs, "side");
add_input(inputs, "id");
Expand Down Expand Up @@ -684,7 +684,7 @@ variant set_var_callable::get_value(const std::string& key) const
return variant();
}

void set_var_callable::get_inputs(formula_input_vector* inputs) const
void set_var_callable::get_inputs(formula_input_vector& inputs) const
{
add_input(inputs, "key");
add_input(inputs, "value");
Expand Down Expand Up @@ -716,7 +716,7 @@ variant safe_call_callable::get_value(const std::string& key) const
return variant();
}

void safe_call_callable::get_inputs(formula_input_vector* inputs) const
void safe_call_callable::get_inputs(formula_input_vector& inputs) const
{
add_input(inputs, "main");
add_input(inputs, "backup");
Expand Down Expand Up @@ -764,7 +764,7 @@ variant safe_call_result::get_value(const std::string& key) const
return variant();
}

void safe_call_result::get_inputs(formula_input_vector* inputs) const
void safe_call_result::get_inputs(formula_input_vector& inputs) const
{
add_input(inputs, "status");
add_input(inputs, "object");
Expand Down

0 comments on commit 92d0be3

Please sign in to comment.