std.cfg: Added *experimental* support for math constants liken M_PI. These are *NOT* standard, but they are supported by GCC/Clang and VS.

orbitcowboy · orbitcowboy · commit a9bdf99e0705 · 2019-07-31T11:11:01.000+02:00
diff --git a/cfg/std.cfg b/cfg/std.cfg
@@ -36,6 +36,19 @@
   <define name="UINT_LEAST16_MAX" value="65535"/>
   <define name="UINT_LEAST32_MAX" value="4294967295"/>
   <define name="UINT_LEAST64_MAX" value="18446744073709551615"/>
+  <define name="M_E" value="2.7182818284590452354"/>
+  <define name="M_LOG2E" value="1.4426950408889634074"/>
+  <define name="M_LOG10E" value="0.43429448190325182765"/>
+  <define name="M_LN2" value="0.69314718055994530942"/>
+  <define name="M_LN10" value="2.30258509299404568402"/>
+  <define name="M_PI" value="3.14159265358979323846"/>
+  <define name="M_PI_2" value="1.57079632679489661923"/>
+  <define name="M_PI_4" value="0.78539816339744830962"/>
+  <define name="M_1_PI" value="0.31830988618379067154"/>
+  <define name="M_2_PI" value="0.63661977236758134308"/>
+  <define name="M_2_SQRTPI" value="1.12837916709551257390"/>
+  <define name="M_SQRT2" value="1.41421356237309504880"/>
+  <define name="M_SQRT1_2" value="0.70710678118654752440"/>
   <!-- errno_t is a typedef for int -->
   <define name="errno_t" value="int"/>
   <!-- void abort(void); -->
diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
@@ -3381,9 +3381,9 @@ void TemplateSimplifier::simplifyTemplates(
     unsigned int passCount = 0;
     const unsigned int passCountMax = 10;
     for (; passCount < passCountMax; ++passCount) {
-		for (auto tok = mTokenizer->list.front(); tok; tok = tok->next()) tok->scopeInfo(nullptr);
-		mTokenizer->calculateScopes();
-        
+        for (auto tok = mTokenizer->list.front(); tok; tok = tok->next()) tok->scopeInfo(nullptr);
+        mTokenizer->calculateScopes();
+
         if (passCount) {
             // it may take more than one pass to simplify type aliases
             bool usingChanged = false;
diff --git a/lib/token.cpp b/lib/token.cpp
@@ -1075,8 +1075,7 @@ void Token::insertToken(const std::string &tokenStr, const std::string &original
             } else {
                 if (prepend && newToken->previous()) {
                     newToken->mImpl->mScopeInfo = newToken->previous()->scopeInfo();
-                }
-                else {
+                } else {
                     newToken->mImpl->mScopeInfo = mImpl->mScopeInfo;
                 }
                 if (tokenStr == ";") {
@@ -1975,10 +1974,12 @@ std::string Token::typeStr(const Token* tok)
     return r.first->stringifyList(r.second, false);
 }
 
-void Token::scopeInfo(std::shared_ptr<ScopeInfo2> newScopeInfo) {
+void Token::scopeInfo(std::shared_ptr<ScopeInfo2> newScopeInfo)
+{
     mImpl->mScopeInfo = newScopeInfo;
 }
-std::shared_ptr<ScopeInfo2> Token::scopeInfo() const {
+std::shared_ptr<ScopeInfo2> Token::scopeInfo() const
+{
     return mImpl->mScopeInfo;
 }
 
diff --git a/lib/token.h b/lib/token.h
@@ -108,7 +108,7 @@ struct TokenImpl {
 
     // Pointer to the object representing this token's scope
     std::shared_ptr<ScopeInfo2> mScopeInfo;
-    
+
     // __cppcheck_in_range__
     struct CppcheckAttributes {
         enum Type {LOW,HIGH} type;
@@ -1200,7 +1200,7 @@ class CPPCHECKLIB Token {
     void printAst(bool verbose, bool xml, std::ostream &out) const;
 
     void printValueFlow(bool xml, std::ostream &out) const;
-    
+
     void scopeInfo(std::shared_ptr<ScopeInfo2> newScopeInfo);
     std::shared_ptr<ScopeInfo2> scopeInfo() const;
 };
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -2880,8 +2880,7 @@ void Tokenizer::calculateScopes()
                 if (nextScopeNameAddition.length() > 0) nextScopeNameAddition = nextScopeNameAddition.substr(0, nextScopeNameAddition.length() - 1);
             }
 
-            if (Token::simpleMatch(tok, "{"))
-            {
+            if (Token::simpleMatch(tok, "{")) {
                 // This might be the opening of a member function
                 Token *tok1 = tok;
                 while (Token::Match(tok1->previous(), "const|volatile|final|override|&|&&|noexcept"))

Original file line number	Diff line number	Diff line change
`@@ -1075,8 +1075,7 @@ void Token::insertToken(const std::string &tokenStr, const std::string &original`
`1075`	`1075`	`} else {`
`1076`	`1076`	`if (prepend && newToken->previous()) {`
`1077`	`1077`	`newToken->mImpl->mScopeInfo = newToken->previous()->scopeInfo();`
`1078`		`- }`
`1079`		`- else {`
	`1078`	`+ } else {`
`1080`	`1079`	`newToken->mImpl->mScopeInfo = mImpl->mScopeInfo;`
`1081`	`1080`	`}`
`1082`	`1081`	`if (tokenStr == ";") {`
`@@ -1975,10 +1974,12 @@ std::string Token::typeStr(const Token* tok)`
`1975`	`1974`	`return r.first->stringifyList(r.second, false);`
`1976`	`1975`	`}`
`1977`	`1976`
`1978`		`-void Token::scopeInfo(std::shared_ptr<ScopeInfo2> newScopeInfo) {`
	`1977`	`+void Token::scopeInfo(std::shared_ptr<ScopeInfo2> newScopeInfo)`
	`1978`	`+{`
`1979`	`1979`	`mImpl->mScopeInfo = newScopeInfo;`
`1980`	`1980`	`}`
`1981`		`-std::shared_ptr<ScopeInfo2> Token::scopeInfo() const {`
	`1981`	`+std::shared_ptr<ScopeInfo2> Token::scopeInfo() const`
	`1982`	`+{`
`1982`	`1983`	`return mImpl->mScopeInfo;`
`1983`	`1984`	`}`
`1984`	`1985`
Original file line number	Diff line number	Diff line change
`@@ -2880,8 +2880,7 @@ void Tokenizer::calculateScopes()`
`2880`	`2880`	`if (nextScopeNameAddition.length() > 0) nextScopeNameAddition = nextScopeNameAddition.substr(0, nextScopeNameAddition.length() - 1);`
`2881`	`2881`	`}`
`2882`	`2882`
`2883`		`- if (Token::simpleMatch(tok, "{"))`
`2884`		`- {`
	`2883`	`+ if (Token::simpleMatch(tok, "{")) {`
`2885`	`2884`	`// This might be the opening of a member function`
`2886`	`2885`	`Token *tok1 = tok;`
`2887`	`2886`	`while (Token::Match(tok1->previous(), "const\|volatile\|final\|override\|&\|&&\|noexcept"))`