summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Amsler <markus.amsler@oribi.org>2008-03-31 14:58:28 -0600
committerBrian <brian.paul@tungstengraphics.com>2008-03-31 14:58:48 -0600
commit3ea80c1128344a06b5d5c9cd45615a597047e402 (patch)
tree3f3dcb702b4bbf6009b3b5917ca529459a274185
parente82dd8c6e1fa2fff5b960de26961080ba5e9651d (diff)
fix parsing bug involving comments at the end of ARB v/f programs
-rw-r--r--src/mesa/shader/arbprogram.syn6
-rw-r--r--src/mesa/shader/arbprogram_syn.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/shader/arbprogram.syn b/src/mesa/shader/arbprogram.syn
index f3aa1ad724..b12c6a0eda 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';
diff --git a/src/mesa/shader/arbprogram_syn.h b/src/mesa/shader/arbprogram_syn.h
index 3f3ab073cf..d95a5dede4 100644
--- a/src/mesa/shader/arbprogram_syn.h
+++ b/src/mesa/shader/arbprogram_syn.h
@@ -1244,11 +1244,11 @@
"white_char\n"
" ' ' .or '\\t' .or '\\n' .or '\\r';\n"
"comment_block\n"
-" '#' .and .loop comment_char .and new_line;\n"
+" '#' .and .loop comment_char .and optional_new_line;\n"
"comment_char\n"
" '\\x0E'-'\\xFF' .or '\\x01'-'\\x09' .or '\\x0B'-'\\x0C';\n"
-"new_line\n"
-" '\\n' .or crlf .or '\\0';\n"
+"optional_new_line\n"
+" '\\n' .or crlf .or .true;\n"
"crlf\n"
" '\\r' .and '\\n';\n"
"semicolon\n"