Skip to content

Commit bded65a

Browse files
tautschnigtautschnig
authored
Merge pull request #8626 from diffblue/ansi-c-double-loc
ansi-c: remove duplicate `loc()` invocations from scanner
2 parents 3b5e608 + 7b1ae4a commit bded65a

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

‎src/ansi-c/scanner.l

+32-32
Original file line numberDiff line numberDiff line change
@@ -950,38 +950,38 @@ enable_or_disable ("enable"|"disable")
950950
http://clang.llvm.org/docs/LanguageExtensions.html#checks-for-type-trait-primitives */
951951
%}
952952

953-
"__has_assign" { loc(); return MSC_cpp_keyword(TOK_UNARY_TYPE_PREDICATE); }
954-
"__has_copy" { loc(); return MSC_cpp_keyword(TOK_UNARY_TYPE_PREDICATE); }
955-
"__has_finalizer" { loc(); return MSC_cpp_keyword(TOK_UNARY_TYPE_PREDICATE); }
956-
"__has_nothrow_assign" { loc(); return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
957-
"__has_nothrow_constructor" { loc(); return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
958-
"__has_nothrow_copy" { loc(); return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
959-
"__has_trivial_assign" { loc(); return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
960-
"__has_trivial_constructor" { loc(); return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
961-
"__has_trivial_copy" { loc(); return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
962-
"__has_trivial_destructor" { loc(); return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
963-
"__has_user_destructor" { loc(); return MSC_cpp_keyword(TOK_UNARY_TYPE_PREDICATE); }
964-
"__has_virtual_destructor" { loc(); return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
965-
"__is_abstract" { loc(); return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
966-
"__is_base_of" { loc(); return conditional_keyword(PARSER.cpp98, TOK_BINARY_TYPE_PREDICATE); }
967-
"__is_class" { loc(); return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
968-
"__is_convertible_to" { loc(); return conditional_keyword(PARSER.cpp98, TOK_BINARY_TYPE_PREDICATE); }
969-
"__is_delegate" { loc(); return MSC_cpp_keyword(TOK_UNARY_TYPE_PREDICATE); }
970-
"__is_empty" { loc(); return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
971-
"__is_enum" { loc(); return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
972-
"__is_interface_class" { loc(); return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
973-
"__is_pod" { loc(); return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
974-
"__is_polymorphic" { loc(); return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
975-
"__is_ref_array" { loc(); return MSC_cpp_keyword(TOK_UNARY_TYPE_PREDICATE); }
976-
"__is_ref_class" { loc(); return MSC_cpp_keyword(TOK_UNARY_TYPE_PREDICATE); }
977-
"__is_sealed" { loc(); return MSC_cpp_keyword(TOK_UNARY_TYPE_PREDICATE); }
978-
"__is_simple_value_class" { loc(); return MSC_cpp_keyword(TOK_UNARY_TYPE_PREDICATE); }
979-
"__is_union" { loc(); return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
980-
"__is_value_class" { loc(); return MSC_cpp_keyword(TOK_UNARY_TYPE_PREDICATE); }
981-
982-
"__if_exists" { loc(); return MSC_cpp_keyword(TOK_MSC_IF_EXISTS); }
983-
"__if_not_exists" { loc(); return MSC_cpp_keyword(TOK_MSC_IF_NOT_EXISTS); }
984-
"__underlying_type" { loc(); return conditional_keyword(PARSER.cpp98, TOK_UNDERLYING_TYPE); }
953+
"__has_assign" { return MSC_cpp_keyword(TOK_UNARY_TYPE_PREDICATE); }
954+
"__has_copy" { return MSC_cpp_keyword(TOK_UNARY_TYPE_PREDICATE); }
955+
"__has_finalizer" { return MSC_cpp_keyword(TOK_UNARY_TYPE_PREDICATE); }
956+
"__has_nothrow_assign" { return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
957+
"__has_nothrow_constructor" { return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
958+
"__has_nothrow_copy" { return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
959+
"__has_trivial_assign" { return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
960+
"__has_trivial_constructor" { return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
961+
"__has_trivial_copy" { return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
962+
"__has_trivial_destructor" { return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
963+
"__has_user_destructor" { return MSC_cpp_keyword(TOK_UNARY_TYPE_PREDICATE); }
964+
"__has_virtual_destructor" { return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
965+
"__is_abstract" { return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
966+
"__is_base_of" { return conditional_keyword(PARSER.cpp98, TOK_BINARY_TYPE_PREDICATE); }
967+
"__is_class" { return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
968+
"__is_convertible_to" { return conditional_keyword(PARSER.cpp98, TOK_BINARY_TYPE_PREDICATE); }
969+
"__is_delegate" { return MSC_cpp_keyword(TOK_UNARY_TYPE_PREDICATE); }
970+
"__is_empty" { return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
971+
"__is_enum" { return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
972+
"__is_interface_class" { return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
973+
"__is_pod" { return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
974+
"__is_polymorphic" { return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
975+
"__is_ref_array" { return MSC_cpp_keyword(TOK_UNARY_TYPE_PREDICATE); }
976+
"__is_ref_class" { return MSC_cpp_keyword(TOK_UNARY_TYPE_PREDICATE); }
977+
"__is_sealed" { return MSC_cpp_keyword(TOK_UNARY_TYPE_PREDICATE); }
978+
"__is_simple_value_class" { return MSC_cpp_keyword(TOK_UNARY_TYPE_PREDICATE); }
979+
"__is_union" { return conditional_keyword(PARSER.cpp98, TOK_UNARY_TYPE_PREDICATE); }
980+
"__is_value_class" { return MSC_cpp_keyword(TOK_UNARY_TYPE_PREDICATE); }
981+
982+
"__if_exists" { return MSC_cpp_keyword(TOK_MSC_IF_EXISTS); }
983+
"__if_not_exists" { return MSC_cpp_keyword(TOK_MSC_IF_NOT_EXISTS); }
984+
"__underlying_type" { return conditional_keyword(PARSER.cpp98, TOK_UNDERLYING_TYPE); }
985985

986986
"["{ws}"repeatable" |
987987
"["{ws}"source_annotation_attribute" |

0 commit comments

Comments
 (0)