summaryrefslogtreecommitdiffstats
path: root/src/compiler/glsl/glcpp/glcpp-lex.l
diff options
context:
space:
mode:
authorCarl Worth <[email protected]>2014-08-05 16:33:03 -0700
committerKenneth Graunke <[email protected]>2017-01-04 14:40:48 -0800
commit16b480547ffaa5bcc8fdac184349b13ce8f019f5 (patch)
tree39ab7fc4acff72d2c8e32f9e7206d9a71fdb723d /src/compiler/glsl/glcpp/glcpp-lex.l
parent6c8762400d0d7b18250d8e1663d8812ca0811023 (diff)
glcpp: Allow vertical tab and form feed characters in GLSL
Of course, these aren't really useful for anything, but the GLSL language specification does allow them: The source character set used for the OpenGL shading languages, outside of comments, is a subset of UTF-8. It includes the following characters: ... White space: the space character, horizontal tab, vertical tab, form feed, carriage-return, and line- feed. [GLSL Language Specification 4.30.6, section 3.1] So treat vertical tab ('\v' or ^K) and form-feed ('\f' or ^L) as horizontal space characters. Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/compiler/glsl/glcpp/glcpp-lex.l')
-rw-r--r--src/compiler/glsl/glcpp/glcpp-lex.l2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/glsl/glcpp/glcpp-lex.l b/src/compiler/glsl/glcpp/glcpp-lex.l
index f4a68767010..381b97364a3 100644
--- a/src/compiler/glsl/glcpp/glcpp-lex.l
+++ b/src/compiler/glsl/glcpp/glcpp-lex.l
@@ -175,7 +175,7 @@ glcpp_lex_update_state_per_token (glcpp_parser_t *parser, int token)
SPACE [[:space:]]
NONSPACE [^[:space:]]
-HSPACE [ \t]
+HSPACE [ \t\v\f]
HASH #
NEWLINE (\r\n|\n\r|\r|\n)
IDENTIFIER [_a-zA-Z][_a-zA-Z0-9]*