Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitab76ce5

Browse files
committed
Renamed GetCurrent*Flags to Get*Flags
1 parent2d49073 commitab76ce5

File tree

9 files changed

+72
-74
lines changed

9 files changed

+72
-74
lines changed

‎buildcc/lib/target/include/target/api/target_info_getter.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ template <typename T> class TargetInfoGetter {
5151
const std::vector<std::string> &GetExternalLibDeps()const;
5252
const fs_unordered_set &GetIncludeDirs()const;
5353
const fs_unordered_set &GetLibDirs()const;
54-
const std::unordered_set<std::string> &GetCurrentPreprocessorFlags()const;
55-
const std::unordered_set<std::string> &GetCurrentCommonCompileFlags()const;
56-
const std::unordered_set<std::string> &GetCurrentPchCompileFlags()const;
57-
const std::unordered_set<std::string> &GetCurrentPchObjectFlags()const;
58-
const std::unordered_set<std::string> &GetCurrentAsmCompileFlags()const;
59-
const std::unordered_set<std::string> &GetCurrentCCompileFlags()const;
60-
const std::unordered_set<std::string> &GetCurrentCppCompileFlags()const;
61-
const std::unordered_set<std::string> &GetCurrentLinkFlags()const;
54+
const std::unordered_set<std::string> &GetPreprocessorFlags()const;
55+
const std::unordered_set<std::string> &GetCommonCompileFlags()const;
56+
const std::unordered_set<std::string> &GetPchCompileFlags()const;
57+
const std::unordered_set<std::string> &GetPchObjectFlags()const;
58+
const std::unordered_set<std::string> &GetAsmCompileFlags()const;
59+
const std::unordered_set<std::string> &GetCCompileFlags()const;
60+
const std::unordered_set<std::string> &GetCppCompileFlags()const;
61+
const std::unordered_set<std::string> &GetLinkFlags()const;
6262
const fs_unordered_set &GetCompileDependencies()const;
6363
const fs_unordered_set &GetLinkDependencies()const;
6464
};

‎buildcc/lib/target/src/api/target_info_getter.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,63 +115,63 @@ const fs_unordered_set &TargetInfoGetter<T>::GetLibDirs() const {
115115

116116
template<typename T>
117117
const std::unordered_set<std::string> &
118-
TargetInfoGetter<T>::GetCurrentPreprocessorFlags()const {
118+
TargetInfoGetter<T>::GetPreprocessorFlags()const {
119119
const T &t =static_cast<const T &>(*this);
120120

121121
return t.storer_.current_preprocessor_flags;
122122
}
123123

124124
template<typename T>
125125
const std::unordered_set<std::string> &
126-
TargetInfoGetter<T>::GetCurrentCommonCompileFlags()const {
126+
TargetInfoGetter<T>::GetCommonCompileFlags()const {
127127
const T &t =static_cast<const T &>(*this);
128128

129129
return t.storer_.current_common_compile_flags;
130130
}
131131

132132
template<typename T>
133133
const std::unordered_set<std::string> &
134-
TargetInfoGetter<T>::GetCurrentPchCompileFlags()const {
134+
TargetInfoGetter<T>::GetPchCompileFlags()const {
135135
const T &t =static_cast<const T &>(*this);
136136

137137
return t.storer_.current_pch_compile_flags;
138138
}
139139

140140
template<typename T>
141141
const std::unordered_set<std::string> &
142-
TargetInfoGetter<T>::GetCurrentPchObjectFlags()const {
142+
TargetInfoGetter<T>::GetPchObjectFlags()const {
143143
const T &t =static_cast<const T &>(*this);
144144

145145
return t.storer_.current_pch_object_flags;
146146
}
147147

148148
template<typename T>
149149
const std::unordered_set<std::string> &
150-
TargetInfoGetter<T>::GetCurrentAsmCompileFlags()const {
150+
TargetInfoGetter<T>::GetAsmCompileFlags()const {
151151
const T &t =static_cast<const T &>(*this);
152152

153153
return t.storer_.current_asm_compile_flags;
154154
}
155155

156156
template<typename T>
157157
const std::unordered_set<std::string> &
158-
TargetInfoGetter<T>::GetCurrentCCompileFlags()const {
158+
TargetInfoGetter<T>::GetCCompileFlags()const {
159159
const T &t =static_cast<const T &>(*this);
160160

161161
return t.storer_.current_c_compile_flags;
162162
}
163163

164164
template<typename T>
165165
const std::unordered_set<std::string> &
166-
TargetInfoGetter<T>::GetCurrentCppCompileFlags()const {
166+
TargetInfoGetter<T>::GetCppCompileFlags()const {
167167
const T &t =static_cast<const T &>(*this);
168168

169169
return t.storer_.current_cpp_compile_flags;
170170
}
171171

172172
template<typename T>
173173
const std::unordered_set<std::string> &
174-
TargetInfoGetter<T>::GetCurrentLinkFlags()const {
174+
TargetInfoGetter<T>::GetLinkFlags()const {
175175
const T &t =static_cast<const T &>(*this);
176176

177177
return t.storer_.current_link_flags;

‎buildcc/lib/target/src/target/build.cpp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,14 @@ void Target::Build() {
7676
command_.AddDefaultArguments({
7777
{kIncludeDirs,internal::aggregate_with_prefix(config_.prefix_include_dir,
7878
GetIncludeDirs())},
79-
{kLibDirs,internal::aggregate_with_prefix(config_.prefix_lib_dir,
80-
GetLibDirs())},
79+
{kLibDirs,
80+
internal::aggregate_with_prefix(config_.prefix_lib_dir,GetLibDirs())},
8181

82-
{kPreprocessorFlags,internal::aggregate(GetCurrentPreprocessorFlags())},
83-
{kCommonCompileFlags,
84-
internal::aggregate(GetCurrentCommonCompileFlags())},
82+
{kPreprocessorFlags,internal::aggregate(GetPreprocessorFlags())},
83+
{kCommonCompileFlags,internal::aggregate(GetCommonCompileFlags())},
8584
// TODO, Cache more flags here
8685
// ASM, C and CPP flags
87-
{kLinkFlags,internal::aggregate(GetCurrentLinkFlags())},
86+
{kLinkFlags,internal::aggregate(GetLinkFlags())},
8887

8988
// Toolchain executables here
9089
{kAsmCompiler, toolchain_.GetAsmCompiler()},
@@ -104,8 +103,8 @@ void Target::Build() {
104103
// PCH Compile
105104
if (state_.ContainsPch()) {
106105
command_.AddDefaultArguments({
107-
{kPchCompileFlags,internal::aggregate(GetCurrentPchCompileFlags())},
108-
{kPchObjectFlags,internal::aggregate(GetCurrentPchObjectFlags())},
106+
{kPchCompileFlags,internal::aggregate(GetPchCompileFlags())},
107+
{kPchObjectFlags,internal::aggregate(GetPchObjectFlags())},
109108
{kPchObjectOutput,fmt::format("{}", compile_pch_.GetObjectPath())},
110109
});
111110

‎buildcc/lib/target/src/target/friend/compile_object.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,17 +145,17 @@ void CompileObject::BuildObjectCompile(
145145
target_.dirty_ =true;
146146
}else {
147147
target_.RecheckFlags(loader.GetLoadedPreprocessorFlags(),
148-
target_.GetCurrentPreprocessorFlags());
148+
target_.GetPreprocessorFlags());
149149
target_.RecheckFlags(loader.GetLoadedCommonCompileFlags(),
150-
target_.GetCurrentCommonCompileFlags());
150+
target_.GetCommonCompileFlags());
151151
target_.RecheckFlags(loader.GetLoadedPchObjectFlags(),
152-
target_.GetCurrentPchObjectFlags());
152+
target_.GetPchObjectFlags());
153153
target_.RecheckFlags(loader.GetLoadedAsmCompileFlags(),
154-
target_.GetCurrentAsmCompileFlags());
154+
target_.GetAsmCompileFlags());
155155
target_.RecheckFlags(loader.GetLoadedCCompileFlags(),
156-
target_.GetCurrentCCompileFlags());
156+
target_.GetCCompileFlags());
157157
target_.RecheckFlags(loader.GetLoadedCppCompileFlags(),
158-
target_.GetCurrentCppCompileFlags());
158+
target_.GetCppCompileFlags());
159159
target_.RecheckDirs(loader.GetLoadedIncludeDirs(),
160160
target_.GetIncludeDirs());
161161
target_.RecheckPaths(loader.GetLoadedHeaders(),

‎buildcc/lib/target/src/target/friend/compile_pch.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,20 +79,20 @@ void CompilePch::BuildCompile() {
7979
target_.dirty_ =true;
8080
}else {
8181
target_.RecheckFlags(loader.GetLoadedPreprocessorFlags(),
82-
target_.GetCurrentPreprocessorFlags());
82+
target_.GetPreprocessorFlags());
8383
target_.RecheckFlags(loader.GetLoadedCommonCompileFlags(),
84-
target_.GetCurrentCommonCompileFlags());
84+
target_.GetCommonCompileFlags());
8585
target_.RecheckFlags(loader.GetLoadedCCompileFlags(),
86-
target_.GetCurrentCCompileFlags());
86+
target_.GetCCompileFlags());
8787
target_.RecheckFlags(loader.GetLoadedCppCompileFlags(),
88-
target_.GetCurrentCppCompileFlags());
88+
target_.GetCppCompileFlags());
8989
target_.RecheckDirs(loader.GetLoadedIncludeDirs(),
9090
target_.GetIncludeDirs());
9191
target_.RecheckPaths(loader.GetLoadedHeaders(),
9292
target_.storer_.current_header_files.internal);
9393

9494
target_.RecheckFlags(loader.GetLoadedPchCompileFlags(),
95-
target_.GetCurrentPchCompileFlags());
95+
target_.GetPchCompileFlags());
9696
target_.RecheckPaths(loader.GetLoadedPchs(),
9797
target_.storer_.current_pch_files.internal);
9898
if (!loader.GetLoadedPchCompiled()) {

‎buildcc/lib/target/src/target/friend/link_target.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ void LinkTarget::BuildLink() {
8383
if (!loader.IsLoaded()) {
8484
target_.dirty_ =true;
8585
}else {
86-
target_.RecheckFlags(loader.GetLoadedLinkFlags(),
87-
target_.GetCurrentLinkFlags());
86+
target_.RecheckFlags(loader.GetLoadedLinkFlags(), target_.GetLinkFlags());
8887
target_.RecheckDirs(loader.GetLoadedLibDirs(), target_.GetLibDirs());
8988
target_.RecheckExternalLib(loader.GetLoadedExternalLibDeps(),
9089
storer.current_internal_external_lib_deps);

‎buildcc/lib/target/src/target/target.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,13 @@ void Target::RecheckExternalLib(
9292
std::optional<std::string>Target::SelectCompileFlags(TargetFileExt ext)const {
9393
switch (ext) {
9494
case TargetFileExt::Asm:
95-
returninternal::aggregate(GetCurrentAsmCompileFlags());
95+
returninternal::aggregate(GetAsmCompileFlags());
9696
break;
9797
case TargetFileExt::C:
98-
returninternal::aggregate(GetCurrentCCompileFlags());
98+
returninternal::aggregate(GetCCompileFlags());
9999
break;
100100
case TargetFileExt::Cpp:
101-
returninternal::aggregate(GetCurrentCppCompileFlags());
101+
returninternal::aggregate(GetCppCompileFlags());
102102
break;
103103
default:
104104
break;

‎buildcc/lib/target/test/target/test_target_pch.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ TEST(TargetPchTestGroup, Target_AddPchCompileFlag_Build) {
262262
buildcc::base::m::TargetRunner(target);
263263
bool exists =fs::exists(target.GetPchHeaderPath());
264264
CHECK_TRUE(exists);
265-
CHECK_EQUAL(target.GetCurrentPchCompileFlags().size(),1);
265+
CHECK_EQUAL(target.GetPchCompileFlags().size(),1);
266266

267267
mock().checkExpectations();
268268
}
@@ -282,7 +282,7 @@ TEST(TargetPchTestGroup, Target_AddPchObjectFlag_Build) {
282282
buildcc::base::m::TargetRunner(target);
283283
bool exists =fs::exists(target.GetPchHeaderPath());
284284
CHECK_TRUE(exists);
285-
CHECK_EQUAL(target.GetCurrentPchObjectFlags().size(),1);
285+
CHECK_EQUAL(target.GetPchObjectFlags().size(),1);
286286

287287
mock().checkExpectations();
288288
}

‎buildcc/lib/target/test/target/test_target_sync.cpp‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ TEST(TargetTestSyncGroup, CopyByConstRef) {
7676
CHECK_EQUAL(destTarget.GetIncludeDirs().size(),1);
7777
CHECK_EQUAL(destTarget.GetLibDirs().size(),1);
7878

79-
CHECK_EQUAL(destTarget.GetCurrentPreprocessorFlags().size(),1);
80-
CHECK_EQUAL(destTarget.GetCurrentCommonCompileFlags().size(),1);
81-
CHECK_EQUAL(destTarget.GetCurrentPchCompileFlags().size(),1);
82-
CHECK_EQUAL(destTarget.GetCurrentPchObjectFlags().size(),1);
83-
CHECK_EQUAL(destTarget.GetCurrentAsmCompileFlags().size(),1);
84-
CHECK_EQUAL(destTarget.GetCurrentCCompileFlags().size(),1);
85-
CHECK_EQUAL(destTarget.GetCurrentCppCompileFlags().size(),1);
86-
CHECK_EQUAL(destTarget.GetCurrentLinkFlags().size(),1);
79+
CHECK_EQUAL(destTarget.GetPreprocessorFlags().size(),1);
80+
CHECK_EQUAL(destTarget.GetCommonCompileFlags().size(),1);
81+
CHECK_EQUAL(destTarget.GetPchCompileFlags().size(),1);
82+
CHECK_EQUAL(destTarget.GetPchObjectFlags().size(),1);
83+
CHECK_EQUAL(destTarget.GetAsmCompileFlags().size(),1);
84+
CHECK_EQUAL(destTarget.GetCCompileFlags().size(),1);
85+
CHECK_EQUAL(destTarget.GetCppCompileFlags().size(),1);
86+
CHECK_EQUAL(destTarget.GetLinkFlags().size(),1);
8787

8888
CHECK_EQUAL(destTarget.GetCompileDependencies().size(),1);
8989
CHECK_EQUAL(destTarget.GetLinkDependencies().size(),1);
@@ -144,14 +144,14 @@ TEST(TargetTestSyncGroup, CopyByMove) {
144144
CHECK_EQUAL(destTarget.GetIncludeDirs().size(),1);
145145
CHECK_EQUAL(destTarget.GetLibDirs().size(),1);
146146

147-
CHECK_EQUAL(destTarget.GetCurrentPreprocessorFlags().size(),1);
148-
CHECK_EQUAL(destTarget.GetCurrentCommonCompileFlags().size(),1);
149-
CHECK_EQUAL(destTarget.GetCurrentPchCompileFlags().size(),1);
150-
CHECK_EQUAL(destTarget.GetCurrentPchObjectFlags().size(),1);
151-
CHECK_EQUAL(destTarget.GetCurrentAsmCompileFlags().size(),1);
152-
CHECK_EQUAL(destTarget.GetCurrentCCompileFlags().size(),1);
153-
CHECK_EQUAL(destTarget.GetCurrentCppCompileFlags().size(),1);
154-
CHECK_EQUAL(destTarget.GetCurrentLinkFlags().size(),1);
147+
CHECK_EQUAL(destTarget.GetPreprocessorFlags().size(),1);
148+
CHECK_EQUAL(destTarget.GetCommonCompileFlags().size(),1);
149+
CHECK_EQUAL(destTarget.GetPchCompileFlags().size(),1);
150+
CHECK_EQUAL(destTarget.GetPchObjectFlags().size(),1);
151+
CHECK_EQUAL(destTarget.GetAsmCompileFlags().size(),1);
152+
CHECK_EQUAL(destTarget.GetCCompileFlags().size(),1);
153+
CHECK_EQUAL(destTarget.GetCppCompileFlags().size(),1);
154+
CHECK_EQUAL(destTarget.GetLinkFlags().size(),1);
155155

156156
CHECK_EQUAL(destTarget.GetCompileDependencies().size(),1);
157157
CHECK_EQUAL(destTarget.GetLinkDependencies().size(),1);
@@ -224,14 +224,14 @@ TEST(TargetTestSyncGroup, InsertByConstRef) {
224224
CHECK_EQUAL(destTarget.GetIncludeDirs().size(),1);
225225
CHECK_EQUAL(destTarget.GetLibDirs().size(),1);
226226

227-
CHECK_EQUAL(destTarget.GetCurrentPreprocessorFlags().size(),1);
228-
CHECK_EQUAL(destTarget.GetCurrentCommonCompileFlags().size(),1);
229-
CHECK_EQUAL(destTarget.GetCurrentPchCompileFlags().size(),1);
230-
CHECK_EQUAL(destTarget.GetCurrentPchObjectFlags().size(),1);
231-
CHECK_EQUAL(destTarget.GetCurrentAsmCompileFlags().size(),1);
232-
CHECK_EQUAL(destTarget.GetCurrentCCompileFlags().size(),1);
233-
CHECK_EQUAL(destTarget.GetCurrentCppCompileFlags().size(),1);
234-
CHECK_EQUAL(destTarget.GetCurrentLinkFlags().size(),1);
227+
CHECK_EQUAL(destTarget.GetPreprocessorFlags().size(),1);
228+
CHECK_EQUAL(destTarget.GetCommonCompileFlags().size(),1);
229+
CHECK_EQUAL(destTarget.GetPchCompileFlags().size(),1);
230+
CHECK_EQUAL(destTarget.GetPchObjectFlags().size(),1);
231+
CHECK_EQUAL(destTarget.GetAsmCompileFlags().size(),1);
232+
CHECK_EQUAL(destTarget.GetCCompileFlags().size(),1);
233+
CHECK_EQUAL(destTarget.GetCppCompileFlags().size(),1);
234+
CHECK_EQUAL(destTarget.GetLinkFlags().size(),1);
235235

236236
CHECK_EQUAL(destTarget.GetCompileDependencies().size(),1);
237237
CHECK_EQUAL(destTarget.GetLinkDependencies().size(),1);
@@ -292,14 +292,14 @@ TEST(TargetTestSyncGroup, InsertByMove) {
292292
CHECK_EQUAL(destTarget.GetIncludeDirs().size(),1);
293293
CHECK_EQUAL(destTarget.GetLibDirs().size(),1);
294294

295-
CHECK_EQUAL(destTarget.GetCurrentPreprocessorFlags().size(),1);
296-
CHECK_EQUAL(destTarget.GetCurrentCommonCompileFlags().size(),1);
297-
CHECK_EQUAL(destTarget.GetCurrentPchCompileFlags().size(),1);
298-
CHECK_EQUAL(destTarget.GetCurrentPchObjectFlags().size(),1);
299-
CHECK_EQUAL(destTarget.GetCurrentAsmCompileFlags().size(),1);
300-
CHECK_EQUAL(destTarget.GetCurrentCCompileFlags().size(),1);
301-
CHECK_EQUAL(destTarget.GetCurrentCppCompileFlags().size(),1);
302-
CHECK_EQUAL(destTarget.GetCurrentLinkFlags().size(),1);
295+
CHECK_EQUAL(destTarget.GetPreprocessorFlags().size(),1);
296+
CHECK_EQUAL(destTarget.GetCommonCompileFlags().size(),1);
297+
CHECK_EQUAL(destTarget.GetPchCompileFlags().size(),1);
298+
CHECK_EQUAL(destTarget.GetPchObjectFlags().size(),1);
299+
CHECK_EQUAL(destTarget.GetAsmCompileFlags().size(),1);
300+
CHECK_EQUAL(destTarget.GetCCompileFlags().size(),1);
301+
CHECK_EQUAL(destTarget.GetCppCompileFlags().size(),1);
302+
CHECK_EQUAL(destTarget.GetLinkFlags().size(),1);
303303

304304
CHECK_EQUAL(destTarget.GetCompileDependencies().size(),1);
305305
CHECK_EQUAL(destTarget.GetLinkDependencies().size(),1);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp