diff options
| author | Stephane Marchesin <marchesin@icps.u-strasbg.fr> | 2008-04-02 05:10:52 +0200 |
|---|---|---|
| committer | Stephane Marchesin <marchesin@icps.u-strasbg.fr> | 2008-04-02 05:10:52 +0200 |
| commit | 901700888e5b4ec4dbec6ac924b542c780edaf52 (patch) | |
| tree | 7050fa76b0b30b68a1170ed590d59011fd6d2d3c /src/mesa/shader/arbprogram_syn.h | |
| parent | b1a361ba7a565063200c033e4939e6b28c006b13 (diff) | |
| parent | ae87909d0d261d0f4e888f6a167e6329eb129a87 (diff) | |
Merge branch 'gallium-0.1' of git+ssh://marcheu@git.freedesktop.org/git/nouveau/mesa into 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" |