Tokenizer: Added function for checking if code is Java/C#

Daniel Marjamäki · Daniel Marjamäki · commit 9435fde551c9 · 2010-10-28T18:51:55.000+02:00
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -1984,8 +1984,7 @@ void CheckClass::checkConst()
         return;
 
     // Don't check C# and JAVA classes
-    if (_tokenizer->getFiles()->at(0).find(".java") != std::string::npos ||
-        _tokenizer->getFiles()->at(0).find(".cs") != std::string::npos)
+    if (_tokenizer->isJavaOrCSharp())
     {
         return;
     }
diff --git a/lib/checkobsoletefunctions.cpp b/lib/checkobsoletefunctions.cpp
@@ -37,8 +37,7 @@ void CheckObsoleteFunctions::obsoleteFunctions()
         return;
 
     // Don't check C# and Java code
-    if (_tokenizer->getFiles()->at(0).find(".java") != std::string::npos ||
-        _tokenizer->getFiles()->at(0).find(".cs") != std::string::npos)
+    if (_tokenizer->isJavaOrCSharp())
         return;
 
     for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next())
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -2212,8 +2212,7 @@ void CheckOther::checkIncompleteStatement()
 void CheckOther::strPlusChar()
 {
     // Don't use this check for Java and C# programs..
-    if (_tokenizer->getFiles()->at(0).find(".java") != std::string::npos ||
-        _tokenizer->getFiles()->at(0).find(".cs") != std::string::npos)
+    if (_tokenizer->isJavaOrCSharp())
     {
         return;
     }
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -1744,8 +1744,8 @@ bool Tokenizer::tokenize(std::istream &code,
         }
     }
 
-    // Simplify JAVA code
-    if (_files[0].find(".java") != std::string::npos)
+    // Simplify JAVA/C# code
+    if (isJavaOrCSharp() && _files[0].find(".java") != std::string::npos)
     {
         for (Token *tok = _tokens; tok; tok = tok->next())
         {
@@ -6649,7 +6649,7 @@ bool Tokenizer::duplicateDefinition(Token ** tokPtr, const Token * name)
 void Tokenizer::simplifyEnum()
 {
     // Don't simplify enums in java files
-    if (_files[0].find(".java") != std::string::npos)
+    if (isJavaOrCSharp())
         return;
 
     std::string className;
diff --git a/lib/tokenize.h b/lib/tokenize.h
@@ -45,6 +45,18 @@ class Tokenizer
     Tokenizer(const Settings * settings, ErrorLogger *errorLogger);
     virtual ~Tokenizer();
 
+    /** Is the code JAVA/C#. Used for bailouts */
+    bool isJavaOrCSharp() const
+    {
+        if (_files.size() != 1)
+            return false;
+        const std::string::size_type pos = _files[0].rfind(".");
+        if (pos != std::string::npos)
+            return (_files[0].substr(pos) == ".java" ||
+                    _files[0].substr(pos) == ".cs");
+        return false;
+    }
+
     /**
      * Tokenize code
      * @param code input stream for code, e.g.

Original file line number	Diff line number	Diff line change
`@@ -1984,8 +1984,7 @@ void CheckClass::checkConst()`
`1984`	`1984`	`return;`
`1985`	`1985`
`1986`	`1986`	`// Don't check C# and JAVA classes`
`1987`		`- if (_tokenizer->getFiles()->at(0).find(".java") != std::string::npos \|\|`
`1988`		`- _tokenizer->getFiles()->at(0).find(".cs") != std::string::npos)`
	`1987`	`+ if (_tokenizer->isJavaOrCSharp())`
`1989`	`1988`	`{`
`1990`	`1989`	`return;`
`1991`	`1990`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2212,8 +2212,7 @@ void CheckOther::checkIncompleteStatement()`
`2212`	`2212`	`void CheckOther::strPlusChar()`
`2213`	`2213`	`{`
`2214`	`2214`	`// Don't use this check for Java and C# programs..`
`2215`		`- if (_tokenizer->getFiles()->at(0).find(".java") != std::string::npos \|\|`
`2216`		`- _tokenizer->getFiles()->at(0).find(".cs") != std::string::npos)`
	`2215`	`+ if (_tokenizer->isJavaOrCSharp())`
`2217`	`2216`	`{`
`2218`	`2217`	`return;`
`2219`	`2218`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1744,8 +1744,8 @@ bool Tokenizer::tokenize(std::istream &code,`
`1744`	`1744`	`}`
`1745`	`1745`	`}`
`1746`	`1746`
`1747`		`- // Simplify JAVA code`
`1748`		`- if (_files[0].find(".java") != std::string::npos)`
	`1747`	`+ // Simplify JAVA/C# code`
	`1748`	`+ if (isJavaOrCSharp() && _files[0].find(".java") != std::string::npos)`
`1749`	`1749`	`{`
`1750`	`1750`	`for (Token *tok = _tokens; tok; tok = tok->next())`
`1751`	`1751`	`{`
`@@ -6649,7 +6649,7 @@ bool Tokenizer::duplicateDefinition(Token ** tokPtr, const Token * name)`
`6649`	`6649`	`void Tokenizer::simplifyEnum()`
`6650`	`6650`	`{`
`6651`	`6651`	`// Don't simplify enums in java files`
`6652`		`- if (_files[0].find(".java") != std::string::npos)`
	`6652`	`+ if (isJavaOrCSharp())`
`6653`	`6653`	`return;`
`6654`	`6654`
`6655`	`6655`	`std::string className;`