Skip to content

A
angle
Commit 390209ae by alokp@chromium.org
Options

Lowered the severity of EOF_IN_DIRECTIVE from an ERROR to WARNING. There are…

Lowered the severity of EOF_IN_DIRECTIVE from an ERROR to WARNING. There are just too many shaders on internet (including webgl conformance test) that do not have a newline at the end of directives, especially #endif. Review URL: https://codereview.appspot.com/6352059 git-svn-id: https://angleproject.googlecode.com/svn/trunk@1185 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent d0d9f87a
Showing with 3 additions and 3 deletions
src/compiler/preprocessor/new/Diagnostics.cpp
...@@ -60,8 +60,6 @@ std::string Diagnostics::message(ID id) ...@@ -60,8 +60,6 @@ std::string Diagnostics::message(ID id)
return "division by zero"; return "division by zero";
case EOF_IN_COMMENT: case EOF_IN_COMMENT:
return "unexpected end of file found in comment"; return "unexpected end of file found in comment";
case EOF_IN_DIRECTIVE:
return "unexpected end of file found in directive";
case UNEXPECTED_TOKEN: case UNEXPECTED_TOKEN:
return "unexpected token"; return "unexpected token";
case DIRECTIVE_INVALID_NAME: case DIRECTIVE_INVALID_NAME:
...@@ -113,6 +111,8 @@ std::string Diagnostics::message(ID id) ...@@ -113,6 +111,8 @@ std::string Diagnostics::message(ID id)
return "invalid line directive"; return "invalid line directive";
// Errors end. // Errors end.
// Warnings begin. // Warnings begin.
case EOF_IN_DIRECTIVE:
return "unexpected end of file found in directive";
case CONDITIONAL_UNEXPECTED_TOKEN: case CONDITIONAL_UNEXPECTED_TOKEN:
return "unexpected token after conditional expression"; return "unexpected token after conditional expression";
case UNRECOGNIZED_PRAGMA: case UNRECOGNIZED_PRAGMA:
......
src/compiler/preprocessor/new/Diagnostics.h
...@@ -37,7 +37,6 @@ class Diagnostics ...@@ -37,7 +37,6 @@ class Diagnostics
INVALID_EXPRESSION, INVALID_EXPRESSION,
DIVISION_BY_ZERO, DIVISION_BY_ZERO,
EOF_IN_COMMENT, EOF_IN_COMMENT,
EOF_IN_DIRECTIVE,
UNEXPECTED_TOKEN, UNEXPECTED_TOKEN,
DIRECTIVE_INVALID_NAME, DIRECTIVE_INVALID_NAME,
MACRO_NAME_RESERVED, MACRO_NAME_RESERVED,
...@@ -65,6 +64,7 @@ class Diagnostics ...@@ -65,6 +64,7 @@ class Diagnostics
ERROR_END, ERROR_END,
WARNING_BEGIN, WARNING_BEGIN,
EOF_IN_DIRECTIVE,
CONDITIONAL_UNEXPECTED_TOKEN, CONDITIONAL_UNEXPECTED_TOKEN,
UNRECOGNIZED_PRAGMA, UNRECOGNIZED_PRAGMA,
WARNING_END WARNING_END
......
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