On Wednesday, July 30, 2014 11:31:19 AM Jose Fonseca wrote: > On 30/07/14 03:42, Kenneth Graunke wrote: > > On Tuesday, July 29, 2014 05:02:39 PM Brian Paul wrote: > >> ERROR is a #define in the MSVC WinGDI.h header file. > >> Add the _TOKEN suffix as we do for a few other lexer tokens. > > Brian, sorry I missed your review and ended up duplicating it byte per > byte! Obviously it looks fine to me. > > > > > How about ERROR_TOK? That's what we use in the main compiler. > > Kenneth, I also think it is worth to have some unique prefix/suffix on > all tokens, to prevent this sort of collisions and make the code more > consistent. But I believe that if/what prefix/suffix to use is > something that glsl maintainers need to discuss and figure out among > themselves. In the meanwhile, we just need to fix the build somehow. > And _TOKEN is at least consistent with some of other existing tokens FWIW. > > Jose
Sure, I'm fine with putting either _TOKEN or _TOK on all of the tokens - it seems like a good idea. Obviously fixing the build is a priority, which is why I reviewed Brian's patch as soon as I saw it. The _TOK comment was a take-it-or-leave-it suggestion. --Ken
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
