aboutsummaryrefslogtreecommitdiff
path: root/var.cc
diff options
context:
space:
mode:
authorShinichiro Hamaji <shinichiro.hamaji@gmail.com>2017-10-13 16:52:23 +0900
committerGitHub <noreply@github.com>2017-10-13 16:52:23 +0900
commitf2a0a72d1fd1ee7b6f37754eef8886dcaafa22d0 (patch)
treec7f3d604ed57e0afb6eb591c1e531fd5373b2036 /var.cc
parent99cc5f403c60bbbfa3af35d37d5e10f9caa8fe49 (diff)
parent3ce083f01d6e62e9fb9b328e312d97a074fe6128 (diff)
downloadkati-f2a0a72d1fd1ee7b6f37754eef8886dcaafa22d0.tar.gz
Merge pull request #128 from danw/clang-format
Format the codebase with clang-format
Diffstat (limited to 'var.cc')
-rw-r--r--var.cc40
1 files changed, 21 insertions, 19 deletions
diff --git a/var.cc b/var.cc
index 1e6f5bb..27d92c7 100644
--- a/var.cc
+++ b/var.cc
@@ -25,36 +25,39 @@ UndefinedVar* kUndefined = &kUndefinedBuf;
const char* GetOriginStr(VarOrigin origin) {
switch (origin) {
- case VarOrigin::UNDEFINED: return "undefined";
- case VarOrigin::DEFAULT: return "default";
- case VarOrigin::ENVIRONMENT: return "environment";
- case VarOrigin::ENVIRONMENT_OVERRIDE: return "environment override";
- case VarOrigin::FILE: return "file";
- case VarOrigin::COMMAND_LINE: return "command line";
- case VarOrigin::OVERRIDE: return "override";
- case VarOrigin::AUTOMATIC: return "automatic";
+ case VarOrigin::UNDEFINED:
+ return "undefined";
+ case VarOrigin::DEFAULT:
+ return "default";
+ case VarOrigin::ENVIRONMENT:
+ return "environment";
+ case VarOrigin::ENVIRONMENT_OVERRIDE:
+ return "environment override";
+ case VarOrigin::FILE:
+ return "file";
+ case VarOrigin::COMMAND_LINE:
+ return "command line";
+ case VarOrigin::OVERRIDE:
+ return "override";
+ case VarOrigin::AUTOMATIC:
+ return "automatic";
}
CHECK(false);
return "*** broken origin ***";
}
-Var::Var() : readonly_(false), message_(), error_(false) {
-}
+Var::Var() : readonly_(false), message_(), error_(false) {}
-Var::~Var() {
-}
+Var::~Var() {}
void Var::AppendVar(Evaluator*, Value*) {
CHECK(false);
}
-SimpleVar::SimpleVar(VarOrigin origin)
- : origin_(origin) {
-}
+SimpleVar::SimpleVar(VarOrigin origin) : origin_(origin) {}
SimpleVar::SimpleVar(const string& v, VarOrigin origin)
- : v_(v), origin_(origin) {
-}
+ : v_(v), origin_(origin) {}
void SimpleVar::Eval(Evaluator*, string* s) const {
*s += v_;
@@ -76,8 +79,7 @@ string SimpleVar::DebugString() const {
}
RecursiveVar::RecursiveVar(Value* v, VarOrigin origin, StringPiece orig)
- : v_(v), origin_(origin), orig_(orig) {
-}
+ : v_(v), origin_(origin), orig_(orig) {}
void RecursiveVar::Eval(Evaluator* ev, string* s) const {
v_->Eval(ev, s);