On 5/24/13 9:01 , "Laszlo Ersek" <ler...@redhat.com> wrote:
>On 05/21/13 17:33, Tomoki Sekiyama wrote: > >> diff --git a/scripts/qapi.py b/scripts/qapi.py >> index afc5f32..b174acb 100644 >> --- a/scripts/qapi.py >> +++ b/scripts/qapi.py >> @@ -156,9 +156,16 @@ def c_var(name, protect=True): >> # GCC http://gcc.gnu.org/onlinedocs/gcc-4.7.1/gcc/C-Extensions.html >> # excluding _.* >> gcc_words = set(['asm', 'typeof']) >> + # C++ ISO/IEC 14882:2003 2.11 >> + cpp_words = set(['bool', 'catch', 'class', 'const_cast', 'delete', >> + 'dynamic_cast', 'explicit', 'false', 'friend', >>'mutable', >> + 'namespace', 'new', 'operator', 'private', >>'protected', >> + 'public', 'reinterpret_cast', 'static_cast', >>'template', >> + 'this', 'throw', 'true', 'try', 'typeid', >>'typename', >> + 'using', 'virtual', 'wchar_t']) >> # namespace pollution: >> polluted_words = set(['unix']) >> - if protect and (name in c89_words | c99_words | c11_words | >>gcc_words | polluted_words): >> + if protect and (name in c89_words | c99_words | c11_words | >>gcc_words | cpp_words | polluted_words): >> return "q_" + name >> return name.replace('-', '_').lstrip("*") > >Since you're respinning anyway, perhaps consider adding these lovely >"alternative representations" from just one paragraph below (they are >reserved and "shall not be used otherwise" than the operators they stand >for): > >and bitand compl not_eq or_eq xor_eq >and_eq bitor not or xor > >although probably noone would use these as identifiers or otherwise... >So just mentioning it for completeness. > >Laszlo OK, I will try adding these keywords in next submit. Thanks, Tomoki Sekiyama