Author: Haojian Wu Date: 2022-06-09T14:58:05+02:00 New Revision: c70aeaad2b23b0b30baf6e4580a1995547f9ba41
URL: https://github.com/llvm/llvm-project/commit/c70aeaad2b23b0b30baf6e4580a1995547f9ba41 DIFF: https://github.com/llvm/llvm-project/commit/c70aeaad2b23b0b30baf6e4580a1995547f9ba41.diff LOG: [pseudo] Move grammar-related headers to a separate dir, NFC. We did that for .cpp, but forgot the headers. Differential Revision: https://reviews.llvm.org/D127388 Added: clang-tools-extra/pseudo/include/clang-pseudo/grammar/Grammar.h clang-tools-extra/pseudo/include/clang-pseudo/grammar/LRGraph.h clang-tools-extra/pseudo/include/clang-pseudo/grammar/LRTable.h Modified: clang-tools-extra/pseudo/fuzzer/Fuzzer.cpp clang-tools-extra/pseudo/gen/Main.cpp clang-tools-extra/pseudo/include/clang-pseudo/Forest.h clang-tools-extra/pseudo/include/clang-pseudo/GLR.h clang-tools-extra/pseudo/include/clang-pseudo/cxx/CXX.h clang-tools-extra/pseudo/lib/GLR.cpp clang-tools-extra/pseudo/lib/cxx/CXX.cpp clang-tools-extra/pseudo/lib/grammar/Grammar.cpp clang-tools-extra/pseudo/lib/grammar/GrammarBNF.cpp clang-tools-extra/pseudo/lib/grammar/LRGraph.cpp clang-tools-extra/pseudo/lib/grammar/LRTable.cpp clang-tools-extra/pseudo/lib/grammar/LRTableBuild.cpp clang-tools-extra/pseudo/tool/ClangPseudo.cpp clang-tools-extra/pseudo/unittests/GLRTest.cpp clang-tools-extra/pseudo/unittests/GrammarTest.cpp clang-tools-extra/pseudo/unittests/LRTableTest.cpp Removed: clang-tools-extra/pseudo/include/clang-pseudo/Grammar.h clang-tools-extra/pseudo/include/clang-pseudo/LRGraph.h clang-tools-extra/pseudo/include/clang-pseudo/LRTable.h ################################################################################ diff --git a/clang-tools-extra/pseudo/fuzzer/Fuzzer.cpp b/clang-tools-extra/pseudo/fuzzer/Fuzzer.cpp index 7b59eec30dbdf..58367837813ff 100644 --- a/clang-tools-extra/pseudo/fuzzer/Fuzzer.cpp +++ b/clang-tools-extra/pseudo/fuzzer/Fuzzer.cpp @@ -9,9 +9,9 @@ #include "clang-pseudo/DirectiveTree.h" #include "clang-pseudo/Forest.h" #include "clang-pseudo/GLR.h" -#include "clang-pseudo/Grammar.h" -#include "clang-pseudo/LRTable.h" #include "clang-pseudo/Token.h" +#include "clang-pseudo/grammar/Grammar.h" +#include "clang-pseudo/grammar/LRTable.h" #include "clang/Basic/LangOptions.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/MemoryBuffer.h" diff --git a/clang-tools-extra/pseudo/gen/Main.cpp b/clang-tools-extra/pseudo/gen/Main.cpp index 47ba7f2e71b54..38cb7f48e2b66 100644 --- a/clang-tools-extra/pseudo/gen/Main.cpp +++ b/clang-tools-extra/pseudo/gen/Main.cpp @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -#include "clang-pseudo/Grammar.h" +#include "clang-pseudo/grammar/Grammar.h" #include "llvm/ADT/StringExtras.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/FileSystem.h" diff --git a/clang-tools-extra/pseudo/include/clang-pseudo/Forest.h b/clang-tools-extra/pseudo/include/clang-pseudo/Forest.h index c699c4c217dff..29bcac98a64f8 100644 --- a/clang-tools-extra/pseudo/include/clang-pseudo/Forest.h +++ b/clang-tools-extra/pseudo/include/clang-pseudo/Forest.h @@ -20,8 +20,8 @@ #ifndef CLANG_PSEUDO_FOREST_H #define CLANG_PSEUDO_FOREST_H -#include "clang-pseudo/Grammar.h" #include "clang-pseudo/Token.h" +#include "clang-pseudo/grammar/Grammar.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/STLExtras.h" #include "llvm/Support/Allocator.h" diff --git a/clang-tools-extra/pseudo/include/clang-pseudo/GLR.h b/clang-tools-extra/pseudo/include/clang-pseudo/GLR.h index fc5ebeda1f279..8783872fa3556 100644 --- a/clang-tools-extra/pseudo/include/clang-pseudo/GLR.h +++ b/clang-tools-extra/pseudo/include/clang-pseudo/GLR.h @@ -30,8 +30,8 @@ #define CLANG_PSEUDO_GLR_H #include "clang-pseudo/Forest.h" -#include "clang-pseudo/Grammar.h" -#include "clang-pseudo/LRTable.h" +#include "clang-pseudo/grammar/Grammar.h" +#include "clang-pseudo/grammar/LRTable.h" #include "llvm/Support/Allocator.h" #include <vector> diff --git a/clang-tools-extra/pseudo/include/clang-pseudo/cxx/CXX.h b/clang-tools-extra/pseudo/include/clang-pseudo/cxx/CXX.h index edeeb636d83ed..4acad01588124 100644 --- a/clang-tools-extra/pseudo/include/clang-pseudo/cxx/CXX.h +++ b/clang-tools-extra/pseudo/include/clang-pseudo/cxx/CXX.h @@ -23,7 +23,7 @@ #ifndef CLANG_PSEUDO_CXX_CXX_H #define CLANG_PSEUDO_CXX_CXX_H -#include "clang-pseudo/Grammar.h" +#include "clang-pseudo/grammar/Grammar.h" namespace clang { namespace pseudo { diff --git a/clang-tools-extra/pseudo/include/clang-pseudo/Grammar.h b/clang-tools-extra/pseudo/include/clang-pseudo/grammar/Grammar.h similarity index 98% rename from clang-tools-extra/pseudo/include/clang-pseudo/Grammar.h rename to clang-tools-extra/pseudo/include/clang-pseudo/grammar/Grammar.h index fff96e9771c8a..8137734bd74fb 100644 --- a/clang-tools-extra/pseudo/include/clang-pseudo/Grammar.h +++ b/clang-tools-extra/pseudo/include/clang-pseudo/grammar/Grammar.h @@ -49,8 +49,8 @@ // //===----------------------------------------------------------------------===// -#ifndef CLANG_PSEUDO_GRAMMAR_H -#define CLANG_PSEUDO_GRAMMAR_H +#ifndef CLANG_PSEUDO_GRAMMAR_GRAMMAR_H +#define CLANG_PSEUDO_GRAMMAR_GRAMMAR_H #include "clang/Basic/TokenKinds.h" #include "llvm/ADT/ArrayRef.h" @@ -221,4 +221,4 @@ struct GrammarTable { } // namespace pseudo } // namespace clang -#endif // CLANG_PSEUDO_GRAMMAR_H +#endif // CLANG_PSEUDO_GRAMMAR_GRAMMAR_H diff --git a/clang-tools-extra/pseudo/include/clang-pseudo/LRGraph.h b/clang-tools-extra/pseudo/include/clang-pseudo/grammar/LRGraph.h similarity index 97% rename from clang-tools-extra/pseudo/include/clang-pseudo/LRGraph.h rename to clang-tools-extra/pseudo/include/clang-pseudo/grammar/LRGraph.h index 889c5e5decf50..1b53653274310 100644 --- a/clang-tools-extra/pseudo/include/clang-pseudo/LRGraph.h +++ b/clang-tools-extra/pseudo/include/clang-pseudo/grammar/LRGraph.h @@ -28,10 +28,10 @@ // in making decisions. //===----------------------------------------------------------------------===// -#ifndef CLANG_PSEUDO_LRGRAPH_H -#define CLANG_PSEUDO_LRGRAPH_H +#ifndef CLANG_PSEUDO_GRAMMAR_LRGRAPH_H +#define CLANG_PSEUDO_GRAMMAR_LRGRAPH_H -#include "clang-pseudo/Grammar.h" +#include "clang-pseudo/grammar/Grammar.h" #include "llvm/ADT/Hashing.h" #include <vector> @@ -178,4 +178,4 @@ template <> struct DenseMapInfo<clang::pseudo::Item> { }; } // namespace llvm -#endif // CLANG_PSEUDO_LRGRAPH_H +#endif // CLANG_PSEUDO_GRAMMAR_LRGRAPH_H diff --git a/clang-tools-extra/pseudo/include/clang-pseudo/LRTable.h b/clang-tools-extra/pseudo/include/clang-pseudo/grammar/LRTable.h similarity index 97% rename from clang-tools-extra/pseudo/include/clang-pseudo/LRTable.h rename to clang-tools-extra/pseudo/include/clang-pseudo/grammar/LRTable.h index 52f29b7d1c0ba..08e4868b88f70 100644 --- a/clang-tools-extra/pseudo/include/clang-pseudo/LRTable.h +++ b/clang-tools-extra/pseudo/include/clang-pseudo/grammar/LRTable.h @@ -33,10 +33,10 @@ // //===----------------------------------------------------------------------===// -#ifndef CLANG_PSEUDO_LRTABLE_H -#define CLANG_PSEUDO_LRTABLE_H +#ifndef CLANG_PSEUDO_GRAMMAR_LRTABLE_H +#define CLANG_PSEUDO_GRAMMAR_LRTABLE_H -#include "clang-pseudo/Grammar.h" +#include "clang-pseudo/grammar/Grammar.h" #include "llvm/ADT/ArrayRef.h" #include <cstdint> #include <vector> @@ -189,4 +189,4 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &, const LRTable::Action &); } // namespace pseudo } // namespace clang -#endif // CLANG_PSEUDO_LRTABLE_H +#endif // CLANG_PSEUDO_GRAMMAR_LRTABLE_H diff --git a/clang-tools-extra/pseudo/lib/GLR.cpp b/clang-tools-extra/pseudo/lib/GLR.cpp index 0a81556ef052c..39da7f15c5c9a 100644 --- a/clang-tools-extra/pseudo/lib/GLR.cpp +++ b/clang-tools-extra/pseudo/lib/GLR.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include "clang-pseudo/GLR.h" -#include "clang-pseudo/Grammar.h" -#include "clang-pseudo/LRTable.h" +#include "clang-pseudo/grammar/Grammar.h" +#include "clang-pseudo/grammar/LRTable.h" #include "clang/Basic/TokenKinds.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/STLExtras.h" diff --git a/clang-tools-extra/pseudo/lib/cxx/CXX.cpp b/clang-tools-extra/pseudo/lib/cxx/CXX.cpp index 3d594b722f1ca..bcf350ce87fc5 100644 --- a/clang-tools-extra/pseudo/lib/cxx/CXX.cpp +++ b/clang-tools-extra/pseudo/lib/cxx/CXX.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "clang-pseudo/cxx/CXX.h" -#include "clang-pseudo/LRTable.h" +#include "clang-pseudo/grammar/LRTable.h" namespace clang { namespace pseudo { diff --git a/clang-tools-extra/pseudo/lib/grammar/Grammar.cpp b/clang-tools-extra/pseudo/lib/grammar/Grammar.cpp index 17634632baf02..8e3bcb7afb376 100644 --- a/clang-tools-extra/pseudo/lib/grammar/Grammar.cpp +++ b/clang-tools-extra/pseudo/lib/grammar/Grammar.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "clang-pseudo/Grammar.h" +#include "clang-pseudo/grammar/Grammar.h" #include "clang/Basic/TokenKinds.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/STLExtras.h" diff --git a/clang-tools-extra/pseudo/lib/grammar/GrammarBNF.cpp b/clang-tools-extra/pseudo/lib/grammar/GrammarBNF.cpp index 91e0d39565184..bf5d06f26ae7d 100644 --- a/clang-tools-extra/pseudo/lib/grammar/GrammarBNF.cpp +++ b/clang-tools-extra/pseudo/lib/grammar/GrammarBNF.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "clang-pseudo/Grammar.h" +#include "clang-pseudo/grammar/Grammar.h" #include "clang/Basic/TokenKinds.h" #include "llvm/ADT/DenseSet.h" #include "llvm/ADT/STLExtras.h" diff --git a/clang-tools-extra/pseudo/lib/grammar/LRGraph.cpp b/clang-tools-extra/pseudo/lib/grammar/LRGraph.cpp index a186549a25e9d..5312a675cdb89 100644 --- a/clang-tools-extra/pseudo/lib/grammar/LRGraph.cpp +++ b/clang-tools-extra/pseudo/lib/grammar/LRGraph.cpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "clang-pseudo/LRGraph.h" -#include "clang-pseudo/Grammar.h" +#include "clang-pseudo/grammar/LRGraph.h" +#include "clang-pseudo/grammar/Grammar.h" #include "llvm/ADT/DenseSet.h" #include "llvm/ADT/Hashing.h" #include "llvm/ADT/STLExtras.h" diff --git a/clang-tools-extra/pseudo/lib/grammar/LRTable.cpp b/clang-tools-extra/pseudo/lib/grammar/LRTable.cpp index 0c4ff6e775fd9..016949df5e640 100644 --- a/clang-tools-extra/pseudo/lib/grammar/LRTable.cpp +++ b/clang-tools-extra/pseudo/lib/grammar/LRTable.cpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "clang-pseudo/LRTable.h" -#include "clang-pseudo/Grammar.h" +#include "clang-pseudo/grammar/LRTable.h" +#include "clang-pseudo/grammar/Grammar.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/STLExtras.h" #include "llvm/Support/ErrorHandling.h" diff --git a/clang-tools-extra/pseudo/lib/grammar/LRTableBuild.cpp b/clang-tools-extra/pseudo/lib/grammar/LRTableBuild.cpp index 4b5e87a3ac466..69251142ca134 100644 --- a/clang-tools-extra/pseudo/lib/grammar/LRTableBuild.cpp +++ b/clang-tools-extra/pseudo/lib/grammar/LRTableBuild.cpp @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -#include "clang-pseudo/Grammar.h" -#include "clang-pseudo/LRGraph.h" -#include "clang-pseudo/LRTable.h" +#include "clang-pseudo/grammar/Grammar.h" +#include "clang-pseudo/grammar/LRGraph.h" +#include "clang-pseudo/grammar/LRTable.h" #include "clang/Basic/TokenKinds.h" #include <cstdint> diff --git a/clang-tools-extra/pseudo/tool/ClangPseudo.cpp b/clang-tools-extra/pseudo/tool/ClangPseudo.cpp index 73fa18df47394..a9c972abb77e8 100644 --- a/clang-tools-extra/pseudo/tool/ClangPseudo.cpp +++ b/clang-tools-extra/pseudo/tool/ClangPseudo.cpp @@ -9,10 +9,10 @@ #include "clang-pseudo/Bracket.h" #include "clang-pseudo/DirectiveTree.h" #include "clang-pseudo/GLR.h" -#include "clang-pseudo/Grammar.h" -#include "clang-pseudo/LRGraph.h" -#include "clang-pseudo/LRTable.h" #include "clang-pseudo/Token.h" +#include "clang-pseudo/grammar/Grammar.h" +#include "clang-pseudo/grammar/LRGraph.h" +#include "clang-pseudo/grammar/LRTable.h" #include "clang/Basic/LangOptions.h" #include "llvm/ADT/StringExtras.h" #include "llvm/Support/CommandLine.h" diff --git a/clang-tools-extra/pseudo/unittests/GLRTest.cpp b/clang-tools-extra/pseudo/unittests/GLRTest.cpp index 0a85deaf6a1d3..d9555a8d56dd9 100644 --- a/clang-tools-extra/pseudo/unittests/GLRTest.cpp +++ b/clang-tools-extra/pseudo/unittests/GLRTest.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "clang-pseudo/GLR.h" -#include "clang-pseudo/Grammar.h" +#include "clang-pseudo/grammar/Grammar.h" #include "clang-pseudo/Token.h" #include "clang/Basic/LangOptions.h" #include "clang/Basic/TokenKinds.h" diff --git a/clang-tools-extra/pseudo/unittests/GrammarTest.cpp b/clang-tools-extra/pseudo/unittests/GrammarTest.cpp index cc72ca2b6f562..284d91e9bba15 100644 --- a/clang-tools-extra/pseudo/unittests/GrammarTest.cpp +++ b/clang-tools-extra/pseudo/unittests/GrammarTest.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "clang-pseudo/Grammar.h" +#include "clang-pseudo/grammar/Grammar.h" #include "gmock/gmock.h" #include "gtest/gtest.h" #include <memory> diff --git a/clang-tools-extra/pseudo/unittests/LRTableTest.cpp b/clang-tools-extra/pseudo/unittests/LRTableTest.cpp index 21b46879e2561..f4ba9be49db1f 100644 --- a/clang-tools-extra/pseudo/unittests/LRTableTest.cpp +++ b/clang-tools-extra/pseudo/unittests/LRTableTest.cpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "clang-pseudo/LRTable.h" -#include "clang-pseudo/Grammar.h" +#include "clang-pseudo/grammar/LRTable.h" +#include "clang-pseudo/grammar/Grammar.h" #include "clang/Basic/TokenKinds.h" #include "gmock/gmock.h" #include "gtest/gtest.h" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
