Renamed UNEXPECTED_TOKEN_IN_DIRECTIVE to UNEXPECTED_TOKEN.

src/compiler/preprocessor/new/Diagnostics.h

@@ -30,7 +30,7 @@ class Diagnostics
         DIVISION_BY_ZERO,
         EOF_IN_COMMENT,
         EOF_IN_DIRECTIVE,
-        UNEXPECTED_TOKEN_IN_DIRECTIVE,
+        UNEXPECTED_TOKEN,
         MACRO_NAME_RESERVED,
         MACRO_REDEFINED,
         INVALID_EXTENSION_NAME,

src/compiler/preprocessor/new/DirectiveParser.cpp

@@ -120,7 +120,7 @@ void DirectiveParser::parseDirective(Token* token)
     }
 
     if ((token->type != '\n') && (token->type != 0))
-        mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN_IN_DIRECTIVE,
+        mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN,
                              token->location,
                              token->value);
 
@@ -143,7 +143,7 @@ void DirectiveParser::parseDefine(Token* token)
     mTokenizer->lex(token);
     if (token->type != Token::IDENTIFIER)
     {
-        mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN_IN_DIRECTIVE,
+        mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN,
                              token->location,
                              token->value);
         return;
@@ -176,7 +176,7 @@ void DirectiveParser::parseDefine(Token* token)
 
         if (token->type != ')')
         {
-            mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN_IN_DIRECTIVE,
+            mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN,
                                  token->location,
                                  token->value);
             return;
@@ -212,7 +212,7 @@ void DirectiveParser::parseUndef(Token* token)
     mTokenizer->lex(token);
     if (token->type != Token::IDENTIFIER)
     {
-        mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN_IN_DIRECTIVE,
+        mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN,
                              token->location,
                              token->value);
         return;
@@ -384,7 +384,7 @@ void DirectiveParser::parseExtension(Token* token)
           case COLON:
             if (valid && (token->type != ':'))
             {
-                mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN_IN_DIRECTIVE,
+                mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN,
                                      token->location, token->value);
                 valid = false;
             }
@@ -401,7 +401,7 @@ void DirectiveParser::parseExtension(Token* token)
           default:
             if (valid)
             {
-                mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN_IN_DIRECTIVE,
+                mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN,
                                      token->location, token->value);
                 valid = false;
             }
@@ -449,7 +449,7 @@ void DirectiveParser::parseVersion(Token* token)
           default:
             if (valid)
             {
-                mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN_IN_DIRECTIVE,
+                mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN,
                                      token->location, token->value);
                 valid = false;
             }

tests/preprocessor_tests/extension_test.cpp

@@ -113,9 +113,9 @@ TEST_P(InvalidExtensionTest, Identified)
 static const ExtensionTestParam kParams[] = {
     {"#extension\n", pp::Diagnostics::INVALID_EXTENSION_DIRECTIVE},
     {"#extension 1\n", pp::Diagnostics::INVALID_EXTENSION_NAME},
-    {"#extension foo bar\n", pp::Diagnostics::UNEXPECTED_TOKEN_IN_DIRECTIVE},
+    {"#extension foo bar\n", pp::Diagnostics::UNEXPECTED_TOKEN},
     {"#extension foo : \n", pp::Diagnostics::INVALID_EXTENSION_DIRECTIVE},
     {"#extension foo : 1\n", pp::Diagnostics::INVALID_EXTENSION_BEHAVIOR},
-    {"#extension foo : bar baz\n", pp::Diagnostics::UNEXPECTED_TOKEN_IN_DIRECTIVE}
+    {"#extension foo : bar baz\n", pp::Diagnostics::UNEXPECTED_TOKEN}
 };
 INSTANTIATE_TEST_CASE_P(All, InvalidExtensionTest, testing::ValuesIn(kParams));

tests/preprocessor_tests/version_test.cpp

@@ -108,7 +108,7 @@ TEST_P(InvalidVersionTest, Identified)
 static const VersionTestParam kParams[] = {
     {"#version\n", pp::Diagnostics::INVALID_VERSION_DIRECTIVE},
     {"#version foo\n", pp::Diagnostics::INVALID_VERSION_NUMBER},
-    {"#version 100 foo\n", pp::Diagnostics::UNEXPECTED_TOKEN_IN_DIRECTIVE}
+    {"#version 100 foo\n", pp::Diagnostics::UNEXPECTED_TOKEN}
 };
 
 INSTANTIATE_TEST_CASE_P(All, InvalidVersionTest, testing::ValuesIn(kParams));