summaryrefslogtreecommitdiff
path: root/src/mesa/shader/arbprogram.syn
diff options
context:
space:
mode:
authorMarkus Amsler <markus.amsler@oribi.org>2008-03-31 14:58:11 -0600
committerBrian <brian.paul@tungstengraphics.com>2008-03-31 14:58:11 -0600
commit9136747a2b232ae7023972e6611cb2c845a86886 (patch)
treeed9c9cfa4df2fb1fa91de7c48a572f302175d27a /src/mesa/shader/arbprogram.syn
parentddc0f91bfc571dcd05c13f094c179b4250e53bcc (diff)
fix parsing bug involving comments at the end of ARB v/f programs
Diffstat (limited to 'src/mesa/shader/arbprogram.syn')
-rw-r--r--src/mesa/shader/arbprogram.syn6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/shader/arbprogram.syn b/src/mesa/shader/arbprogram.syn
index 1746a876c3..ba17d638a3 100644
--- a/src/mesa/shader/arbprogram.syn
+++ b/src/mesa/shader/arbprogram.syn
@@ -2643,14 +2643,14 @@ white_char
' ' .or '\t' .or '\n' .or '\r';
comment_block
- '#' .and .loop comment_char .and new_line;
+ '#' .and .loop comment_char .and optional_new_line;
/* All ASCII characters except '\r', '\n' and '\0' */
comment_char
'\x0E'-'\xFF' .or '\x01'-'\x09' .or '\x0B'-'\x0C';
-new_line
- '\n' .or crlf .or '\0';
+optional_new_line
+ '\n' .or crlf .or .true;
crlf
'\r' .and '\n';