misc.py: removed bailouts

danmar · danmar · commit 86a9deffbf08 · 2018-04-20T08:18:49.000+02:00
diff --git a/addons/misc.py b/addons/misc.py
@@ -63,14 +63,6 @@ def stringConcatInArrayInit(rawTokens):
         elif tok1 == ']' and tok2 == '=' and tok3 == '{':
             arrayInit = True
         elif arrayInit and (tok1 in [',', '{']) and isStringLiteral(tok2) and isStringLiteral(tok3):
-            if tok1 == '{':
-                i2 = i + 1
-                while i2 < len(rawTokens) and rawTokens[i2].str not in [',', '}']:
-                    i2 = i2 + 1
-                if i2 >= len(rawTokens) or rawTokens[i2].str != ',':
-                    continue
-            if i + 2 < len(rawTokens) and isStringLiteral(rawTokens[i+1].str) and isStringLiteral(rawTokens[i+2].str):
-                continue
             reportError(rawTokens[i], 'style', 'String concatenation in array initialization, missing comma?', 'stringConcatInArrayInit')
 
 def implicitlyVirtual(data):
diff --git a/addons/test/misc-test.cpp b/addons/test/misc-test.cpp
@@ -3,21 +3,8 @@
 
 
 // Warn about string concatenation in array initializers..
-const char *a[] = {"a" "b"};
+const char *a[] = {"a" "b"}; // stringConcatInArrayInit
 const char *b[] = {"a","b" "c"}; // stringConcatInArrayInit
-const char *c[] = {
-	"a\n"
-	"a\n"
-	"a\n"
-	"a\n"
-	"a\n"
-	,
-	"b\n"
-	"b\n"
-	"b\n"
-	"b\n"
-	"b\n"
-};
 
 
 // Function is implicitly virtual
