From c853fe8e4ef1e5188d20fd8dee71c61576bdfd55 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Mon, 18 Dec 2017 19:46:56 +0000 Subject: Fix more inconsistent line endings. NFC. git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@321016 91177308-0d34-0410-b5e6-96231b3b80d8 --- docs/modularize.rst | 152 ++++++++++++++++++++++++------------------------- docs/pp-trace.rst | 160 ++++++++++++++++++++++++++-------------------------- 2 files changed, 156 insertions(+), 156 deletions(-) diff --git a/docs/modularize.rst b/docs/modularize.rst index 6a62c423..6fe49b42 100644 --- a/docs/modularize.rst +++ b/docs/modularize.rst @@ -172,40 +172,40 @@ For example, for the header list:: The following module map will be generated:: - // Output/NoProblemsAssistant.txt + // Output/NoProblemsAssistant.txt // Generated by: modularize -module-map-path=Output/NoProblemsAssistant.txt \ - -root-module=Root NoProblemsAssistant.modularize - - module SomeTypes { - header "SomeTypes.h" - export * - } - module SomeDecls { - header "SomeDecls.h" - export * - } - module SubModule1 { - module Header1 { - header "SubModule1/Header1.h" - export * - } - module Header2 { - header "SubModule1/Header2.h" - export * - } - } - module SubModule2 { - module Header3 { - header "SubModule2/Header3.h" - export * - } - module Header4 { - header "SubModule2/Header4.h" - export * - } - header "SubModule2.h" - export * - } + -root-module=Root NoProblemsAssistant.modularize + + module SomeTypes { + header "SomeTypes.h" + export * + } + module SomeDecls { + header "SomeDecls.h" + export * + } + module SubModule1 { + module Header1 { + header "SubModule1/Header1.h" + export * + } + module Header2 { + header "SubModule1/Header2.h" + export * + } + } + module SubModule2 { + module Header3 { + header "SubModule2/Header3.h" + export * + } + module Header4 { + header "SubModule2/Header4.h" + export * + } + header "SubModule2.h" + export * + } An optional ``-root-module=`` option can be used to cause a root module to be created which encloses all the modules. @@ -216,50 +216,50 @@ problem headers can be fixed. For example, with the same header list from above:: - // Output/NoProblemsAssistant.txt + // Output/NoProblemsAssistant.txt // Generated by: modularize -module-map-path=Output/NoProblemsAssistant.txt \ - -root-module=Root NoProblemsAssistant.modularize - - module Root { - module SomeTypes { - header "SomeTypes.h" - export * - } - module SomeDecls { - header "SomeDecls.h" - export * - } - module SubModule1 { - module Header1 { - header "SubModule1/Header1.h" - export * - } - module Header2 { - header "SubModule1/Header2.h" - export * - } - } - module SubModule2 { - module Header3 { - header "SubModule2/Header3.h" - export * - } - module Header4 { - header "SubModule2/Header4.h" - export * - } - header "SubModule2.h" - export * - } - } - -Note that headers with dependents will be ignored with a warning, as the -Clang module mechanism doesn't support headers the rely on other headers -to be included first. - -The module map format defines some keywords which can't be used in module -names. If a header has one of these names, an underscore ('_') will be + -root-module=Root NoProblemsAssistant.modularize + + module Root { + module SomeTypes { + header "SomeTypes.h" + export * + } + module SomeDecls { + header "SomeDecls.h" + export * + } + module SubModule1 { + module Header1 { + header "SubModule1/Header1.h" + export * + } + module Header2 { + header "SubModule1/Header2.h" + export * + } + } + module SubModule2 { + module Header3 { + header "SubModule2/Header3.h" + export * + } + module Header4 { + header "SubModule2/Header4.h" + export * + } + header "SubModule2.h" + export * + } + } + +Note that headers with dependents will be ignored with a warning, as the +Clang module mechanism doesn't support headers the rely on other headers +to be included first. + +The module map format defines some keywords which can't be used in module +names. If a header has one of these names, an underscore ('_') will be prepended to the name. For example, if the header name is ``header.h``, because ``header`` is a keyword, the module name will be ``_header``. For a list of the module map keywords, please see: -`Lexical structure `_ +`Lexical structure `_ diff --git a/docs/pp-trace.rst b/docs/pp-trace.rst index 902db6fa..b8768ed0 100644 --- a/docs/pp-trace.rst +++ b/docs/pp-trace.rst @@ -103,18 +103,18 @@ example::: With real data::: --- - - Callback: FileChanged - Loc: "c:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-include.cpp:1:1" - Reason: EnterFile - FileType: C_User - PrevFID: (invalid) - (etc.) - - Callback: FileChanged - Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-include.cpp:5:1" - Reason: ExitFile - FileType: C_User - PrevFID: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/Input/Level1B.h" - - Callback: EndOfMainFile + - Callback: FileChanged + Loc: "c:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-include.cpp:1:1" + Reason: EnterFile + FileType: C_User + PrevFID: (invalid) + (etc.) + - Callback: FileChanged + Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-include.cpp:5:1" + Reason: ExitFile + FileType: C_User + PrevFID: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/Input/Level1B.h" + - Callback: EndOfMainFile ... In all but one case (MacroDirective) the "Argument" scalars have the same @@ -171,11 +171,11 @@ PrevFID ((file)|(invalid)) FileID Example::: - - Callback: FileChanged - Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-include.cpp:1:1" - Reason: EnterFile - FileType: C_User - PrevFID: (invalid) + - Callback: FileChanged + Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-include.cpp:1:1" + Reason: EnterFile + FileType: C_User + PrevFID: (invalid) `FileSkipped `_ Callback ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -195,10 +195,10 @@ FileType (C_User|C_System|C_ExternCSystem) SrcMgr::Ch Example::: - - Callback: FileSkipped - ParentFile: "/path/filename.h" - FilenameTok: "filename.h" - FileType: C_User + - Callback: FileSkipped + ParentFile: "/path/filename.h" + FilenameTok: "filename.h" + FileType: C_User `FileNotFound `_ Callback ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -216,7 +216,7 @@ RecoveryPath (path) SmallVecto Example::: - - Callback: FileNotFound + - Callback: FileNotFound FileName: "/path/filename.h" RecoveryPath: @@ -243,15 +243,15 @@ Imported ((module name)|(null)) const Modu Example::: - - Callback: InclusionDirective - IncludeTok: include - FileName: "Input/Level1B.h" - IsAngled: false - FilenameRange: "Input/Level1B.h" - File: "D:/Clang/llvmnewmod/tools/clang/tools/extra/test/pp-trace/Input/Level1B.h" - SearchPath: "D:/Clang/llvmnewmod/tools/clang/tools/extra/test/pp-trace" - RelativePath: "Input/Level1B.h" - Imported: (null) + - Callback: InclusionDirective + IncludeTok: include + FileName: "Input/Level1B.h" + IsAngled: false + FilenameRange: "Input/Level1B.h" + File: "D:/Clang/llvmnewmod/tools/clang/tools/extra/test/pp-trace/Input/Level1B.h" + SearchPath: "D:/Clang/llvmnewmod/tools/clang/tools/extra/test/pp-trace" + RelativePath: "Input/Level1B.h" + Imported: (null) `moduleImport `_ Callback ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -270,7 +270,7 @@ Imported ((module name)|(null)) const Modu Example::: - - Callback: moduleImport + - Callback: moduleImport ImportLoc: "d:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-modules.cpp:4:2" Path: [{Name: Level1B, Loc: "d:/Clang/llvmnewmod/tools/clang/tools/extra/test/pp-trace/pp-trace-modules.cpp:4:9"}, {Name: Level2B, Loc: "d:/Clang/llvmnewmod/tools/clang/tools/extra/test/pp-trace/pp-trace-modules.cpp:4:17"}] Imported: Level2B @@ -290,7 +290,7 @@ Argument Name Argument Value Syntax Clang C++ Example::: - - Callback: EndOfMainFile + - Callback: EndOfMainFile `Ident `_ Callback ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -308,7 +308,7 @@ str (name) const std: Example::: - - Callback: Ident + - Callback: Ident Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-ident.cpp:3:1" str: "$Id$" @@ -328,7 +328,7 @@ Introducer (PIK_HashPragma|PIK__Pragma|PIK___pragma) PragmaIntr Example::: - - Callback: PragmaDirective + - Callback: PragmaDirective Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-pragma.cpp:3:1" Introducer: PIK_HashPragma @@ -349,7 +349,7 @@ Str (message directive) const std: Example::: - - Callback: PragmaComment + - Callback: PragmaComment Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-pragma.cpp:3:1" Kind: library Str: kernel32.lib @@ -371,7 +371,7 @@ Value (string) const std: Example::: - - Callback: PragmaDetectMismatch + - Callback: PragmaDetectMismatch Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-pragma.cpp:3:1" Name: name Value: value @@ -392,7 +392,7 @@ DebugType (string) StringRef Example::: - - Callback: PragmaDebug + - Callback: PragmaDebug Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-pragma.cpp:3:1" DebugType: warning @@ -414,7 +414,7 @@ Str (string) StringRef Example::: - - Callback: PragmaMessage + - Callback: PragmaMessage Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-pragma.cpp:3:1" Namespace: "GCC" Kind: PMK_Message @@ -436,7 +436,7 @@ Namespace (name) StringRef Example::: - - Callback: PragmaDiagnosticPush + - Callback: PragmaDiagnosticPush Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-pragma.cpp:3:1" Namespace: "GCC" @@ -456,7 +456,7 @@ Namespace (name) StringRef Example::: - - Callback: PragmaDiagnosticPop + - Callback: PragmaDiagnosticPop Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-pragma.cpp:3:1" Namespace: "GCC" @@ -478,7 +478,7 @@ Str (string) StringRef Example::: - - Callback: PragmaDiagnostic + - Callback: PragmaDiagnostic Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-pragma.cpp:3:1" Namespace: "GCC" mapping: MAP_WARNING @@ -502,7 +502,7 @@ State (1|0) unsigned Example::: - - Callback: PragmaOpenCLExtension + - Callback: PragmaOpenCLExtension NameLoc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-pragma.cpp:3:10" Name: Name StateLoc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-pragma.cpp:3:18" @@ -525,7 +525,7 @@ Ids [(number)[, ...]] ArrayRef`_ Callback @@ -586,11 +586,11 @@ Args [(name)|(number)|<(token name)>[, ...]] const Macr Example::: - - Callback: MacroExpands - MacroNameTok: X_IMPL - MacroDirective: MD_Define - Range: [(nonfile), (nonfile)] - Args: [a y, b] + - Callback: MacroExpands + MacroNameTok: X_IMPL + MacroDirective: MD_Define + Range: [(nonfile), (nonfile)] + Args: [a y, b] `MacroDefined `_ Callback ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -608,9 +608,9 @@ MacroDirective (MD_Define|MD_Undefine|MD_Visibility) const Macr Example::: - - Callback: MacroDefined - MacroNameTok: X_IMPL - MacroDirective: MD_Define + - Callback: MacroDefined + MacroNameTok: X_IMPL + MacroDirective: MD_Define `MacroUndefined `_ Callback ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -628,9 +628,9 @@ MacroDirective (MD_Define|MD_Undefine|MD_Visibility) const Macr Example::: - - Callback: MacroUndefined - MacroNameTok: X_IMPL - MacroDirective: MD_Define + - Callback: MacroUndefined + MacroNameTok: X_IMPL + MacroDirective: MD_Define `Defined `_ Callback ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -649,7 +649,7 @@ Range ["(file):(line):(col)", "(file):(line):(col)"] SourceRang Example::: - - Callback: Defined + - Callback: Defined MacroNameTok: MACRO MacroDirective: (null) Range: ["D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:5", "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:19"] @@ -669,7 +669,7 @@ Range ["(file):(line):(col)", "(file):(line):(col)"] SourceRang Example::: - - Callback: SourceRangeSkipped + - Callback: SourceRangeSkipped Range: [":/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:2", ":/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:9:2"] `If `_ Callback @@ -689,10 +689,10 @@ ConditionValue (true|false) bool Example::: - - Callback: If - Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:2" - ConditionRange: ["D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:4", "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:9:1"] - ConditionValue: false + - Callback: If + Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:2" + ConditionRange: ["D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:4", "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:9:1"] + ConditionValue: false `Elif `_ Callback ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -712,11 +712,11 @@ IfLoc "(file):(line):(col)" SourceLoca Example::: - - Callback: Elif - Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:10:2" - ConditionRange: ["D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:10:4", "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:11:1"] - ConditionValue: false - IfLoc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:2" + - Callback: Elif + Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:10:2" + ConditionRange: ["D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:10:4", "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:11:1"] + ConditionValue: false + IfLoc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:2" `Ifdef `_ Callback ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -735,10 +735,10 @@ MacroDirective (MD_Define|MD_Undefine|MD_Visibility) const Macr Example::: - - Callback: Ifdef + - Callback: Ifdef Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-conditional.cpp:3:1" - MacroNameTok: MACRO - MacroDirective: MD_Define + MacroNameTok: MACRO + MacroDirective: MD_Define `Ifndef `_ Callback ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -757,10 +757,10 @@ MacroDirective (MD_Define|MD_Undefine|MD_Visibility) const Macr Example::: - - Callback: Ifndef + - Callback: Ifndef Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-conditional.cpp:3:1" - MacroNameTok: MACRO - MacroDirective: MD_Define + MacroNameTok: MACRO + MacroDirective: MD_Define `Else `_ Callback ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -778,9 +778,9 @@ IfLoc "(file):(line):(col)" SourceLoca Example::: - - Callback: Else - Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:10:2" - IfLoc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:2" + - Callback: Else + Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:10:2" + IfLoc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:2" `Endif `_ Callback ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -798,9 +798,9 @@ IfLoc "(file):(line):(col)" SourceLoca Example::: - - Callback: Endif - Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:10:2" - IfLoc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:2" + - Callback: Endif + Loc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:10:2" + IfLoc: "D:/Clang/llvm/tools/clang/tools/extra/test/pp-trace/pp-trace-macro.cpp:8:2" Building pp-trace ================= -- cgit v1.2.3