C++: Exclude operator bool from the reserved names

Author: lcartey

cpp/common/src/ext/stdcpp14.generated.names.model.yml

@@ -951,7 +951,6 @@ extensions:
   - [C++14, atomic, std, atomic, exchange, bool, 'bool __i, memory_order __m', external]
   - [C++14, atomic, std, atomic, exchange, _Tp, '_Tp __i, memory_order __m', external]
   - [C++14, atomic, std, atomic, exchange, __pointer_type, '__pointer_type __p, memory_order __m', external]
-  - [C++14, atomic, std, atomic, operator bool, bool, '', external]
   - [C++14, atomic, std, atomic, fetch_sub, __pointer_type, 'ptrdiff_t __d, memory_order __m', external]
   - [C++14, atomic, std, atomic, fetch_add, __pointer_type, 'ptrdiff_t __d, memory_order __m', external]
   - [C++14, atomic, std, atomic, compare_exchange_strong, bool, '__pointer_type & __p1, __pointer_type __p2, memory_order __m1, memory_order __m2', external]
@@ -1246,7 +1245,6 @@ extensions:
   - [C++14, exception, std, bad_exception, what, const char *, '', external]
   - [C++14, exception, 'std::__exception_ptr', '', swap, void, 'exception_ptr & __lhs, exception_ptr & __rhs', external]
   - [C++14, exception, 'std::__exception_ptr', exception_ptr, swap, void, exception_ptr & (unnamed parameter 0), external]
-  - [C++14, exception, 'std::__exception_ptr', exception_ptr, operator bool, bool, '', external]
   - [C++14, locale, std, '', isblank, bool, '_CharT __c, const locale & __loc', external]
   - [C++14, locale, std, '', toupper, _CharT, '_CharT __c, const locale & __loc', external]
   - [C++14, locale, std, '', tolower, _CharT, '_CharT __c, const locale & __loc', external]
@@ -1552,7 +1550,6 @@ extensions:
   - [C++14, set, std, multiset, key_comp, key_compare, '', external]
   - [C++14, set, std, multiset, value_comp, value_compare, '', external]
   - [C++14, set, std, multiset, emplace_hint, iterator, 'const_iterator __pos, _Args && __args', external]
-  - [C++14, bitset, std, reference, operator bool, bool, '', external]
   - [C++14, bitset, std, reference, flip, reference &, '', external]
   - [C++14, bitset, std, bitset, size, size_t, '', external]
   - [C++14, bitset, std, bitset, count, size_t, '', external]
@@ -1591,14 +1588,12 @@ extensions:
   - [C++14, system_error, std, '', make_error_code, error_code, errc __e, external]
   - [C++14, system_error, std, system_error, code, const error_code &, '', external]
   - [C++14, system_error, std, error_code, value, int, '', external]
-  - [C++14, system_error, std, error_code, operator bool, bool, '', external]
   - [C++14, system_error, std, error_code, clear, void, '', external]
   - [C++14, system_error, std, error_code, assign, void, 'int __v, const error_category & __cat', external]
   - [C++14, system_error, std, error_code, category, const error_category &, '', external]
   - [C++14, system_error, std, error_code, message, string, '', external]
   - [C++14, system_error, std, error_code, default_error_condition, error_condition, '', external]
   - [C++14, system_error, std, error_condition, value, int, '', external]
-  - [C++14, system_error, std, error_condition, operator bool, bool, '', external]
   - [C++14, system_error, std, error_condition, clear, void, '', external]
   - [C++14, system_error, std, error_condition, assign, void, 'int __v, const error_category & __cat', external]
   - [C++14, system_error, std, error_condition, category, const error_category &, '', external]
@@ -1729,7 +1724,6 @@ extensions:
   - [C++14, mutex, std, mutex, native_handle, native_handle_type, '', external]
   - [C++14, mutex, std, mutex, try_lock, bool, '', external]
   - [C++14, mutex, std, unique_lock, swap, void, unique_lock<_Mutex> & __u, external]
-  - [C++14, mutex, std, unique_lock, operator bool, bool, '', external]
   - [C++14, mutex, std, unique_lock, unlock, void, '', external]
   - [C++14, mutex, std, unique_lock, lock, void, '', external]
   - [C++14, mutex, std, unique_lock, try_lock, bool, '', external]
@@ -2192,7 +2186,6 @@ extensions:
   - [C++14, vector, std, vector, emplace, iterator, 'const_iterator __pos, _Args && __args', external]
   - [C++14, vector, std, vector, emplace_back, void, _Args && __args, external]
   - [C++14, vector, std, _Bvector_base, get_allocator, allocator_type, '', external]
-  - [C++14, vector, std, _Bit_reference, operator bool, bool, '', external]
   - [C++14, vector, std, _Bit_reference, flip, void, '', external]
   - [C++14, queue, std, '', swap, void, 'priority_queue<_Tp, _Sequence, _Compare> & __x, priority_queue<_Tp, _Sequence, _Compare> & __y', external]
   - [C++14, queue, std, '', swap, void, 'queue<_Tp, _Seq> & __x, queue<_Tp, _Seq> & __y', external]
@@ -2721,7 +2714,6 @@ extensions:
   - [C++14, ostream, std, '', flush, 'basic_ostream<_CharT, _Traits> &', 'basic_ostream<_CharT, _Traits> & __os', external]
   - [C++14, ostream, std, '', ends, 'basic_ostream<_CharT, _Traits> &', 'basic_ostream<_CharT, _Traits> & __os', external]
   - [C++14, ostream, std, '', endl, 'basic_ostream<_CharT, _Traits> &', 'basic_ostream<_CharT, _Traits> & __os', external]
-  - [C++14, ostream, std, sentry, operator bool, bool, '', external]
   - [C++14, ostream, std, basic_ostream, swap, void, 'basic_ostream<_CharT, _Traits> & __rhs', external]
   - [C++14, ostream, std, basic_ostream, write, __ostream_type &, 'const char_type * __s, streamsize __n', external]
   - [C++14, ostream, std, basic_ostream, put, __ostream_type &, char_type __c, external]
@@ -2730,7 +2722,6 @@ extensions:
   - [C++14, ostream, std, basic_ostream, tellp, pos_type, '', external]
   - [C++14, ostream, std, basic_ostream, flush, __ostream_type &, '', external]
   - [C++14, istream, std, '', ws, 'basic_istream<_CharT, _Traits> &', 'basic_istream<_CharT, _Traits> & __in', external]
-  - [C++14, istream, std, sentry, operator bool, bool, '', external]
   - [C++14, istream, std, basic_iostream, swap, void, 'basic_iostream<_CharT, _Traits> & __rhs', external]
   - [C++14, istream, std, basic_istream, swap, void, 'basic_istream<_CharT, _Traits> & __rhs', external]
   - [C++14, istream, std, basic_istream, get, int_type, '', external]
@@ -2844,7 +2835,6 @@ extensions:
   - [C++14, ios, std, basic_ios, fill, char_type, '', external]
   - [C++14, ios, std, basic_ios, fill, char_type, char_type __ch, external]
   - [C++14, ios, std, basic_ios, setstate, void, iostate __state, external]
-  - [C++14, ios, std, basic_ios, operator bool, bool, '', external]
   - [C++14, ios, std, basic_ios, clear, void, iostate __state, external]
   - [C++14, ios, std, basic_ios, eof, bool, '', external]
   - [C++14, ios, std, basic_ios, imbue, locale, const locale & __loc, external]
@@ -3343,7 +3333,6 @@ extensions:
   - [C++14, functional, std, reference_wrapper, get, _Tp &, '', external]
   - [C++14, functional, std, reference_wrapper, operator _Tp &, _Tp &, '', external]
   - [C++14, functional, std, function, swap, void, function<..(..)> & __x, external]
-  - [C++14, functional, std, function, operator bool, bool, '', external]
   - [C++14, functional, std, function, target, const _Functor *, '', external]
   - [C++14, functional, std, function, target, _Functor *, '', external]
   - [C++14, functional, std, function, target_type, const type_info &, '', external]
@@ -3379,7 +3368,6 @@ extensions:
   - [C++14, scoped_allocator, std, scoped_allocator_adaptor, inner_allocator, inner_allocator_type &, '', external]
   - [C++14, shared_mutex, std, '', swap, void, 'shared_lock<_Mutex> & __x, shared_lock<_Mutex> & __y', external]
   - [C++14, shared_mutex, std, shared_lock, swap, void, shared_lock<_Mutex> & __u, external]
-  - [C++14, shared_mutex, std, shared_lock, operator bool, bool, '', external]
   - [C++14, shared_mutex, std, shared_lock, unlock, void, '', external]
   - [C++14, shared_mutex, std, shared_lock, lock, void, '', external]
   - [C++14, shared_mutex, std, shared_lock, try_lock, bool, '', external]
@@ -3843,7 +3831,6 @@ extensions:
   - [C++14, memory, std, unique_ptr, swap, void, 'unique_ptr<_Tp[], _Dp> & __u', external]
   - [C++14, memory, std, unique_ptr, swap, void, 'unique_ptr<_Tp, _Dp> & __u', external]
   - [C++14, memory, std, unique_ptr, get, pointer, '', external]
-  - [C++14, memory, std, unique_ptr, operator bool, bool, '', external]
   - [C++14, memory, std, unique_ptr, reset, void, nullptr_t (unnamed parameter 0), external]
   - [C++14, memory, std, unique_ptr, reset, void, pointer __p, external]
   - [C++14, memory, std, unique_ptr, reset, void, _Up __p, external]
@@ -3866,7 +3853,6 @@ extensions:
   - [C++14, memory, std, __shared_ptr, swap, void, '__shared_ptr<_Tp, _Lp> & __other', external]
   - [C++14, memory, std, __shared_ptr, get, element_type *, '', external]
   - [C++14, memory, std, __shared_ptr, unique, bool, '', external]
-  - [C++14, memory, std, __shared_ptr, operator bool, bool, '', external]
   - [C++14, memory, std, __shared_ptr, reset, void, '', external]
   - [C++14, memory, std, __shared_ptr, reset, _SafeConv, _Yp * __p, external]
   - [C++14, memory, std, __shared_ptr, reset, _SafeConv, '_Yp * __p, _Deleter __d, _Alloc __a', external]

scripts/generate_standard_library_models/cpp/queries/libraryFunctionModel.ql

@@ -9,6 +9,8 @@ where
   not f.isCompilerGenerated() and
   // exclude user defined operators
   not f instanceof Operator and
+  // exclude "operator bool", which doesn't seem to be considered as an Operator
+  not f.getName() = "operator bool" and
   not f.isFromTemplateInstantiation(_) and
   not f instanceof Constructor and
   not f instanceof Destructor and