Merge pull request #320 from bkryza/add-objective-c-support-2

Add objective c support 2

Author: bkryza

.github/workflows/build.yml

@@ -26,37 +26,33 @@ on:
 
 jobs:
   build-ubuntu:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
     - name: Update package database
       run: sudo apt -y update
     - name: ccache
       uses: hendrikmuhs/[email protected]
+      with:
+        max-size: "2000M"
     - name: Install deps
-      run: sudo apt -y install git make pkg-config gcc-11 g++-11 ccache cmake libyaml-cpp-dev llvm-15 clang-15 libclang-15-dev libclang-cpp15-dev clang-format-15 lcov zlib1g-dev libunwind-dev libdw-dev
-    - name: Select g++ version
-      run: |
-        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 11
-        sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 11
+      run: sudo apt -y install git make grcov ninja-build pkg-config gcc g++ ccache cmake libyaml-cpp-dev llvm-18 clang-18 libclang-18-dev libclang-cpp18-dev clang-format-18 lcov zlib1g-dev libunwind-dev libdw-dev gnustep-back-common libgnustep-base-dev gnustep-make
     - name: Check code formatting
       run: |
         make check-formatting
     - name: Build and unit test
       run: |
-        NUMPROC=2 CODE_COVERAGE=ON LLVM_VERSION=15 make test
+        CC=/usr/bin/clang-18 CXX=/usr/bin/clang++-18 LLVM_VERSION=18 NUMPROC=2 CMAKE_GENERATOR=Ninja CODE_COVERAGE=ON LLVM_VERSION=18 ENABLE_CXX_MODULES_TEST_CASES=ON ENABLE_CUDA_TEST_CASES=OFF ENABLE_OBJECTIVE_C_TEST_CASES=ON FETCH_LIBOBJC2=ON CLANG_UML_ENABLE_BACKTRACE=ON make test
     - name: Run coverage
       run: |
-        lcov -c -d debug -o coverage.info
-        lcov -r coverage.info -o coverage-src.info "$PWD/src/main.cc" "$PWD/src/common/generators/generators.cc"
-        lcov -e coverage-src.info -o coverage-src.info "$PWD/src/*"
-        lcov -l coverage-src.info
+        grcov --llvm --binary-path debug --output-path coverage.info -t lcov --keep-only 'src/*' --source-dir . --ignore src/main.cc --ignore src/common/generators/generators.cc  .
+        lcov --ignore-errors inconsistent -l coverage.info
     - name: Upload coverage
       uses: codecov/codecov-action@v3
       with:
-        files: coverage-src.info
+        files: coverage.info
         disable_search: true
         name: clang-uml
         token: ${{ secrets.CODECOV_TOKEN }}
-        fail_ci_if_error: false
+        fail_ci_if_error: false

.github/workflows/macos.yml

@@ -40,7 +40,7 @@ jobs:
         run: brew install llvm@18 ninja yaml-cpp cmake ccache
 
       - name: Build and test
-        run: CC=/opt/homebrew/opt/llvm/bin/clang CXX=/opt/homebrew/opt/llvm/bin/clang++ CMAKE_PREFIX=/opt/homebrew/opt/llvm/lib/cmake/llvm/ CMAKE_GENERATOR=Ninja CMAKE_EXE_LINKER_FLAGS="-L/opt/homebrew/opt/llvm/lib/c++ -Wl,-rpath,/opt/homebrew/opt/llvm/lib/c++" make test
+        run: CC=/opt/homebrew/opt/llvm/bin/clang CXX=/opt/homebrew/opt/llvm/bin/clang++ CMAKE_PREFIX=/opt/homebrew/opt/llvm/lib/cmake/llvm/ CMAKE_GENERATOR=Ninja CMAKE_EXE_LINKER_FLAGS="-L/opt/homebrew/opt/llvm/lib/c++ -Wl,-rpath,/opt/homebrew/opt/llvm/lib/c++" ENABLE_OBJECTIVE_C_TEST_CASES=ON make test
 
       - name: Print build version
         run: debug/src/clang-uml --version

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+ * Added support for Objective C (#296)
+ * Added option to fold repeated activities in sequence diagrams (#317)
+ * Fixed default arguments braces in mermaid diagrams (#312)
+
 ### 0.5.4
  * Updated thirdparty dependencies (#306)
  * Added regular expression support to remove_compile_flags (#303)

CMakeLists.txt

@@ -66,8 +66,9 @@ message(STATUS "clang-uml version: "
 #
 option(CODE_COVERAGE "" OFF)
 if(CODE_COVERAGE)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage -fno-inline")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgcov --coverage")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g --coverage -fno-inline")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g --coverage -fno-inline")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgcov")
 endif(CODE_COVERAGE)
 
 #
@@ -195,6 +196,8 @@ add_subdirectory(src)
 option(BUILD_TESTS "" ON)
 option(ENABLE_CXX_MODULES_TEST_CASES "" OFF)
 option(ENABLE_CUDA_TEST_CASES "" OFF)
+option(ENABLE_OBJECTIVE_C_TEST_CASES "" OFF)
+option(FETCH_LIBOBJC2 "" OFF)
 
 #
 # Setup CUDA if available
@@ -207,6 +210,13 @@ if(ENABLE_CUDA_TEST_CASES)
     enable_language(CUDA)
 endif(ENABLE_CUDA_TEST_CASES)
 
+if(ENABLE_OBJECTIVE_C_TEST_CASES)
+    enable_language(OBJC)
+    if(UNIX AND NOT APPLE)
+      find_package(GNUstep REQUIRED)
+    endif()
+endif(ENABLE_OBJECTIVE_C_TEST_CASES)
+
 if(BUILD_TESTS)
     enable_testing()
     add_subdirectory(tests)

Makefile

@@ -42,6 +42,8 @@ ADDRESS_SANITIZER ?= OFF
 
 ENABLE_CXX_MODULES_TEST_CASES ?= OFF
 ENABLE_CUDA_TEST_CASES ?= OFF
+ENABLE_OBJECTIVE_C_TEST_CASES ?= OFF
+FETCH_LIBOBJC2 ?= OFF
 
 GIT_VERSION	?= $(shell git describe --tags --always --abbrev=7)
 PKG_VERSION	?= $(shell git describe --tags --always --abbrev=7 | tr - .)
@@ -59,6 +61,7 @@ debug/CMakeLists.txt:
 	cmake -S . -B debug \
 		-G"$(CMAKE_GENERATOR)" \
 		-DGIT_VERSION=$(GIT_VERSION) \
+		-DCMAKE_C_COMPILER_LAUNCHER=ccache \
 		-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
 		-DCMAKE_BUILD_TYPE=Debug \
 		-DCMAKE_CXX_FLAGS="$(CMAKE_CXX_FLAGS)" \
@@ -69,6 +72,8 @@ debug/CMakeLists.txt:
 		-DCMAKE_PREFIX=${CMAKE_PREFIX} \
 		-DENABLE_CUDA_TEST_CASES=$(ENABLE_CUDA_TEST_CASES) \
 		-DENABLE_CXX_MODULES_TEST_CASES=$(ENABLE_CXX_MODULES_TEST_CASES) \
+		-DENABLE_OBJECTIVE_C_TEST_CASES=$(ENABLE_OBJECTIVE_C_TEST_CASES) \
+		-DFETCH_LIBOBJC2=$(FETCH_LIBOBJC2) \
 		-DCODE_COVERAGE=$(CODE_COVERAGE) \
 		-DADDRESS_SANITIZER=$(ADDRESS_SANITIZER) \
 		-DCLANG_UML_ENABLE_BACKTRACE=$(CLANG_UML_ENABLE_BACKTRACE)
@@ -78,6 +83,7 @@ release/CMakeLists.txt:
 	cmake -S . -B release \
 		-G"$(CMAKE_GENERATOR)" \
 		-DGIT_VERSION=$(GIT_VERSION) \
+		-DCMAKE_C_COMPILER_LAUNCHER=ccache \
 		-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_CXX_FLAGS="$(CMAKE_CXX_FLAGS)" \
@@ -89,12 +95,15 @@ release/CMakeLists.txt:
 		-DADDRESS_SANITIZER=$(ADDRESS_SANITIZER) \
 		-DENABLE_CUDA_TEST_CASES=$(ENABLE_CUDA_TEST_CASES) \
 		-DENABLE_CXX_MODULES_TEST_CASES=$(ENABLE_CXX_MODULES_TEST_CASES) \
+		-DENABLE_OBJECTIVE_C_TEST_CASES=$(ENABLE_OBJECTIVE_C_TEST_CASES) \
+		-DFETCH_LIBOBJC2=$(FETCH_LIBOBJC2) \
 		-DCLANG_UML_ENABLE_BACKTRACE=$(CLANG_UML_ENABLE_BACKTRACE)
 
 debug_tidy/CMakeLists.txt:
 	cmake -S . -B debug_tidy \
 		-G"$(CMAKE_GENERATOR)" \
 		-DGIT_VERSION=$(GIT_VERSION) \
+		-DCMAKE_C_COMPILER_LAUNCHER=ccache \
 		-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
 		-DCMAKE_BUILD_TYPE=Debug \
 		-DBUILD_TESTS=OFF \
@@ -105,7 +114,9 @@ debug_tidy/CMakeLists.txt:
 		-DLINK_LLVM_SHARED=${LLVM_SHARED} \
 		-DCMAKE_PREFIX=${CMAKE_PREFIX} \
 		-DENABLE_CUDA_TEST_CASES=$(ENABLE_CUDA_TEST_CASES) \
-		-DENABLE_CXX_MODULES_TEST_CASES=$(ENABLE_CXX_MODULES_TEST_CASES)
+		-DENABLE_CXX_MODULES_TEST_CASES=$(ENABLE_CXX_MODULES_TEST_CASES) \
+		-DENABLE_OBJECTIVE_C_TEST_CASES=$(ENABLE_OBJECTIVE_C_TEST_CASES) \
+		-DFETCH_LIBOBJC2=$(FETCH_LIBOBJC2)
 
 debug: debug/CMakeLists.txt
 	echo "Using ${NUMPROC} cores"
@@ -125,7 +136,7 @@ test_release: release
 	CTEST_OUTPUT_ON_FAILURE=1 ctest --test-dir release
 
 coverage_report: test
-	lcov -c -d debug -o coverage.info
+	lcov -c -d debug -o coverage.info --no-external --gcov-tool util/clang_gcov.sh
 	lcov -r coverage.info -o coverage-src.info "${PWD}/src/main.cc" "${PWD}/src/common/generators/generators.cc"
 	lcov -e coverage-src.info -o coverage-src.info "${PWD}/src/*"
 	lcov -l coverage-src.info
@@ -171,11 +182,11 @@ init_compile_commands: debug
 
 .PHONY: clang-format
 clang-format:
-	docker run --rm -v $(CURDIR):/root/sources bkryza/clang-format-check:1.4
+	docker run --rm -v $(CURDIR):/root/sources bkryza/clang-format-check:1.5
 
 .PHONY: format
 format:
-	docker run --rm -v $(CURDIR):/root/sources bkryza/clang-format-check:1.4
+	docker run --rm -v $(CURDIR):/root/sources bkryza/clang-format-check:1.5
 
 .PHONY: debug_tidy
 tidy: debug_tidy

README.md

@@ -17,7 +17,8 @@ types and contents of each generated diagram.
 The diagrams can be generated in [PlantUML](https://plantuml.com),
 [MermaidJS](https://mermaid.js.org/) and JSON formats.
 
-`clang-uml` currently supports C++ up to version 17 with partial support for C++ 20.
+`clang-uml` currently supports C++ up to version 17 with partial support for C++ 20,
+as well as C and Objective-C.
 
 Full documentation can be found at [clang-uml.github.io](https://clang-uml.github.io).
 
@@ -45,6 +46,7 @@ Main features supported so far include:
     * C++20 concept constraints - [_example_](docs/test_cases/t00059.md)
     * C++20 coroutines - [_example_](docs/test_cases/t00069.md)
     * Diagram content filtering based on C++20 modules - [_example_](docs/test_cases/t00070.md)
+    * Objective-C class diagrams - [_example_](docs/test_cases/t00084.md)
 * **Sequence diagram generation**
     * Generation of sequence diagram from specific method or function - [_example_](docs/test_cases/t20001.md)
     * Generation of loop and conditional statements - [_example_](docs/test_cases/t20021.md)
@@ -54,12 +56,14 @@ Main features supported so far include:
     * Handling of lambda expressions - [_example_](docs/test_cases/t20012.md)
     * Interactive links to online code to classes and call expressions - [_example_](https://raw.githubusercontent.com/bkryza/clang-uml/master/docs/test_cases/t20021_sequence.svg)
     * Support for CUDA Kernel and CUDA Device function calls - [_example_](docs/test_cases/t20050.md)
+    * Objective-C sequence diagrams - [_example_](docs/test_cases/t20058.md)
 * **Package diagram generation**
     * Generation of package diagram based on C++ namespaces - [_example_](docs/test_cases/t30001.md)
     * Generation of package diagram based on subdirectories - [_example_](docs/test_cases/t30010.md)
     * Generation of package diagram based on C++20 modules - [_example_](docs/test_cases/t30014.md)
     * Dependencies between packages based on symbols used in the code - [_example_](docs/test_cases/t30002.md)
     * Interactive links to online code to packages - [_example_](https://raw.githubusercontent.com/bkryza/clang-uml/master/docs/test_cases/t30002_package.svg)
+    * Objective-C package diagrams based on subdirectories - [_example_](docs/test_cases/t30016.md)
 * **Include graph diagram generation**
     * Show include graph for selected files - [_example_](docs/test_cases/t40001.md)
 
@@ -88,6 +92,7 @@ Nowadays, this file can be generated rather easily using multiple methods:
 * For SCons, invoke `compilation_db` tool (requires SCons > 4.0.0)
 * For Bazel, try [bazel-compile-commands-extractor](https://github.com/hedronvision/bazel-compile-commands-extractor)
 * For Microsoft Visual Studio projects try [Clang Power Tools](https://www.clangpowertools.com)
+* For Objective-C based XCode projects see [xcpretty](https://github.com/xcpretty/xcpretty)
 
 ### Invocation