Skip to content

Commit da6b55e

Browse files
danmardanmar
authored
Fixed #12862 (std.cfg: std::is.. functions returns bool) (#6539)
1 parent e249517 commit da6b55e

2 files changed

Lines changed: 95 additions & 13 deletions

File tree

‎cfg/std.cfg‎

Lines changed: 62 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3318,11 +3318,7 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
33183318
</arg>
33193319
</function>
33203320
<!-- int isfinite(double x); -->
3321-
<!-- bool isfinite(float x); // since C++11 -->
3322-
<!-- bool isfinite(double x); // since C++11 -->
3323-
<!-- bool isfinite(long double x); // since C++11 -->
3324-
<!-- bool isfinite(Integral x); // since C++11 -->
3325-
<function name="isfinite,std::isfinite">
3321+
<function name="isfinite">
33263322
<use-retval/>
33273323
<pure/>
33283324
<returnValue type="int"/>
@@ -3333,8 +3329,23 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
33333329
<not-bool/>
33343330
</arg>
33353331
</function>
3332+
<!-- bool std::isfinite(float x); // since C++11 -->
3333+
<!-- bool std::isfinite(double x); // since C++11 -->
3334+
<!-- bool std::isfinite(long double x); // since C++11 -->
3335+
<!-- bool std::isfinite(Integral x); // since C++11 -->
3336+
<function name="std::isfinite">
3337+
<use-retval/>
3338+
<pure/>
3339+
<returnValue type="bool"/>
3340+
<noreturn>false</noreturn>
3341+
<leak-ignore/>
3342+
<arg nr="1" direction="in">
3343+
<not-uninit/>
3344+
<not-bool/>
3345+
</arg>
3346+
</function>
33363347
<!-- int isgreater(double x, double y); -->
3337-
<function name="isgreater,std::isgreater">
3348+
<function name="isgreater">
33383349
<use-retval/>
33393350
<pure/>
33403351
<returnValue type="int">arg1&gt;arg2?1:0</returnValue>
@@ -3347,8 +3358,22 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
33473358
<not-uninit/>
33483359
</arg>
33493360
</function>
3361+
<!-- bool std::isgreater(double x, double y); -->
3362+
<function name="std::isgreater">
3363+
<use-retval/>
3364+
<pure/>
3365+
<returnValue type="bool">arg1&gt;arg2?1:0</returnValue>
3366+
<noreturn>false</noreturn>
3367+
<leak-ignore/>
3368+
<arg nr="1" direction="in">
3369+
<not-uninit/>
3370+
</arg>
3371+
<arg nr="2" direction="in">
3372+
<not-uninit/>
3373+
</arg>
3374+
</function>
33503375
<!-- int isgreaterequal(double x, double y); -->
3351-
<function name="isgreaterequal,std::isgreaterequal">
3376+
<function name="isgreaterequal">
33523377
<use-retval/>
33533378
<pure/>
33543379
<returnValue type="int">arg1 &gt;= arg2?1:0</returnValue>
@@ -3361,12 +3386,22 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
33613386
<not-uninit/>
33623387
</arg>
33633388
</function>
3389+
<!-- bool std::isgreaterequal(double x, double y); -->
3390+
<function name="std::isgreaterequal">
3391+
<use-retval/>
3392+
<pure/>
3393+
<returnValue type="bool">arg1 &gt;= arg2?1:0</returnValue>
3394+
<noreturn>false</noreturn>
3395+
<leak-ignore/>
3396+
<arg nr="1" direction="in">
3397+
<not-uninit/>
3398+
</arg>
3399+
<arg nr="2" direction="in">
3400+
<not-uninit/>
3401+
</arg>
3402+
</function>
33643403
<!-- int isinf(double x); -->
3365-
<!-- bool isinf(float x); // since C++11 -->
3366-
<!-- bool isinf(double x); // since C++11 -->
3367-
<!-- bool isinf(long double x); // since C++11 -->
3368-
<!-- bool isinf(Integral x); // since C++11 -->
3369-
<function name="isinf,std::isinf">
3404+
<function name="isinf">
33703405
<use-retval/>
33713406
<pure/>
33723407
<returnValue type="int"/>
@@ -3377,6 +3412,21 @@ The obsolete function 'gets' is called. With 'gets' you'll get a buffer overrun
33773412
<not-bool/>
33783413
</arg>
33793414
</function>
3415+
<!-- bool std::isinf(float x); // since C++11 -->
3416+
<!-- bool std::isinf(double x); // since C++11 -->
3417+
<!-- bool std::isinf(long double x); // since C++11 -->
3418+
<!-- bool std::isinf(Integral x); // since C++11 -->
3419+
<function name="std::isinf">
3420+
<use-retval/>
3421+
<pure/>
3422+
<returnValue type="bool"/>
3423+
<noreturn>false</noreturn>
3424+
<leak-ignore/>
3425+
<arg nr="1" direction="in">
3426+
<not-uninit/>
3427+
<not-bool/>
3428+
</arg>
3429+
</function>
33803430
<!-- double logb(double x); -->
33813431
<function name="logb,std::logb">
33823432
<use-retval/>

‎test/cfg/std.cpp‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2685,6 +2685,14 @@ void uninitvar_fpclassify(void)
26852685
(void)std::fpclassify(ld);
26862686
}
26872687

2688+
void bool_isfinite(float f)
2689+
{
2690+
// cppcheck-suppress compareBoolExpressionWithInt
2691+
// cppcheck-suppress compareValueOutOfTypeRangeError
2692+
// cppcheck-suppress knownConditionTrueFalse
2693+
if (std::isfinite(f)==123) {}
2694+
}
2695+
26882696
void uninitvar_isfinite(void)
26892697
{
26902698
float f;
@@ -2700,6 +2708,14 @@ void uninitvar_isfinite(void)
27002708
(void)std::isfinite(ld);
27012709
}
27022710

2711+
void bool_isgreater(float f1, float f2)
2712+
{
2713+
// cppcheck-suppress compareBoolExpressionWithInt
2714+
// cppcheck-suppress compareValueOutOfTypeRangeError
2715+
// cppcheck-suppress knownConditionTrueFalse
2716+
if (std::isgreater(f1,f2)==123) {}
2717+
}
2718+
27032719
void uninitvar_isgreater(void)
27042720
{
27052721
float f1,f2;
@@ -2715,6 +2731,14 @@ void uninitvar_isgreater(void)
27152731
(void)std::isgreater(ld1,ld2);
27162732
}
27172733

2734+
void bool_isgreaterequal(float f1, float f2)
2735+
{
2736+
// cppcheck-suppress compareBoolExpressionWithInt
2737+
// cppcheck-suppress compareValueOutOfTypeRangeError
2738+
// cppcheck-suppress knownConditionTrueFalse
2739+
if (std::isgreaterequal(f1, f2)==123) {}
2740+
}
2741+
27182742
void uninitvar_isgreaterequal(void)
27192743
{
27202744
float f1,f2;
@@ -2730,6 +2754,14 @@ void uninitvar_isgreaterequal(void)
27302754
(void)std::isgreaterequal(ld1,ld2);
27312755
}
27322756

2757+
void bool_isinf(float f)
2758+
{
2759+
// cppcheck-suppress compareBoolExpressionWithInt
2760+
// cppcheck-suppress compareValueOutOfTypeRangeError
2761+
// cppcheck-suppress knownConditionTrueFalse
2762+
if (std::isinf(f)==123) {}
2763+
}
2764+
27332765
void uninitvar_isinf(void)
27342766
{
27352767
double d;
@@ -5085,4 +5117,4 @@ void constParameterReference_assign(std::vector<int>& v, int& r) {
50855117
void constParameterReference_insert(std::list<int>& l, int& r) {
50865118
l.insert(l.end(), r);
50875119
l.insert(l.end(), 5, r);
5088-
}
5120+
}

0 commit comments

Comments
 (0)