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.h | |
| 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.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 5f3f7d6cf4..e0c901ea8c 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" |