[Mesa-dev] [PATCH 2/2] glcpp: Replace multi-line comment with a space (even as part of macro definition)

[Kenneth Graunke]

On 12/19/2013 04:25 PM, Carl Worth wrote:
[snip]
> diff --git a/src/glsl/glcpp/tests/063-comments.c.expected b/src/glsl/glcpp/tests/063-comments.c.expected
> index 73ca707..1965c9b 100644
> --- a/src/glsl/glcpp/tests/063-comments.c.expected
> +++ b/src/glsl/glcpp/tests/063-comments.c.expected
> @@ -5,16 +5,16 @@ f = g /h;
>   l();
>  m = n
>  + p;
> + 
>  
>  
>  
>  
>  
>  
> - 
>  more code here
> -
>   
> +
>  are not treated like comments.
>   
>   
> diff --git a/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected b/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected
> index 84fdc50..be20b7c 100644
> --- a/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected
> +++ b/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected
> @@ -1,4 +1,5 @@
>  0:12(17): preprocessor error: division by 0 in preprocessor directive
> + 
>  
>  
>  
> @@ -9,7 +10,6 @@
>  
>  
>  
> - 
>  
>  
>  
> diff --git a/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected b/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected
> index 9b3eb67..292d651 100644
> --- a/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected
> +++ b/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected
> @@ -1,3 +1,4 @@
> + 
>  
>  
>  
> @@ -6,7 +7,6 @@
>  
>  
>  
> - 
>  
>  
>   

Best.  Diffs.  Ever.

Both patches are:
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>