From: David Blaikie Date: Thu, 14 Jun 2012 17:36:01 +0000 (+0000) Subject: Rename -rewrite-includes to -frewrite-includes. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60ad16b7e24cdb88c577c107b69da85458000858;p=clang Rename -rewrite-includes to -frewrite-includes. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158458 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/Driver/CC1Options.td b/include/clang/Driver/CC1Options.td index 20b8c58f0d..a30b1609ac 100644 --- a/include/clang/Driver/CC1Options.td +++ b/include/clang/Driver/CC1Options.td @@ -332,7 +332,7 @@ def rewrite_test : Flag<"-rewrite-test">, HelpText<"Rewriter playground">; def rewrite_macros : Flag<"-rewrite-macros">, HelpText<"Expand macros without full preprocessing">; -def rewrite_includes : Flag<"-rewrite-includes">, +def frewrite_includes : Flag<"-frewrite-includes">, HelpText<"Expand includes without full preprocessing">; def migrate : Flag<"-migrate">, HelpText<"Migrate source code">; diff --git a/include/clang/Rewrite/Rewriters.h b/include/clang/Rewrite/Rewriters.h index 4283fda2f3..f5ade5ad35 100644 --- a/include/clang/Rewrite/Rewriters.h +++ b/include/clang/Rewrite/Rewriters.h @@ -26,7 +26,7 @@ void RewriteMacrosInInput(Preprocessor &PP, raw_ostream *OS); /// DoRewriteTest - A simple test for the TokenRewriter class. void DoRewriteTest(Preprocessor &PP, raw_ostream *OS); -/// RewriteIncludesInInput - Implement -rewrite-includes mode. +/// RewriteIncludesInInput - Implement -frewrite-includes mode. void RewriteIncludesInInput(Preprocessor &PP, raw_ostream *OS, const PreprocessorOutputOptions &Opts); diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp index 81d78c0e65..188de309f2 100644 --- a/lib/Frontend/CompilerInvocation.cpp +++ b/lib/Frontend/CompilerInvocation.cpp @@ -445,7 +445,7 @@ static const char *getActionName(frontend::ActionKind Kind) { case frontend::PrintPreamble: return "-print-preamble"; case frontend::PrintPreprocessedInput: return "-E"; case frontend::RewriteMacros: return "-rewrite-macros"; - case frontend::RewriteIncludes: return "-rewrite-includes"; + case frontend::RewriteIncludes: return "-frewrite-includes"; case frontend::RewriteObjC: return "-rewrite-objc"; case frontend::RewriteTest: return "-rewrite-test"; case frontend::RunAnalysis: return "-analyze"; @@ -1446,7 +1446,7 @@ static InputKind ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args, Opts.ProgramAction = frontend::PrintPreprocessedInput; break; case OPT_rewrite_macros: Opts.ProgramAction = frontend::RewriteMacros; break; - case OPT_rewrite_includes: + case OPT_frewrite_includes: Opts.ProgramAction = frontend::RewriteIncludes; break; case OPT_rewrite_objc: Opts.ProgramAction = frontend::RewriteObjC; break; diff --git a/lib/Rewrite/InclusionRewriter.cpp b/lib/Rewrite/InclusionRewriter.cpp index 8fb5a8b32f..2dd6b34f61 100644 --- a/lib/Rewrite/InclusionRewriter.cpp +++ b/lib/Rewrite/InclusionRewriter.cpp @@ -225,11 +225,11 @@ void InclusionRewriter::CommentOutDirective(Lexer &DirectiveLex, do { DirectiveLex.LexFromRawLexer(DirectiveToken); } while (!DirectiveToken.is(tok::eod) && DirectiveToken.isNot(tok::eof)); - OS << "#if 0 /* expanded by -rewrite-includes */" << EOL; + OS << "#if 0 /* expanded by -frewrite-includes */" << EOL; OutputContentUpTo(FromFile, NextToWrite, SM.getFileOffset(DirectiveToken.getLocation()) + DirectiveToken.getLength(), EOL, Line); - OS << "#endif /* expanded by -rewrite-includes */" << EOL; + OS << "#endif /* expanded by -frewrite-includes */" << EOL; } /// Find the next identifier in the pragma directive specified by \p RawToken. @@ -334,7 +334,7 @@ bool InclusionRewriter::Process(FileID FileId, return true; } -/// InclusionRewriterInInput - Implement -rewrite-includes mode. +/// InclusionRewriterInInput - Implement -frewrite-includes mode. void clang::RewriteIncludesInInput(Preprocessor &PP, raw_ostream *OS, const PreprocessorOutputOptions &Opts) { SourceManager &SM = PP.getSourceManager(); diff --git a/test/Frontend/rewrite-includes.c b/test/Frontend/rewrite-includes.c index 1299564cea..546a2c44af 100644 --- a/test/Frontend/rewrite-includes.c +++ b/test/Frontend/rewrite-includes.c @@ -1,5 +1,5 @@ -// RUN: %clang_cc1 -verify -rewrite-includes -DFIRST -I %S/Inputs %s -o - | FileCheck -strict-whitespace %s -// RUN: %clang_cc1 -verify -rewrite-includes -P -DFIRST -I %S/Inputs %s -o - | FileCheck -check-prefix=CHECKNL -strict-whitespace %s +// RUN: %clang_cc1 -verify -E -frewrite-includes -DFIRST -I %S/Inputs %s -o - | FileCheck -strict-whitespace %s +// RUN: %clang_cc1 -verify -E -frewrite-includes -P -DFIRST -I %S/Inputs %s -o - | FileCheck -check-prefix=CHECKNL -strict-whitespace %s // STARTCOMPARE #define A(a,b) a ## b A(1,2) @@ -22,124 +22,124 @@ A(1,2) // CHECK: {{^}}// STARTCOMPARE{{$}} // CHECK-NEXT: {{^}}#define A(a,b) a ## b{{$}} // CHECK-NEXT: {{^}}A(1,2){{$}} -// CHECK-NEXT: {{^}}#if 0 /* expanded by -rewrite-includes */{{$}} +// CHECK-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} // CHECK-NEXT: {{^}}#include "rewrite-includes1.h"{{$}} -// CHECK-NEXT: {{^}}#endif /* expanded by -rewrite-includes */{{$}} +// CHECK-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} // CHECK-NEXT: {{^}}# 1 "{{.*[/\\]Inputs[/\\]}}rewrite-includes1.h" 1{{$}} -// CHECK-NEXT: {{^}}#if 0 /* expanded by -rewrite-includes */{{$}} +// CHECK-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} // CHECK-NEXT: {{^}}#pragma clang system_header{{$}} -// CHECK-NEXT: {{^}}#endif /* expanded by -rewrite-includes */{{$}} +// CHECK-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} // CHECK-NEXT: {{^}}# 2 "{{.*[/\\]Inputs[/\\]}}rewrite-includes1.h" 3{{$}} // CHECK-NEXT: {{^}}included_line1{{$}} -// CHECK-NEXT: {{^}}#if 0 /* expanded by -rewrite-includes */{{$}} +// CHECK-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} // CHECK-NEXT: {{^}}#include "rewrite-includes2.h"{{$}} -// CHECK-NEXT: {{^}}#endif /* expanded by -rewrite-includes */{{$}} +// CHECK-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} // CHECK-NEXT: {{^}}# 1 "{{.*[/\\]Inputs[/\\]}}rewrite-includes2.h" 1 3{{$}} // CHECK-NEXT: {{^}}included_line2{{$}} // CHECK-NEXT: {{^}}# 4 "{{.*[/\\]Inputs[/\\]}}rewrite-includes1.h" 2 3{{$}} // CHECK-NEXT: {{^}}# 7 "{{.*}}rewrite-includes.c" 2{{$}} // CHECK-NEXT: {{^}}#ifdef FIRST{{$}} // CHECK-NEXT: {{^}}#define HEADER "rewrite-includes3.h"{{$}} -// CHECK-NEXT: {{^}}#if 0 /* expanded by -rewrite-includes */{{$}} +// CHECK-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} // CHECK-NEXT: {{^}}#include HEADER{{$}} -// CHECK-NEXT: {{^}}#endif /* expanded by -rewrite-includes */{{$}} +// CHECK-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} // CHECK-NEXT: {{^}}# 1 "{{.*[/\\]Inputs[/\\]}}rewrite-includes3.h" 1{{$}} // CHECK-NEXT: {{^}}included_line3{{$}} // CHECK-NEXT: {{^}}# 10 "{{.*}}rewrite-includes.c" 2{{$}} // CHECK-NEXT: {{^}}#else{{$}} -// CHECK-NEXT: {{^}}#if 0 /* expanded by -rewrite-includes */{{$}} +// CHECK-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} // CHECK-NEXT: {{^}}#include "rewrite-includes4.h"{{$}} -// CHECK-NEXT: {{^}}#endif /* expanded by -rewrite-includes */{{$}} +// CHECK-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} // CHECK-NEXT: {{^}}# 12 "{{.*}}rewrite-includes.c"{{$}} // CHECK-NEXT: {{^}}#endif{{$}} -// CHECK-NEXT: {{^}}#if 0 /* expanded by -rewrite-includes */{{$}} +// CHECK-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} // CHECK-NEXT: {{^}}#/**/include /**/ "rewrite-includes5.h" /**/ {{\\}}{{$}} // CHECK-NEXT: {{^}} {{$}} -// CHECK-NEXT: {{^}}#endif /* expanded by -rewrite-includes */{{$}} +// CHECK-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} // CHECK-NEXT: {{^}}# 1 "{{.*[/\\]Inputs[/\\]}}rewrite-includes5.h" 1{{$}} // CHECK-NEXT: {{^}}included_line5{{$}} // CHECK-NEXT: {{^}}# 15 "{{.*}}rewrite-includes.c" 2{{$}} -// CHECK-NEXT: {{^}}#if 0 /* expanded by -rewrite-includes */{{$}} +// CHECK-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} // CHECK-NEXT: {{^}}#include "rewrite-includes6.h" // comment{{$}} -// CHECK-NEXT: {{^}}#endif /* expanded by -rewrite-includes */{{$}} +// CHECK-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} // CHECK-NEXT: {{^}}# 1 "{{.*[/\\]Inputs[/\\]}}rewrite-includes6.h" 1{{$}} -// CHECK-NEXT: {{^}}#if 0 /* expanded by -rewrite-includes */{{$}} +// CHECK-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} // CHECK-NEXT: {{^}}#pragma once{{$}} -// CHECK-NEXT: {{^}}#endif /* expanded by -rewrite-includes */{{$}} +// CHECK-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} // CHECK-NEXT: {{^}}# 2 "{{.*[/\\]Inputs[/\\]}}rewrite-includes6.h"{{$}} // CHECK-NEXT: {{^}}included_line6{{$}} // CHECK-NEXT: {{^}}# 16 "{{.*}}rewrite-includes.c" 2{{$}} // CHECK-NEXT: {{^}} {{$}} -// CHECK-NEXT: {{^}}#if 0 /* expanded by -rewrite-includes */{{$}} +// CHECK-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} // CHECK-NEXT: {{^}}#include "rewrite-includes6.h" /* comment{{$}} // CHECK-NEXT: {{^}} continues */{{$}} -// CHECK-NEXT: {{^}}#endif /* expanded by -rewrite-includes */{{$}} +// CHECK-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} // CHECK-NEXT: {{^}}# 19 "{{.*}}rewrite-includes.c"{{$}} -// CHECK-NEXT: {{^}}#if 0 /* expanded by -rewrite-includes */{{$}} +// CHECK-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} // CHECK-NEXT: {{^}}#include "rewrite-includes7.h"{{$}} -// CHECK-NEXT: {{^}}#endif /* expanded by -rewrite-includes */{{$}} +// CHECK-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} // CHECK-NEXT: {{^}}# 1 "{{.*[/\\]Inputs[/\\]}}rewrite-includes7.h" 1{{$}} // CHECK-NEXT: {{^}}#ifndef REWRITE_INCLUDES_7{{$}} // CHECK-NEXT: {{^}}#define REWRITE_INCLUDES_7{{$}} // CHECK-NEXT: {{^}}included_line7{{$}} // CHECK-NEXT: {{^}}#endif{{$}} // CHECK-NEXT: {{^}}# 20 "{{.*}}rewrite-includes.c" 2{{$}} -// CHECK-NEXT: {{^}}#if 0 /* expanded by -rewrite-includes */{{$}} +// CHECK-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} // CHECK-NEXT: {{^}}#include "rewrite-includes7.h"{{$}} -// CHECK-NEXT: {{^}}#endif /* expanded by -rewrite-includes */{{$}} +// CHECK-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} // CHECK-NEXT: {{^}}# 21 "{{.*}}rewrite-includes.c"{{$}} // CHECK-NEXT: {{^}}// ENDCOMPARE{{$}} // CHECKNL: {{^}}// STARTCOMPARE{{$}} // CHECKNL-NEXT: {{^}}#define A(a,b) a ## b{{$}} // CHECKNL-NEXT: {{^}}A(1,2){{$}} -// CHECKNL-NEXT: {{^}}#if 0 /* expanded by -rewrite-includes */{{$}} +// CHECKNL-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} // CHECKNL-NEXT: {{^}}#include "rewrite-includes1.h"{{$}} -// CHECKNL-NEXT: {{^}}#endif /* expanded by -rewrite-includes */{{$}} -// CHECKNL-NEXT: {{^}}#if 0 /* expanded by -rewrite-includes */{{$}} +// CHECKNL-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} +// CHECKNL-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} // CHECKNL-NEXT: {{^}}#pragma clang system_header{{$}} -// CHECKNL-NEXT: {{^}}#endif /* expanded by -rewrite-includes */{{$}} +// CHECKNL-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} // CHECKNL-NEXT: {{^}}included_line1{{$}} -// CHECKNL-NEXT: {{^}}#if 0 /* expanded by -rewrite-includes */{{$}} +// CHECKNL-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} // CHECKNL-NEXT: {{^}}#include "rewrite-includes2.h"{{$}} -// CHECKNL-NEXT: {{^}}#endif /* expanded by -rewrite-includes */{{$}} +// CHECKNL-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} // CHECKNL-NEXT: {{^}}included_line2{{$}} // CHECKNL-NEXT: {{^}}#ifdef FIRST{{$}} // CHECKNL-NEXT: {{^}}#define HEADER "rewrite-includes3.h"{{$}} -// CHECKNL-NEXT: {{^}}#if 0 /* expanded by -rewrite-includes */{{$}} +// CHECKNL-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} // CHECKNL-NEXT: {{^}}#include HEADER{{$}} -// CHECKNL-NEXT: {{^}}#endif /* expanded by -rewrite-includes */{{$}} +// CHECKNL-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} // CHECKNL-NEXT: {{^}}included_line3{{$}} // CHECKNL-NEXT: {{^}}#else{{$}} -// CHECKNL-NEXT: {{^}}#if 0 /* expanded by -rewrite-includes */{{$}} +// CHECKNL-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} // CHECKNL-NEXT: {{^}}#include "rewrite-includes4.h"{{$}} -// CHECKNL-NEXT: {{^}}#endif /* expanded by -rewrite-includes */{{$}} +// CHECKNL-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} // CHECKNL-NEXT: {{^}}#endif{{$}} -// CHECKNL-NEXT: {{^}}#if 0 /* expanded by -rewrite-includes */{{$}} +// CHECKNL-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} // CHECKNL-NEXT: {{^}}#/**/include /**/ "rewrite-includes5.h" /**/ {{\\}}{{$}} // CHECKNL-NEXT: {{^}} {{$}} -// CHECKNL-NEXT: {{^}}#endif /* expanded by -rewrite-includes */{{$}} +// CHECKNL-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} // CHECKNL-NEXT: {{^}}included_line5{{$}} -// CHECKNL-NEXT: {{^}}#if 0 /* expanded by -rewrite-includes */{{$}} +// CHECKNL-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} // CHECKNL-NEXT: {{^}}#include "rewrite-includes6.h" // comment{{$}} -// CHECKNL-NEXT: {{^}}#endif /* expanded by -rewrite-includes */{{$}} -// CHECKNL-NEXT: {{^}}#if 0 /* expanded by -rewrite-includes */{{$}} +// CHECKNL-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} +// CHECKNL-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} // CHECKNL-NEXT: {{^}}#pragma once{{$}} -// CHECKNL-NEXT: {{^}}#endif /* expanded by -rewrite-includes */{{$}} +// CHECKNL-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} // CHECKNL-NEXT: {{^}}included_line6{{$}} // CHECKNL-NEXT: {{^}} {{$}} -// CHECKNL-NEXT: {{^}}#if 0 /* expanded by -rewrite-includes */{{$}} +// CHECKNL-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} // CHECKNL-NEXT: {{^}}#include "rewrite-includes6.h" /* comment{{$}} // CHECKNL-NEXT: {{^}} continues */{{$}} -// CHECKNL-NEXT: {{^}}#endif /* expanded by -rewrite-includes */{{$}} -// CHECKNL-NEXT: {{^}}#if 0 /* expanded by -rewrite-includes */{{$}} +// CHECKNL-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} +// CHECKNL-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} // CHECKNL-NEXT: {{^}}#include "rewrite-includes7.h"{{$}} -// CHECKNL-NEXT: {{^}}#endif /* expanded by -rewrite-includes */{{$}} +// CHECKNL-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} // CHECKNL-NEXT: {{^}}#ifndef REWRITE_INCLUDES_7{{$}} // CHECKNL-NEXT: {{^}}#define REWRITE_INCLUDES_7{{$}} // CHECKNL-NEXT: {{^}}included_line7{{$}} // CHECKNL-NEXT: {{^}}#endif{{$}} -// CHECKNL-NEXT: {{^}}#if 0 /* expanded by -rewrite-includes */{{$}} +// CHECKNL-NEXT: {{^}}#if 0 /* expanded by -frewrite-includes */{{$}} // CHECKNL-NEXT: {{^}}#include "rewrite-includes7.h"{{$}} -// CHECKNL-NEXT: {{^}}#endif /* expanded by -rewrite-includes */{{$}} +// CHECKNL-NEXT: {{^}}#endif /* expanded by -frewrite-includes */{{$}} // CHECKNL-NEXT: {{^}}// ENDCOMPARE{{$}}