Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef TOOLS_GN_VALUE_H_ | 5 #ifndef TOOLS_GN_VALUE_H_ |
| 6 #define TOOLS_GN_VALUE_H_ | 6 #define TOOLS_GN_VALUE_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 #include <map> | 9 #include <map> |
| 10 | 10 |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 25 INTEGER, | 25 INTEGER, |
| 26 STRING, | 26 STRING, |
| 27 LIST, | 27 LIST, |
| 28 SCOPE, | 28 SCOPE, |
| 29 }; | 29 }; |
| 30 | 30 |
| 31 Value(); | 31 Value(); |
| 32 Value(const ParseNode* origin, Type t); | 32 Value(const ParseNode* origin, Type t); |
| 33 Value(const ParseNode* origin, bool bool_val); | 33 Value(const ParseNode* origin, bool bool_val); |
| 34 Value(const ParseNode* origin, int64_t int_val); | 34 Value(const ParseNode* origin, int64_t int_val); |
| 35 Value(const ParseNode* origin, std::string str_val); | 35 Value(const ParseNode* origin, const std::string& str_val); |
| 36 Value(const ParseNode* origin, std::string&& str_val) noexcept; | |
|
brettw
2015/09/23 05:29:10
Same comment from the other patch here. This is st
ki.stfu
2015/09/23 05:44:10
Ok, I'll remove std::string&& version.
ki.stfu
2015/09/24 17:19:16
Done.
| |
| 36 Value(const ParseNode* origin, const char* str_val); | 37 Value(const ParseNode* origin, const char* str_val); |
| 37 // Values "shouldn't" have null scopes when type == Scope, so be sure to | 38 // Values "shouldn't" have null scopes when type == Scope, so be sure to |
| 38 // always set one. However, this is not asserted since there are some | 39 // always set one. However, this is not asserted since there are some |
| 39 // use-cases for creating values and immediately setting the scope on it. So | 40 // use-cases for creating values and immediately setting the scope on it. So |
| 40 // you can pass a null scope here if you promise to set it before any other | 41 // you can pass a null scope here if you promise to set it before any other |
| 41 // code gets it (code will generally assume the scope is not null). | 42 // code gets it (code will generally assume the scope is not null). |
| 42 Value(const ParseNode* origin, scoped_ptr<Scope> scope); | 43 Value(const ParseNode* origin, scoped_ptr<Scope> scope); |
| 43 | 44 |
| 44 Value(const Value& other); | 45 Value(const Value& other); |
| 45 ~Value(); | 46 ~Value(); |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 123 std::string string_value_; | 124 std::string string_value_; |
| 124 bool boolean_value_; | 125 bool boolean_value_; |
| 125 int64_t int_value_; | 126 int64_t int_value_; |
| 126 std::vector<Value> list_value_; | 127 std::vector<Value> list_value_; |
| 127 scoped_ptr<Scope> scope_value_; | 128 scoped_ptr<Scope> scope_value_; |
| 128 | 129 |
| 129 const ParseNode* origin_; | 130 const ParseNode* origin_; |
| 130 }; | 131 }; |
| 131 | 132 |
| 132 #endif // TOOLS_GN_VALUE_H_ | 133 #endif // TOOLS_GN_VALUE_H_ |
| OLD | NEW |