From: Carl Worth Date: Wed, 25 Jun 2014 20:28:38 +0000 (-0700) Subject: glsl/glcpp: Add an explanatory comment for "loc != NULL" check X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fe1e0ac8524677c40c84f238650e0e198f0e8d36;p=mesa.git glsl/glcpp: Add an explanatory comment for "loc != NULL" check Just reading the code, it looked like a bug that _define_object_macro had this check, but _define_function_macro did not. Upon further reading, that's because the check is to allow for our builtins to be defined, (and there are no builtin function-like macros). Add my new understanding as a comment to help the next reader. Reviewed-by: Jordan Justen --- diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y index 9b753ddecd4..f75834514f2 100644 --- a/src/glsl/glcpp/glcpp-parse.y +++ b/src/glsl/glcpp/glcpp-parse.y @@ -1944,6 +1944,10 @@ _define_object_macro (glcpp_parser_t *parser, { macro_t *macro, *previous; + /* We define pre-defined macros before we've started parsing the + * actual file. So if there's no location defined yet, that's what + * were doing and we don't want to generate an error for using the + * reserved names. */ if (loc != NULL) _check_for_reserved_macro_name(parser, loc, identifier);