diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-03 11:20:18 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-03 11:20:18 +0000 |
| commit | 46fbac6f1b19416ee1dbca883f0d09d9fd75d1eb (patch) | |
| tree | 2ddc90cb6bc4f04db80d66a334ecaabf139c0176 /mesalib/src/glsl/glcpp | |
| parent | 97f3d3043a79d6031787c246a67d2a02ff0a8d08 (diff) | |
| parent | 83a4fe0dc71aafbef11477b284abe530d3877556 (diff) | |
| download | vcxsrv-46fbac6f1b19416ee1dbca883f0d09d9fd75d1eb.tar.gz vcxsrv-46fbac6f1b19416ee1dbca883f0d09d9fd75d1eb.tar.bz2 vcxsrv-46fbac6f1b19416ee1dbca883f0d09d9fd75d1eb.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/glsl/glcpp')
| -rw-r--r-- | mesalib/src/glsl/glcpp/glcpp-parse.y | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mesalib/src/glsl/glcpp/glcpp-parse.y b/mesalib/src/glsl/glcpp/glcpp-parse.y index aa5a0c4f2..1f6e67fa0 100644 --- a/mesalib/src/glsl/glcpp/glcpp-parse.y +++ b/mesalib/src/glsl/glcpp/glcpp-parse.y @@ -388,7 +388,12 @@ expression: $$ = $1 + $3; } | expression '%' expression { - $$ = $1 % $3; + if ($3 == 0) { + yyerror (& @1, parser, + "zero modulus in preprocessor directive"); + } else { + $$ = $1 % $3; + } } | expression '/' expression { if ($3 == 0) { |