diff options
| author | Markus Amsler <markus.amsler@oribi.org> | 2008-03-31 14:58:11 -0600 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2008-03-31 14:58:11 -0600 |
| commit | 9136747a2b232ae7023972e6611cb2c845a86886 (patch) | |
| tree | ed9c9cfa4df2fb1fa91de7c48a572f302175d27a /src/mesa/shader/arbprogram_syn.h | |
| parent | ddc0f91bfc571dcd05c13f094c179b4250e53bcc (diff) | |
| download | external_mesa3d-9136747a2b232ae7023972e6611cb2c845a86886.zip external_mesa3d-9136747a2b232ae7023972e6611cb2c845a86886.tar.gz external_mesa3d-9136747a2b232ae7023972e6611cb2c845a86886.tar.bz2 | |
fix parsing bug involving comments at the end of ARB v/f programs
Diffstat (limited to 'src/mesa/shader/arbprogram_syn.h')
| -rw-r--r-- | src/mesa/shader/arbprogram_syn.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/shader/arbprogram_syn.h b/src/mesa/shader/arbprogram_syn.h index 5f3f7d6..e0c901e 100644 --- a/src/mesa/shader/arbprogram_syn.h +++ b/src/mesa/shader/arbprogram_syn.h @@ -1242,11 +1242,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" |