diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-04-02 00:37:12 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-04-02 00:37:12 +1000 |
| commit | ea990867a8b0f59a85b01e7d3aa3ab53d61078d2 (patch) | |
| tree | da285fd991a5ccdb1c5a14efd9af560033825f93 /src/mesa/shader/arbprogram.syn | |
| parent | e616d3f3e2178e34e4e7d769b38b0dff4ad615fe (diff) | |
| parent | edfa8201a50c47376b7aa0c05d7851e3e1353bde (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/shader/arbprogram.syn')
| -rw-r--r-- | src/mesa/shader/arbprogram.syn | 6 |
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'; |