fix

Author: danmar

lib/clangimport.cpp

@@ -218,11 +218,11 @@ static std::vector<std::string> splitString(const std::string &line)
 }
 
 static std::string getQualTypeBefore(const std::string& qualType) {
-    return qualType.find("[") != std::string::npos ? qualType.substr(0, qualType.find("[")) : qualType;
+    return qualType.find_first_of("[(") != std::string::npos ? qualType.substr(0, qualType.find_first_of("[(")) : qualType;
 }
 
 static std::string getQualTypeAfter(const std::string& qualType) {
-    return qualType.find("[") != std::string::npos ? qualType.substr(qualType.find("[")) : "";
+    return qualType.find_first_of("[(") != std::string::npos ? qualType.substr(qualType.find_first_of("[(")) : "";
 }
 
 namespace clangimport {

test/cli/clang-import_test.py

@@ -65,47 +65,36 @@ def __check_ast(tmpdir, code):
     assert __get_debug_section('##AST', stdout1) == __get_debug_section('##AST', stdout2)
 
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_symbol_database_1(tmpdir):
     __check_symbol_database(tmpdir, 'int main(){return 0;}')
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_symbol_database_2(tmpdir):
     __check_symbol_database(tmpdir, 'struct Foo { void f(); }; void Foo::f() {}')
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_symbol_database_3(tmpdir):
     __check_symbol_database(tmpdir, 'struct Fred { int a; }; int b; void f(int c, int d) { int e; }')
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_symbol_database_4(tmpdir):
     __check_symbol_database(tmpdir, 'void f(const int x) {}')
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_symbol_database_5(tmpdir):
     __check_symbol_database(tmpdir, 'void f(int);')
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_symbol_database_6(tmpdir):
     __check_symbol_database(tmpdir, 'inline static int foo(int x) { return x; }')
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_symbol_database_7(tmpdir):
     __check_symbol_database(tmpdir, 'struct S {int x;}; void f(struct S *s) {}')
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_symbol_database_class_access_1(tmpdir):
     __check_symbol_database(tmpdir, 'class Fred { void foo ( ) {} } ;')
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_symbol_database_class_access_2(tmpdir):
     __check_symbol_database(tmpdir, 'class Fred { protected: void foo ( ) {} } ;')
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_symbol_database_class_access_3(tmpdir):
     __check_symbol_database(tmpdir, 'class Fred { public: void foo ( ) {} } ;')
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_symbol_database_operator(tmpdir):
     __check_symbol_database(tmpdir, 'struct Fred { void operator=(int x); };')
 
@@ -173,106 +162,88 @@ def __test_cmd(tmp_path, file_name, extra_args, stdout_exp_1, content=''):
     assert stderr == ''
     assert stdout.splitlines() == [
         'Checking {} ...'.format(file_name),
-        'clang -fsyntax-only -Xclang -ast-dump -fno-color-diagnostics {}{}'.format(stdout_exp_1, file_name)
+        'clang -fsyntax-only -Xclang -ast-dump=json -fno-color-diagnostics {}{}'.format(stdout_exp_1, file_name)
     ]
 
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_cmd_c(tmp_path):
     __test_cmd(tmp_path, 'test.c', [], '-x c')
 
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_cmd_cpp(tmp_path):
     __test_cmd(tmp_path, 'test.cpp', [], '-x c++')
 
 
 # files with unknown extensions are treated as C++
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_cmd_unk(tmp_path):
     __test_cmd(tmp_path, 'test.cplusplus', [], '-x c++')
 
 
 # headers are treated as C by default
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_cmd_hdr(tmp_path):
     __test_cmd(tmp_path, 'test.h', [], '-x c')
 
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_cmd_hdr_probe(tmp_path):
     __test_cmd(tmp_path, 'test.h', ['--cpp-header-probe'], '-x c++', '// -*- C++ -*-')
 
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_cmd_inc(tmp_path):
     inc_path = tmp_path / 'inc'
     os.makedirs(inc_path)
     __test_cmd(tmp_path, 'test.cpp',['-Iinc'], '-x c++ -Iinc/')
 
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_cmd_def(tmp_path):
     __test_cmd(tmp_path, 'test.cpp',['-DDEF'], '-x c++ -DDEF=1')
 
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_cmd_include(tmp_path):
     inc_file = tmp_path / 'inc.h'
     with open(inc_file, 'wt'):
         pass
     __test_cmd(tmp_path, 'test.cpp',['--include=inc.h'], '-x c++ --include inc.h')
 
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_cmd_enforce_c(tmp_path):  # #13128
     __test_cmd(tmp_path, 'test.cpp',['-x', 'c'], '-x c')
 
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_cmd_enforce_cpp(tmp_path):  # #13128
     __test_cmd(tmp_path, 'test.c',['-x', 'c++'], '-x c++')
 
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_cmd_std_c(tmp_path):  # #13129
     __test_cmd(tmp_path, 'test.cpp',['--std=c89', '--std=c++14'], '-x c++ -std=c++14')
 
 
 # TODO: remove when we inject the build-dir into all tests
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_cmd_std_c_builddir(tmp_path):  # #13129
     build_dir = tmp_path / 'b1'
     os.makedirs(build_dir)
     __test_cmd(tmp_path, 'test.cpp',['--std=c89', '--std=c++14', '--cppcheck-build-dir={}'.format(build_dir)], '-x c++ -std=c++14')
 
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_cmd_std_cpp(tmp_path):  # #13129
     __test_cmd(tmp_path, 'test.c',['--std=c89', '--std=c++14'], '-x c -std=c89')
 
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_cmd_std_c_enforce(tmp_path):  # #13128/#13129
     __test_cmd(tmp_path, 'test.cpp',['--language=c', '--std=c89', '--std=c++14'], '-x c -std=c89')
 
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_cmd_std_cpp_enforce(tmp_path):  # #13128/#13129
     __test_cmd(tmp_path, 'test.c',['--language=c++', '--std=c89', '--std=c++14'], '-x c++ -std=c++14')
 
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_cmd_std_c_enforce_alias(tmp_path):  # #13128/#13129/#13130
     __test_cmd(tmp_path, 'test.c',['--language=c', '--std=gnu99', '--std=gnu++11'], '-x c -std=gnu99')
 
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_cmd_std_c_enforce_alias_2(tmp_path):  # #13128/#13129/#13130
     __test_cmd(tmp_path, 'test.c',['--language=c', '--std=iso9899:1999', '--std=gnu++11'], '-x c -std=iso9899:1999')
 
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_cmd_std_cpp_enforce_alias(tmp_path):  # #13128/#13129/#13130
     __test_cmd(tmp_path, 'test.c',['--language=c++', '--std=gnu99', '--std=gnu++11'], '-x c++ -std=gnu++11')
 
@@ -300,7 +271,6 @@ def test_debug_clang_output(tmp_path):
     assert stdout.find(str(test_file)) != -1, stdout
 
 
-@pytest.mark.skip() # FIXME: broken when clang json support was added
 def test_debug_clang_output_failure_exitcode(tmp_path):
     # the given code will cause clang to fail with an exitcode
     #
@@ -332,6 +302,6 @@ def test_debug_clang_output_failure_exitcode(tmp_path):
     stderr_lines = stderr.splitlines()
     assert len(stderr_lines) > 5, stderr_lines
     assert (stderr_lines[0] ==
-            "Failed to execute 'clang -fsyntax-only -Xclang -ast-dump -fno-color-diagnostics -x c {} 2>&1' - (exitcode: 1 / output: {}:3:12: error: indirection requires pointer operand ('int' invalid)".format(test_file, test_file))
+            "Failed to execute 'clang -fsyntax-only -Xclang -ast-dump=json -fno-color-diagnostics -x c {} 2>&1' - (exitcode: 1 / output: {}:3:12: error: indirection requires pointer operand ('int' invalid)".format(test_file, test_file))
     assert stdout.find('TranslationUnitDecl') != -1, stdout
     assert stdout.find(str(test_file)) != -1, stdout