review: clean up after moving

- remove uneeded headers
- rename to new directory

Author: inbelic

clang/include/clang/Lex/LexHLSLRootSignature.h

@@ -1,22 +1,19 @@
-//===--- ParseHLSLRootSignature.h -------------------------------*- C++ -*-===//
+//===--- LexHLSLRootSignature.h ---------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
-//  This file defines the ParseHLSLRootSignature interface.
+//  This file defines the LexHLSLRootSignature interface.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_CLANG_PARSE_PARSEHLSLROOTSIGNATURE_H
 #define LLVM_CLANG_PARSE_PARSEHLSLROOTSIGNATURE_H
 
-#include "clang/AST/APValue.h"
-#include "clang/Basic/DiagnosticLex.h"
-#include "clang/Lex/LiteralSupport.h"
-#include "clang/Lex/Preprocessor.h"
+#include "clang/Basic/SourceLocation.h"
 
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
@@ -28,7 +25,7 @@ namespace hlsl {
 struct RootSignatureToken {
   enum Kind {
 #define TOK(X) X,
-#include "clang/Parse/HLSLRootSignatureTokenKinds.def"
+#include "clang/Lex/HLSLRootSignatureTokenKinds.def"
   };
 
   Kind Kind = Kind::invalid;

clang/lib/Lex/LexHLSLRootSignature.cpp

@@ -1,4 +1,4 @@
-#include "clang/Parse/ParseHLSLRootSignature.h"
+#include "clang/Lex/LexHLSLRootSignature.h"
 
 namespace clang {
 namespace hlsl {
@@ -30,7 +30,7 @@ RootSignatureToken RootSignatureLexer::LexToken() {
     AdvanceBuffer();                                                           \
     return Result;                                                             \
   }
-#include "clang/Parse/HLSLRootSignatureTokenKinds.def"
+#include "clang/Lex/HLSLRootSignatureTokenKinds.def"
   default:
     break;
   }
@@ -89,7 +89,7 @@ RootSignatureToken RootSignatureLexer::LexToken() {
   auto Switch = llvm::StringSwitch<TokenKind>(TokSpelling);
 #define KEYWORD(NAME) Switch.Case(#NAME, TokenKind::kw_##NAME);
 #define ENUM(NAME, LIT) Switch.CaseLower(LIT, TokenKind::en_##NAME);
-#include "clang/Parse/HLSLRootSignatureTokenKinds.def"
+#include "clang/Lex/HLSLRootSignatureTokenKinds.def"
 
   // Then attempt to retreive a string from it
   Result.Kind = Switch.Default(TokenKind::invalid);

clang/unittests/Lex/LexHLSLRootSignatureTest.cpp

@@ -1,22 +1,22 @@
-//=== ParseHLSLRootSignatureTest.cpp - Parse Root Signature tests ---------===//
+//=== LexHLSLRootSignatureTest.cpp - Lex Root Signature tests -------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/Parse/ParseHLSLRootSignature.h"
+#include "clang/Lex/LexHLSLRootSignature.h"
 #include "gtest/gtest.h"
 
 using namespace clang;
 
 namespace {
 
 // The test fixture.
-class ParseHLSLRootSignatureTest : public ::testing::Test {
+class LexHLSLRootSignatureTest : public ::testing::Test {
 protected:
-  ParseHLSLRootSignatureTest() {}
+  LexHLSLRootSignatureTest() {}
 
   void CheckTokens(hlsl::RootSignatureLexer &Lexer,
                    SmallVector<hlsl::RootSignatureToken> &Computed,
@@ -38,7 +38,7 @@ class ParseHLSLRootSignatureTest : public ::testing::Test {
 
 // Lexing Tests
 
-TEST_F(ParseHLSLRootSignatureTest, ValidLexNumbersTest) {
+TEST_F(LexHLSLRootSignatureTest, ValidLexNumbersTest) {
   // This test will check that we can lex different number tokens
   const llvm::StringLiteral Source = R"cc(
     -42 42 +42 +2147483648
@@ -75,7 +75,7 @@ TEST_F(ParseHLSLRootSignatureTest, ValidLexNumbersTest) {
   ASSERT_EQ(IntToken.NumSpelling, "2147483648");
 }
 
-TEST_F(ParseHLSLRootSignatureTest, ValidLexAllTokensTest) {
+TEST_F(LexHLSLRootSignatureTest, ValidLexAllTokensTest) {
   // This test will check that we can lex all defined tokens as defined in
   // HLSLRootSignatureTokenKinds.def, plus some additional integer variations
   const llvm::StringLiteral Source = R"cc(
@@ -114,13 +114,13 @@ TEST_F(ParseHLSLRootSignatureTest, ValidLexAllTokensTest) {
   SmallVector<hlsl::RootSignatureToken> Tokens;
   SmallVector<hlsl::TokenKind> Expected = {
 #define TOK(NAME) hlsl::TokenKind::NAME,
-#include "clang/Parse/HLSLRootSignatureTokenKinds.def"
+#include "clang/Lex/HLSLRootSignatureTokenKinds.def"
   };
 
   CheckTokens(Lexer, Tokens, Expected);
 }
 
-TEST_F(ParseHLSLRootSignatureTest, ValidLexPeekTest) {
+TEST_F(LexHLSLRootSignatureTest, ValidLexPeekTest) {
   // This test will check that we the peek api is correctly used
   const llvm::StringLiteral Source = R"cc(
     )1