Skip to content

A
angle
Commit e5dfefad by alokp@chromium.org
Options

Renamed UNEXPECTED_TOKEN_IN_DIRECTIVE to UNEXPECTED_TOKEN.

git-svn-id: https://angleproject.googlecode.com/svn/trunk@1096 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 7c884540
Showing with 11 additions and 11 deletions
src/compiler/preprocessor/new/Diagnostics.h
...@@ -30,7 +30,7 @@ class Diagnostics ...@@ -30,7 +30,7 @@ class Diagnostics
DIVISION_BY_ZERO, DIVISION_BY_ZERO,
EOF_IN_COMMENT, EOF_IN_COMMENT,
EOF_IN_DIRECTIVE, EOF_IN_DIRECTIVE,
UNEXPECTED_TOKEN_IN_DIRECTIVE, UNEXPECTED_TOKEN,
MACRO_NAME_RESERVED, MACRO_NAME_RESERVED,
MACRO_REDEFINED, MACRO_REDEFINED,
INVALID_EXTENSION_NAME, INVALID_EXTENSION_NAME,
......
src/compiler/preprocessor/new/DirectiveParser.cpp
...@@ -120,7 +120,7 @@ void DirectiveParser::parseDirective(Token* token) ...@@ -120,7 +120,7 @@ void DirectiveParser::parseDirective(Token* token)
} }
if ((token->type != '\n') && (token->type != 0)) if ((token->type != '\n') && (token->type != 0))
mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN_IN_DIRECTIVE, mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN,
token->location, token->location,
token->value); token->value);
...@@ -143,7 +143,7 @@ void DirectiveParser::parseDefine(Token* token) ...@@ -143,7 +143,7 @@ void DirectiveParser::parseDefine(Token* token)
mTokenizer->lex(token); mTokenizer->lex(token);
if (token->type != Token::IDENTIFIER) if (token->type != Token::IDENTIFIER)
{ {
mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN_IN_DIRECTIVE, mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN,
token->location, token->location,
token->value); token->value);
return; return;
...@@ -176,7 +176,7 @@ void DirectiveParser::parseDefine(Token* token) ...@@ -176,7 +176,7 @@ void DirectiveParser::parseDefine(Token* token)
if (token->type != ')') if (token->type != ')')
{ {
mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN_IN_DIRECTIVE, mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN,
token->location, token->location,
token->value); token->value);
return; return;
...@@ -212,7 +212,7 @@ void DirectiveParser::parseUndef(Token* token) ...@@ -212,7 +212,7 @@ void DirectiveParser::parseUndef(Token* token)
mTokenizer->lex(token); mTokenizer->lex(token);
if (token->type != Token::IDENTIFIER) if (token->type != Token::IDENTIFIER)
{ {
mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN_IN_DIRECTIVE, mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN,
token->location, token->location,
token->value); token->value);
return; return;
...@@ -384,7 +384,7 @@ void DirectiveParser::parseExtension(Token* token) ...@@ -384,7 +384,7 @@ void DirectiveParser::parseExtension(Token* token)
case COLON: case COLON:
if (valid && (token->type != ':')) if (valid && (token->type != ':'))
{ {
mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN_IN_DIRECTIVE, mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN,
token->location, token->value); token->location, token->value);
valid = false; valid = false;
} }
...@@ -401,7 +401,7 @@ void DirectiveParser::parseExtension(Token* token) ...@@ -401,7 +401,7 @@ void DirectiveParser::parseExtension(Token* token)
default: default:
if (valid) if (valid)
{ {
mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN_IN_DIRECTIVE, mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN,
token->location, token->value); token->location, token->value);
valid = false; valid = false;
} }
...@@ -449,7 +449,7 @@ void DirectiveParser::parseVersion(Token* token) ...@@ -449,7 +449,7 @@ void DirectiveParser::parseVersion(Token* token)
default: default:
if (valid) if (valid)
{ {
mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN_IN_DIRECTIVE, mDiagnostics->report(Diagnostics::UNEXPECTED_TOKEN,
token->location, token->value); token->location, token->value);
valid = false; valid = false;
} }
......
tests/preprocessor_tests/extension_test.cpp
...@@ -113,9 +113,9 @@ TEST_P(InvalidExtensionTest, Identified) ...@@ -113,9 +113,9 @@ TEST_P(InvalidExtensionTest, Identified)
static const ExtensionTestParam kParams[] = { static const ExtensionTestParam kParams[] = {
{"#extension\n", pp::Diagnostics::INVALID_EXTENSION_DIRECTIVE}, {"#extension\n", pp::Diagnostics::INVALID_EXTENSION_DIRECTIVE},
{"#extension 1\n", pp::Diagnostics::INVALID_EXTENSION_NAME}, {"#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 : \n", pp::Diagnostics::INVALID_EXTENSION_DIRECTIVE},
{"#extension foo : 1\n", pp::Diagnostics::INVALID_EXTENSION_BEHAVIOR}, {"#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)); INSTANTIATE_TEST_CASE_P(All, InvalidExtensionTest, testing::ValuesIn(kParams));
tests/preprocessor_tests/version_test.cpp
...@@ -108,7 +108,7 @@ TEST_P(InvalidVersionTest, Identified) ...@@ -108,7 +108,7 @@ TEST_P(InvalidVersionTest, Identified)
static const VersionTestParam kParams[] = { static const VersionTestParam kParams[] = {
{"#version\n", pp::Diagnostics::INVALID_VERSION_DIRECTIVE}, {"#version\n", pp::Diagnostics::INVALID_VERSION_DIRECTIVE},
{"#version foo\n", pp::Diagnostics::INVALID_VERSION_NUMBER}, {"#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)); INSTANTIATE_TEST_CASE_P(All, InvalidVersionTest, testing::ValuesIn(kParams));
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment