diff options
Diffstat (limited to 'eval.h')
-rw-r--r-- | eval.h | 21 |
1 files changed, 8 insertions, 13 deletions
@@ -53,9 +53,7 @@ class Evaluator { void set_loc(const Loc& loc) { loc_ = loc; } const vector<const Rule*>& rules() const { return rules_; } - const unordered_map<Symbol, Vars*>& rule_vars() const { - return rule_vars_; - } + const unordered_map<Symbol, Vars*>& rule_vars() const { return rule_vars_; } const unordered_map<Symbol, bool>& exports() const { return exports_; } void Error(const string& msg); @@ -74,28 +72,25 @@ class Evaluator { void add_delayed_output_command(const string& c) { delayed_output_commands_.push_back(c); } - void clear_delayed_output_commands() { - delayed_output_commands_.clear(); - } + void clear_delayed_output_commands() { delayed_output_commands_.clear(); } static const unordered_set<Symbol>& used_undefined_vars() { return used_undefined_vars_; } int eval_depth() const { return eval_depth_; } - void IncrementEvalDepth() { - eval_depth_++; - } - void DecrementEvalDepth() { - eval_depth_--; - } + void IncrementEvalDepth() { eval_depth_++; } + void DecrementEvalDepth() { eval_depth_--; } string GetShell(); string GetShellFlag(); string GetShellAndFlag(); private: - Var* EvalRHS(Symbol lhs, Value* rhs, StringPiece orig_rhs, AssignOp op, + Var* EvalRHS(Symbol lhs, + Value* rhs, + StringPiece orig_rhs, + AssignOp op, bool is_override = false); void DoInclude(const string& fname); |