Skip to content

Commit 3849bb0

Browse files
author
Daniel Kroening
committed
rename APPLE flavor to CLANG
1 parent f33459f commit 3849bb0

9 files changed

+85
-72
lines changed

‎src/ansi-c/ansi_c_declaration.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,10 @@ void ansi_c_declarationt::to_symbol(
150150
if(get_is_inline())
151151
symbol.type.set(ID_C_inlined, true);
152152

153-
if(config.ansi_c.mode==configt::ansi_ct::flavourt::GCC ||
154-
config.ansi_c.mode==configt::ansi_ct::flavourt::APPLE ||
155-
config.ansi_c.mode==configt::ansi_ct::flavourt::ARM)
153+
if(
154+
config.ansi_c.mode == configt::ansi_ct::flavourt::GCC ||
155+
config.ansi_c.mode == configt::ansi_ct::flavourt::CLANG ||
156+
config.ansi_c.mode == configt::ansi_ct::flavourt::ARM)
156157
{
157158
// GCC extern inline cleanup, to enable remove_internal_symbols
158159
// do its full job

‎src/ansi-c/ansi_c_internal_additions.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,10 @@ void ansi_c_internal_additions(std::string &code)
182182
"\n";
183183

184184
// GCC junk stuff, also for CLANG and ARM
185-
if(config.ansi_c.mode==configt::ansi_ct::flavourt::GCC ||
186-
config.ansi_c.mode==configt::ansi_ct::flavourt::APPLE ||
187-
config.ansi_c.mode==configt::ansi_ct::flavourt::ARM)
185+
if(
186+
config.ansi_c.mode == configt::ansi_ct::flavourt::GCC ||
187+
config.ansi_c.mode == configt::ansi_ct::flavourt::CLANG ||
188+
config.ansi_c.mode == configt::ansi_ct::flavourt::ARM)
188189
{
189190
code+=gcc_builtin_headers_types;
190191

@@ -195,11 +196,11 @@ void ansi_c_internal_additions(std::string &code)
195196
config.ansi_c.arch=="x86_64" ||
196197
config.ansi_c.arch=="x32")
197198
{
198-
if(config.ansi_c.mode==configt::ansi_ct::flavourt::APPLE)
199+
if(config.ansi_c.mode == configt::ansi_ct::flavourt::CLANG)
199200
code+="typedef double __float128;\n"; // clang doesn't do __float128
200201
}
201202

202-
// On 64-bit systems, gcc has typedefs
203+
// On 64-bit systems, both gcc and clang have typedefs
203204
// __int128_t und __uint128_t -- but not on 32 bit!
204205
if(config.ansi_c.long_int_width>=64)
205206
{

‎src/ansi-c/builtin_factory.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,10 @@ bool builtin_factory(
134134
}
135135

136136
// GCC junk stuff, also for CLANG and ARM
137-
if(config.ansi_c.mode==configt::ansi_ct::flavourt::GCC ||
138-
config.ansi_c.mode==configt::ansi_ct::flavourt::APPLE ||
139-
config.ansi_c.mode==configt::ansi_ct::flavourt::ARM)
137+
if(
138+
config.ansi_c.mode == configt::ansi_ct::flavourt::GCC ||
139+
config.ansi_c.mode == configt::ansi_ct::flavourt::CLANG ||
140+
config.ansi_c.mode == configt::ansi_ct::flavourt::ARM)
140141
{
141142
if(find_pattern(pattern, gcc_builtin_headers_generic, s))
142143
return convert(identifier, s, symbol_table, mh);

‎src/ansi-c/c_typecheck_base.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ void c_typecheck_baset::typecheck_redefinition_non_type(
336336
if(
337337
old_symbol.type.get_bool(ID_C_inlined) &&
338338
(config.ansi_c.mode == configt::ansi_ct::flavourt::GCC ||
339-
config.ansi_c.mode == configt::ansi_ct::flavourt::APPLE ||
339+
config.ansi_c.mode == configt::ansi_ct::flavourt::CLANG ||
340340
config.ansi_c.mode == configt::ansi_ct::flavourt::ARM ||
341341
config.ansi_c.mode == configt::ansi_ct::flavourt::VISUAL_STUDIO))
342342
{

‎src/ansi-c/scanner.l

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ void ansi_c_scanner_init()
452452
"while" { loc(); return TOK_WHILE; }
453453

454454
"__auto_type" { if((PARSER.mode==configt::ansi_ct::flavourt::GCC ||
455-
PARSER.mode==configt::ansi_ct::flavourt::APPLE)
455+
PARSER.mode==configt::ansi_ct::flavourt::CLANG)
456456
&& !PARSER.cpp98)
457457
{ loc(); return TOK_GCC_AUTO_TYPE; }
458458
else
@@ -516,7 +516,7 @@ void ansi_c_scanner_init()
516516
}
517517

518518
"__int128" { if(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
519-
PARSER.mode==configt::ansi_ct::flavourt::APPLE)
519+
PARSER.mode==configt::ansi_ct::flavourt::CLANG)
520520
{ loc(); return TOK_GCC_INT128; }
521521
else
522522
return make_identifier();
@@ -567,7 +567,7 @@ void ansi_c_scanner_init()
567567

568568
"__complex__" |
569569
"__complex" { if(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
570-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
570+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
571571
PARSER.mode==configt::ansi_ct::flavourt::ARM)
572572
{ loc(); return TOK_COMPLEX; }
573573
else
@@ -576,7 +576,7 @@ void ansi_c_scanner_init()
576576

577577
"__real__" |
578578
"__real" { if(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
579-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
579+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
580580
PARSER.mode==configt::ansi_ct::flavourt::ARM)
581581
{ loc(); return TOK_REAL; }
582582
else
@@ -585,7 +585,7 @@ void ansi_c_scanner_init()
585585

586586
"__imag__" |
587587
"__imag" { if(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
588-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
588+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
589589
PARSER.mode==configt::ansi_ct::flavourt::ARM)
590590
{ loc(); return TOK_IMAG; }
591591
else
@@ -604,7 +604,7 @@ void ansi_c_scanner_init()
604604
}
605605

606606
"__builtin_va_arg" { if(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
607-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
607+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
608608
PARSER.mode==configt::ansi_ct::flavourt::ARM)
609609
{ loc(); return TOK_BUILTIN_VA_ARG; }
610610
else
@@ -614,7 +614,7 @@ void ansi_c_scanner_init()
614614
"__builtin_offsetof" |
615615
"__offsetof__" |
616616
"offsetof" { if(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
617-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
617+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
618618
PARSER.mode==configt::ansi_ct::flavourt::ARM)
619619
{ loc(); return TOK_OFFSETOF; }
620620
else
@@ -623,7 +623,7 @@ void ansi_c_scanner_init()
623623

624624
"__builtin_types_compatible_p" {
625625
if(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
626-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
626+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
627627
PARSER.mode==configt::ansi_ct::flavourt::ARM)
628628
{ loc(); return TOK_GCC_BUILTIN_TYPES_COMPATIBLE_P; }
629629
else
@@ -632,14 +632,14 @@ void ansi_c_scanner_init()
632632

633633
"__builtin_convertvector" {
634634
if(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
635-
PARSER.mode==configt::ansi_ct::flavourt::APPLE)
635+
PARSER.mode==configt::ansi_ct::flavourt::CLANG)
636636
{ loc(); return TOK_CLANG_BUILTIN_CONVERTVECTOR; }
637637
else
638638
return make_identifier();
639639
}
640640

641641
"__alignof__" { if(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
642-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
642+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
643643
PARSER.mode==configt::ansi_ct::flavourt::ARM)
644644
{ loc(); return TOK_ALIGNOF; }
645645
else
@@ -650,7 +650,7 @@ void ansi_c_scanner_init()
650650
// http://msdn.microsoft.com/en-us/library/45t0s5f4%28v=vs.71%29.aspx
651651
if(PARSER.mode==configt::ansi_ct::flavourt::VISUAL_STUDIO ||
652652
PARSER.mode==configt::ansi_ct::flavourt::GCC ||
653-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
653+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
654654
PARSER.mode==configt::ansi_ct::flavourt::ARM)
655655
{ loc(); return TOK_ALIGNOF; }
656656
else
@@ -689,7 +689,7 @@ void ansi_c_scanner_init()
689689
}
690690

691691
"asm" { if(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
692-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
692+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
693693
PARSER.mode==configt::ansi_ct::flavourt::CODEWARRIOR)
694694
{
695695
if(PARSER.cpp98)
@@ -705,7 +705,7 @@ void ansi_c_scanner_init()
705705
}
706706

707707
"__asm__" { if(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
708-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
708+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
709709
PARSER.mode==configt::ansi_ct::flavourt::CODEWARRIOR ||
710710
PARSER.mode==configt::ansi_ct::flavourt::ARM)
711711
{
@@ -817,7 +817,7 @@ xor_eq { return cpp98_keyword(TOK_XORASSIGN); }
817817

818818
__decltype { if(PARSER.cpp98 &&
819819
(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
820-
PARSER.mode==configt::ansi_ct::flavourt::APPLE))
820+
PARSER.mode==configt::ansi_ct::flavourt::CLANG))
821821
return cpp98_keyword(TOK_DECLTYPE);
822822
else
823823
return make_identifier();
@@ -885,28 +885,28 @@ __decltype { if(PARSER.cpp98 &&
885885
}
886886

887887
"__char16_t" { if(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
888-
PARSER.mode==configt::ansi_ct::flavourt::APPLE)
888+
PARSER.mode==configt::ansi_ct::flavourt::CLANG)
889889
return cpp98_keyword(TOK_CHAR16_T); // GNU extension
890890
else
891891
return make_identifier();
892892
}
893893

894894
"__nullptr" { if(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
895-
PARSER.mode==configt::ansi_ct::flavourt::APPLE)
895+
PARSER.mode==configt::ansi_ct::flavourt::CLANG)
896896
return cpp98_keyword(TOK_NULLPTR); // GNU extension
897897
else
898898
return make_identifier();
899899
}
900900

901901
"__null" { if(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
902-
PARSER.mode==configt::ansi_ct::flavourt::APPLE)
902+
PARSER.mode==configt::ansi_ct::flavourt::CLANG)
903903
return cpp98_keyword(TOK_NULLPTR); // GNU extension
904904
else
905905
return make_identifier();
906906
}
907907

908908
"__char32_t" { if(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
909-
PARSER.mode==configt::ansi_ct::flavourt::APPLE)
909+
PARSER.mode==configt::ansi_ct::flavourt::CLANG)
910910
return cpp98_keyword(TOK_CHAR32_T); // GNU extension
911911
else
912912
return make_identifier();
@@ -944,7 +944,7 @@ __decltype { if(PARSER.cpp98 &&
944944

945945
"__attribute__" |
946946
"__attribute" { if(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
947-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
947+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
948948
PARSER.mode==configt::ansi_ct::flavourt::CODEWARRIOR ||
949949
PARSER.mode==configt::ansi_ct::flavourt::ARM)
950950
{
@@ -1119,15 +1119,15 @@ __decltype { if(PARSER.cpp98 &&
11191119

11201120
"typeof" { if(PARSER.cpp98 ||
11211121
PARSER.mode==configt::ansi_ct::flavourt::GCC ||
1122-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
1122+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
11231123
PARSER.mode==configt::ansi_ct::flavourt::CODEWARRIOR ||
11241124
PARSER.mode==configt::ansi_ct::flavourt::ARM)
11251125
{ loc(); return TOK_TYPEOF; }
11261126
else
11271127
return make_identifier();
11281128
}
11291129
"__typeof" { if(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
1130-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
1130+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
11311131
PARSER.mode==configt::ansi_ct::flavourt::ARM)
11321132
{ loc(); return TOK_TYPEOF; }
11331133
else
@@ -1154,7 +1154,7 @@ __decltype { if(PARSER.cpp98 &&
11541154
"__inline__" { loc(); return TOK_INLINE; }
11551155

11561156
"__label__" { if(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
1157-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
1157+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
11581158
PARSER.mode==configt::ansi_ct::flavourt::ARM)
11591159
{ loc(); return TOK_GCC_LABEL; }
11601160
else
@@ -1253,7 +1253,7 @@ __decltype { if(PARSER.cpp98 &&
12531253
}
12541254

12551255
"__thread" { if(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
1256-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
1256+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
12571257
PARSER.mode==configt::ansi_ct::flavourt::ARM)
12581258
{ loc(); return TOK_THREAD_LOCAL; }
12591259
else
@@ -1264,7 +1264,7 @@ __decltype { if(PARSER.cpp98 &&
12641264

12651265
"_Alignas" { if(!PARSER.cpp98 &&
12661266
(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
1267-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
1267+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
12681268
PARSER.mode==configt::ansi_ct::flavourt::ARM))
12691269
{ loc(); return TOK_ALIGNAS; }
12701270
else
@@ -1275,7 +1275,7 @@ __decltype { if(PARSER.cpp98 &&
12751275

12761276
"_Alignof" { if(!PARSER.cpp98 &&
12771277
(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
1278-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
1278+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
12791279
PARSER.mode==configt::ansi_ct::flavourt::ARM ||
12801280
PARSER.mode==configt::ansi_ct::flavourt::VISUAL_STUDIO))
12811281
{ loc(); return TOK_ALIGNOF; }
@@ -1297,7 +1297,7 @@ __decltype { if(PARSER.cpp98 &&
12971297

12981298
if(!PARSER.cpp98 &&
12991299
(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
1300-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
1300+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
13011301
PARSER.mode==configt::ansi_ct::flavourt::ARM))
13021302
{ loc(); return TOK_ATOMIC_TYPE_SPECIFIER; }
13031303
else
@@ -1306,7 +1306,7 @@ __decltype { if(PARSER.cpp98 &&
13061306

13071307
"_Atomic" { if(!PARSER.cpp98 &&
13081308
(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
1309-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
1309+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
13101310
PARSER.mode==configt::ansi_ct::flavourt::ARM))
13111311
{ loc(); return TOK_ATOMIC_TYPE_QUALIFIER; }
13121312
else
@@ -1317,7 +1317,7 @@ __decltype { if(PARSER.cpp98 &&
13171317

13181318
"_Generic" { if(!PARSER.cpp98 &&
13191319
(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
1320-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
1320+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
13211321
PARSER.mode==configt::ansi_ct::flavourt::ARM))
13221322
{ loc(); return TOK_GENERIC; }
13231323
else
@@ -1328,7 +1328,7 @@ __decltype { if(PARSER.cpp98 &&
13281328

13291329
"_Imaginary" { if(!PARSER.cpp98 &&
13301330
(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
1331-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
1331+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
13321332
PARSER.mode==configt::ansi_ct::flavourt::ARM))
13331333
{ loc(); return TOK_IMAGINARY; }
13341334
else
@@ -1339,7 +1339,7 @@ __decltype { if(PARSER.cpp98 &&
13391339

13401340
"_Noreturn" { if(!PARSER.cpp98 &&
13411341
(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
1342-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
1342+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
13431343
PARSER.mode==configt::ansi_ct::flavourt::ARM))
13441344
{ loc(); return TOK_NORETURN; }
13451345
else
@@ -1350,7 +1350,7 @@ __decltype { if(PARSER.cpp98 &&
13501350

13511351
"_Static_assert" { if(!PARSER.cpp98 &&
13521352
(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
1353-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
1353+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
13541354
PARSER.mode==configt::ansi_ct::flavourt::ARM))
13551355
{ loc(); return TOK_STATIC_ASSERT; }
13561356
else
@@ -1361,24 +1361,24 @@ __decltype { if(PARSER.cpp98 &&
13611361

13621362
"_Thread_local" { if(!PARSER.cpp98 &&
13631363
(PARSER.mode==configt::ansi_ct::flavourt::GCC ||
1364-
PARSER.mode==configt::ansi_ct::flavourt::APPLE ||
1364+
PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
13651365
PARSER.mode==configt::ansi_ct::flavourt::ARM))
13661366
{ loc(); return TOK_THREAD_LOCAL; }
13671367
else
13681368
return make_identifier();
13691369
}
13701370

1371-
/* This is an Apple clang extension */
1371+
/* This is a clang extension */
13721372

1373-
"_Nullable" { if(PARSER.mode==configt::ansi_ct::flavourt::APPLE)
1373+
"_Nullable" { if(PARSER.mode==configt::ansi_ct::flavourt::CLANG)
13741374
{ /* ignore */ }
13751375
else
13761376
return make_identifier();
13771377
}
13781378

1379-
/* This is an Apple clang extension */
1379+
/* This is a clang extension */
13801380

1381-
"_Nonnull" { if(PARSER.mode==configt::ansi_ct::flavourt::APPLE)
1381+
"_Nonnull" { if(PARSER.mode==configt::ansi_ct::flavourt::CLANG)
13821382
{ /* ignore */ }
13831383
else
13841384
return make_identifier();

‎src/cpp/cpp_internal_additions.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,10 @@ void cpp_internal_additions(std::ostream &out)
115115
out << "void " INITIALIZE_FUNCTION "();" << '\n';
116116

117117
// GCC junk stuff, also for CLANG and ARM
118-
if(config.ansi_c.mode==configt::ansi_ct::flavourt::GCC ||
119-
config.ansi_c.mode==configt::ansi_ct::flavourt::APPLE ||
120-
config.ansi_c.mode==configt::ansi_ct::flavourt::ARM)
118+
if(
119+
config.ansi_c.mode == configt::ansi_ct::flavourt::GCC ||
120+
config.ansi_c.mode == configt::ansi_ct::flavourt::CLANG ||
121+
config.ansi_c.mode == configt::ansi_ct::flavourt::ARM)
121122
{
122123
out << c2cpp(gcc_builtin_headers_types);
123124

@@ -126,7 +127,7 @@ void cpp_internal_additions(std::ostream &out)
126127
config.ansi_c.arch == "x32")
127128
{
128129
// clang doesn't do __float128
129-
if(config.ansi_c.mode == configt::ansi_ct::flavourt::APPLE)
130+
if(config.ansi_c.mode == configt::ansi_ct::flavourt::CLANG)
130131
out << "typedef double __float128;" << '\n';
131132
}
132133

0 commit comments

Comments
 (0)