@@ -101,13 +101,13 @@ auto runOnFile(const CLI& cli, const std::string& fileName) -> bool {
101101 VerifyDiagnosticsClient diagnosticsClient;
102102 TranslationUnit unit (&diagnosticsClient);
103103
104- auto preprocesor = unit.preprocessor ();
104+ auto preprocessor = unit.preprocessor ();
105105
106106 std::unique_ptr<Toolchain> toolchain;
107107
108108 if (cli.opt_verify ) {
109109 diagnosticsClient.setVerify (true );
110- preprocesor ->setCommentHandler (&diagnosticsClient);
110+ preprocessor ->setCommentHandler (&diagnosticsClient);
111111 }
112112
113113 auto toolchainId = cli.getSingle (" -toolchain" );
@@ -117,7 +117,7 @@ auto runOnFile(const CLI& cli, const std::string& fileName) -> bool {
117117 }
118118
119119 if (toolchainId == " darwin" || toolchainId == " macos" ) {
120- auto macosToolchain = std::make_unique<MacOSToolchain>(preprocesor );
120+ auto macosToolchain = std::make_unique<MacOSToolchain>(preprocessor );
121121 std::string host;
122122#ifdef __aarch64__
123123 host = " aarch64" ;
@@ -128,7 +128,7 @@ auto runOnFile(const CLI& cli, const std::string& fileName) -> bool {
128128 toolchain = std::move (macosToolchain);
129129
130130 } else if (toolchainId == " wasm32" ) {
131- auto wasmToolchain = std::make_unique<Wasm32WasiToolchain>(preprocesor );
131+ auto wasmToolchain = std::make_unique<Wasm32WasiToolchain>(preprocessor );
132132
133133 fs::path app_dir;
134134
@@ -162,9 +162,9 @@ auto runOnFile(const CLI& cli, const std::string& fileName) -> bool {
162162#endif
163163
164164 std::string arch = cli.getSingle (" -arch" ).value_or (host);
165- toolchain = std::make_unique<GCCLinuxToolchain>(preprocesor , arch);
165+ toolchain = std::make_unique<GCCLinuxToolchain>(preprocessor , arch);
166166 } else if (toolchainId == " windows" ) {
167- auto windowsToolchain = std::make_unique<WindowsToolchain>(preprocesor );
167+ auto windowsToolchain = std::make_unique<WindowsToolchain>(preprocessor );
168168
169169 if (auto paths = cli.get (" -vctoolsdir" ); !paths.empty ()) {
170170 windowsToolchain->setVctoolsdir (paths.back ());
@@ -192,12 +192,12 @@ auto runOnFile(const CLI& cli, const std::string& fileName) -> bool {
192192 }
193193
194194 for (const auto & path : cli.get (" -I" )) {
195- preprocesor ->addSystemIncludePath (path);
195+ preprocessor ->addSystemIncludePath (path);
196196 }
197197
198198 if (cli.opt_v ) {
199199 std::cerr << std::format (" #include <...> search starts here:\n " );
200- const auto & paths = preprocesor ->systemIncludePaths ();
200+ const auto & paths = preprocessor ->systemIncludePaths ();
201201 for (auto it = rbegin (paths); it != rend (paths); ++it) {
202202 std::cerr << std::format (" {}\n " , *it);
203203 }
@@ -208,14 +208,14 @@ auto runOnFile(const CLI& cli, const std::string& fileName) -> bool {
208208 auto sep = macro.find_first_of (" =" );
209209
210210 if (sep == std::string::npos) {
211- preprocesor ->defineMacro (macro, " 1" );
211+ preprocessor ->defineMacro (macro, " 1" );
212212 } else {
213- preprocesor ->defineMacro (macro.substr (0 , sep), macro.substr (sep + 1 ));
213+ preprocessor ->defineMacro (macro.substr (0 , sep), macro.substr (sep + 1 ));
214214 }
215215 }
216216
217217 for (const auto & macro : cli.get (" -U" )) {
218- preprocesor ->undefMacro (macro);
218+ preprocessor ->undefMacro (macro);
219219 }
220220
221221 auto outputs = cli.get (" -o" );
@@ -229,11 +229,11 @@ auto runOnFile(const CLI& cli, const std::string& fileName) -> bool {
229229 bool shouldExit = false ;
230230
231231 if (cli.opt_P ) {
232- preprocesor ->setOmitLineMarkers (true );
232+ preprocessor ->setOmitLineMarkers (true );
233233 }
234234
235235 if (cli.opt_H && (cli.opt_E || cli.opt_Eonly )) {
236- preprocesor ->setOnWillIncludeHeader (
236+ preprocessor ->setOnWillIncludeHeader (
237237 [&](const std::string& header, int level) {
238238 std::string fill (level, ' .' );
239239 std::cout << std::format (" {} {}\n " , fill, header);
@@ -243,14 +243,14 @@ auto runOnFile(const CLI& cli, const std::string& fileName) -> bool {
243243 if (auto source = readAll (fileName)) {
244244 if (cli.opt_E && !cli.opt_dM ) {
245245 std::vector<Token> tokens;
246- preprocesor ->preprocess (std::move (*source), fileName, tokens);
247- preprocesor ->getPreprocessedText (tokens, output);
246+ preprocessor ->preprocess (std::move (*source), fileName, tokens);
247+ preprocessor ->getPreprocessedText (tokens, output);
248248 shouldExit = true ;
249249 } else {
250250 unit.setSource (std::move (*source), fileName);
251251
252252 if (cli.opt_dM ) {
253- preprocesor ->printMacros (output);
253+ preprocessor ->printMacros (output);
254254 shouldExit = true ;
255255 } else if (cli.opt_dump_tokens ) {
256256 dumpTokens (cli, unit, output);
@@ -266,7 +266,7 @@ auto runOnFile(const CLI& cli, const std::string& fileName) -> bool {
266266 }
267267
268268 if (!shouldExit) {
269- preprocesor ->squeeze ();
269+ preprocessor ->squeeze ();
270270
271271 unit.parse (ParserConfiguration{
272272 .checkTypes = cli.opt_fcheck ,
0 commit comments