summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2015-01-14 16:28:58 (GMT)
committerNico Weber <nicolasweber@gmx.de>2015-01-14 16:28:58 (GMT)
commit81d43ed3ee5b399f69fdff4b520523d43ae0c2d4 (patch)
tree271fe7db5e17bb8112c2f425477fb70dcaf6f23c
parentda94924bddd2554957067c06fb10ff2a8eb58824 (diff)
parent2908829b7c129b6d6f1c04e65893647d2e0e8b36 (diff)
downloadNinja-81d43ed3ee5b399f69fdff4b520523d43ae0c2d4.zip
Ninja-81d43ed3ee5b399f69fdff4b520523d43ae0c2d4.tar.gz
Ninja-81d43ed3ee5b399f69fdff4b520523d43ae0c2d4.tar.bz2
Merge pull request #894 from tfarina/has-indent
Cleanup: Fix 'hasIdent' variable name/style.
-rw-r--r--src/manifest_parser.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/manifest_parser.cc b/src/manifest_parser.cc
index 388b5bc..7ee990b 100644
--- a/src/manifest_parser.cc
+++ b/src/manifest_parser.cc
@@ -298,16 +298,16 @@ bool ManifestParser::ParseEdge(string* err) {
return false;
// Bindings on edges are rare, so allocate per-edge envs only when needed.
- bool hasIdent = lexer_.PeekToken(Lexer::INDENT);
- BindingEnv* env = hasIdent ? new BindingEnv(env_) : env_;
- while (hasIdent) {
+ bool has_indent_token = lexer_.PeekToken(Lexer::INDENT);
+ BindingEnv* env = has_indent_token ? new BindingEnv(env_) : env_;
+ while (has_indent_token) {
string key;
EvalString val;
if (!ParseLet(&key, &val, err))
return false;
env->AddBinding(key, val.Evaluate(env_));
- hasIdent = lexer_.PeekToken(Lexer::INDENT);
+ has_indent_token = lexer_.PeekToken(Lexer::INDENT);
}
Edge* edge = state_->AddEdge(rule);