From 7ef684c2cf059756a3de21c12a49719fb30e0b79 Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Mon, 1 Jan 2024 21:44:37 +0100 Subject: [PATCH] Updated test cases documentation --- docs/test_cases.md | 3 + docs/test_cases/t00002.md | 11 +- docs/test_cases/t00002_class.svg | 318 +++---- docs/test_cases/t00002_class_mermaid.svg | 120 ++- docs/test_cases/t00003.md | 3 +- docs/test_cases/t00003_class.svg | 454 +++++----- docs/test_cases/t00003_class_mermaid.svg | 141 ++- docs/test_cases/t00004.md | 33 +- docs/test_cases/t00004_class.svg | 498 +++++----- docs/test_cases/t00004_class_mermaid.svg | 103 +-- docs/test_cases/t00005.md | 25 +- docs/test_cases/t00005_class.svg | 498 +++++----- docs/test_cases/t00005_class_mermaid.svg | 83 +- docs/test_cases/t00006.md | 39 +- docs/test_cases/t00006_class.svg | 666 ++++++-------- docs/test_cases/t00006_class_mermaid.svg | 101 +-- docs/test_cases/t00007.md | 9 +- docs/test_cases/t00007_class.svg | 138 ++- docs/test_cases/t00007_class_mermaid.svg | 41 +- docs/test_cases/t00008.md | 17 +- docs/test_cases/t00008_class.svg | 376 ++++---- docs/test_cases/t00008_class_mermaid.svg | 89 +- docs/test_cases/t00009.md | 11 +- docs/test_cases/t00009_class.svg | 208 ++--- docs/test_cases/t00009_class_mermaid.svg | 51 +- docs/test_cases/t00010.md | 11 +- docs/test_cases/t00010_class.svg | 192 ++-- docs/test_cases/t00010_class_mermaid.svg | 45 +- docs/test_cases/t00011.md | 7 +- docs/test_cases/t00011_class.svg | 136 ++- docs/test_cases/t00011_class_mermaid.svg | 67 +- docs/test_cases/t00012.md | 19 +- docs/test_cases/t00012_class.svg | 398 ++++---- docs/test_cases/t00012_class_mermaid.svg | 65 +- docs/test_cases/t00013.md | 21 +- docs/test_cases/t00013_class.svg | 614 ++++++------- docs/test_cases/t00013_class_mermaid.svg | 147 ++- docs/test_cases/t00014.md | 37 +- docs/test_cases/t00014_class.svg | 908 +++++++++---------- docs/test_cases/t00014_class_mermaid.svg | 133 ++- docs/test_cases/t00015.md | 11 +- docs/test_cases/t00015_class.svg | 106 +-- docs/test_cases/t00015_class_mermaid.svg | 43 +- docs/test_cases/t00016.md | 13 +- docs/test_cases/t00016_class.svg | 182 ++-- docs/test_cases/t00016_class_mermaid.svg | 49 +- docs/test_cases/t00017.md | 25 +- docs/test_cases/t00017_class.svg | 358 ++++---- docs/test_cases/t00017_class_mermaid.svg | 93 +- docs/test_cases/t00018.md | 5 +- docs/test_cases/t00018_class.svg | 258 +++--- docs/test_cases/t00018_class_mermaid.svg | 103 +-- docs/test_cases/t00019.md | 143 +-- docs/test_cases/t00019_class.svg | 398 ++++---- docs/test_cases/t00019_class_mermaid.svg | 127 ++- docs/test_cases/t00020.md | 19 +- docs/test_cases/t00020_class.svg | 448 +++++---- docs/test_cases/t00020_class_mermaid.svg | 181 ++-- docs/test_cases/t00021.md | 15 +- docs/test_cases/t00021_class.svg | 402 ++++----- docs/test_cases/t00021_class_mermaid.svg | 169 ++-- docs/test_cases/t00022.md | 7 +- docs/test_cases/t00022_class.svg | 166 ++-- docs/test_cases/t00022_class_mermaid.svg | 85 +- docs/test_cases/t00023.md | 11 +- docs/test_cases/t00023_class.svg | 232 +++-- docs/test_cases/t00023_class_mermaid.svg | 109 ++- docs/test_cases/t00024.md | 9 +- docs/test_cases/t00024_class.svg | 258 +++--- docs/test_cases/t00024_class_mermaid.svg | 113 ++- docs/test_cases/t00025.md | 13 +- docs/test_cases/t00025_class.svg | 302 +++---- docs/test_cases/t00025_class_mermaid.svg | 103 +-- docs/test_cases/t00026.md | 13 +- docs/test_cases/t00026_class.svg | 372 ++++---- docs/test_cases/t00026_class_mermaid.svg | 111 ++- docs/test_cases/t00027.md | 27 +- docs/test_cases/t00027_class.svg | 492 +++++----- docs/test_cases/t00027_class_mermaid.svg | 145 ++- docs/test_cases/t00028.md | 19 +- docs/test_cases/t00028_class.svg | 416 ++++----- docs/test_cases/t00028_class_mermaid.svg | 65 +- docs/test_cases/t00029.md | 19 +- docs/test_cases/t00029_class.svg | 252 +++--- docs/test_cases/t00029_class_mermaid.svg | 49 +- docs/test_cases/t00030.md | 13 +- docs/test_cases/t00030_class.svg | 236 +++-- docs/test_cases/t00030_class_mermaid.svg | 63 +- docs/test_cases/t00031.md | 13 +- docs/test_cases/t00031_class.svg | 263 +++--- docs/test_cases/t00031_class_mermaid.svg | 59 +- docs/test_cases/t00032.md | 17 +- docs/test_cases/t00032_class.svg | 260 +++--- docs/test_cases/t00032_class_mermaid.svg | 91 +- docs/test_cases/t00033.md | 17 +- docs/test_cases/t00033_class.svg | 276 +++--- docs/test_cases/t00033_class_mermaid.svg | 57 +- docs/test_cases/t00034.md | 15 +- docs/test_cases/t00034_class.svg | 230 +++-- docs/test_cases/t00034_class_mermaid.svg | 71 +- docs/test_cases/t00035.md | 11 +- docs/test_cases/t00035_class.svg | 88 +- docs/test_cases/t00035_class_mermaid.svg | 37 +- docs/test_cases/t00036.md | 33 +- docs/test_cases/t00036_class.svg | 184 ++-- docs/test_cases/t00036_class_mermaid.svg | 41 +- docs/test_cases/t00037.md | 9 +- docs/test_cases/t00037_class.svg | 242 +++-- docs/test_cases/t00037_class_mermaid.svg | 53 +- docs/test_cases/t00038.md | 21 +- docs/test_cases/t00038_class.svg | 324 +++---- docs/test_cases/t00038_class_mermaid.svg | 77 +- docs/test_cases/t00039.md | 29 +- docs/test_cases/t00039_class.svg | 396 ++++---- docs/test_cases/t00039_class_mermaid.svg | 91 +- docs/test_cases/t00040.md | 9 +- docs/test_cases/t00040_class.svg | 154 ++-- docs/test_cases/t00040_class_mermaid.svg | 77 +- docs/test_cases/t00041.md | 19 +- docs/test_cases/t00041_class.svg | 272 +++--- docs/test_cases/t00041_class_mermaid.svg | 85 +- docs/test_cases/t00042.md | 13 +- docs/test_cases/t00042_class.svg | 208 ++--- docs/test_cases/t00042_class_mermaid.svg | 49 +- docs/test_cases/t00043.md | 27 +- docs/test_cases/t00043_class.svg | 400 ++++---- docs/test_cases/t00043_class_mermaid.svg | 141 ++- docs/test_cases/t00044.md | 15 +- docs/test_cases/t00044_class.svg | 242 +++-- docs/test_cases/t00044_class_mermaid.svg | 65 +- docs/test_cases/t00045.md | 1 + docs/test_cases/t00045_class.svg | 366 ++++---- docs/test_cases/t00045_class_mermaid.svg | 83 +- docs/test_cases/t00046.md | 3 +- docs/test_cases/t00046_class.svg | 320 +++---- docs/test_cases/t00046_class_mermaid.svg | 75 +- docs/test_cases/t00047.md | 9 +- docs/test_cases/t00047_class.svg | 106 +-- docs/test_cases/t00047_class_mermaid.svg | 41 +- docs/test_cases/t00048.md | 69 +- docs/test_cases/t00048_class.svg | 308 +++---- docs/test_cases/t00048_class_mermaid.svg | 97 +- docs/test_cases/t00049.md | 11 +- docs/test_cases/t00049_class.svg | 250 +++-- docs/test_cases/t00049_class_mermaid.svg | 81 +- docs/test_cases/t00050.md | 17 +- docs/test_cases/t00050_class.svg | 384 ++++---- docs/test_cases/t00050_class_mermaid.svg | 43 +- docs/test_cases/t00051.md | 11 +- docs/test_cases/t00051_class.svg | 346 ++++--- docs/test_cases/t00051_class_mermaid.svg | 125 ++- docs/test_cases/t00052.md | 13 +- docs/test_cases/t00052_class.svg | 228 +++-- docs/test_cases/t00052_class_mermaid.svg | 95 +- docs/test_cases/t00053.md | 35 +- docs/test_cases/t00053_class.svg | 286 +++--- docs/test_cases/t00053_class_mermaid.svg | 61 +- docs/test_cases/t00054.md | 43 +- docs/test_cases/t00054_class.svg | 530 ++++------- docs/test_cases/t00054_class_mermaid.svg | 61 +- docs/test_cases/t00055.md | 21 +- docs/test_cases/t00055_class.svg | 168 ++-- docs/test_cases/t00055_class_mermaid.svg | 47 +- docs/test_cases/t00056.md | 29 +- docs/test_cases/t00056_class.svg | 564 ++++++------ docs/test_cases/t00056_class_mermaid.svg | 99 +- docs/test_cases/t00057.md | 1 + docs/test_cases/t00057_class.svg | 542 ++++++----- docs/test_cases/t00057_class_mermaid.svg | 73 +- docs/test_cases/t00058.md | 17 +- docs/test_cases/t00058_class.svg | 302 +++---- docs/test_cases/t00058_class_mermaid.svg | 59 +- docs/test_cases/t00059.md | 23 +- docs/test_cases/t00059_class.svg | 484 +++++----- docs/test_cases/t00059_class_mermaid.svg | 163 ++-- docs/test_cases/t00060.md | 13 +- docs/test_cases/t00060_class.svg | 192 ++-- docs/test_cases/t00060_class_mermaid.svg | 51 +- docs/test_cases/t00061.md | 3 +- docs/test_cases/t00061_class.svg | 24 +- docs/test_cases/t00061_class_mermaid.svg | 29 +- docs/test_cases/t00062.md | 45 +- docs/test_cases/t00062_class.svg | 952 +++++++++----------- docs/test_cases/t00062_class_mermaid.svg | 113 ++- docs/test_cases/t00063.md | 3 +- docs/test_cases/t00063_class.svg | 24 +- docs/test_cases/t00063_class_mermaid.svg | 29 +- docs/test_cases/t00064.md | 47 +- docs/test_cases/t00064_class.svg | 712 +++++++-------- docs/test_cases/t00064_class_mermaid.svg | 141 ++- docs/test_cases/t00065.md | 95 +- docs/test_cases/t00065_class.svg | 532 +++++------ docs/test_cases/t00065_class_mermaid.svg | 111 ++- docs/test_cases/t00066.md | 3 +- docs/test_cases/t00066_class.svg | 444 ++++----- docs/test_cases/t00066_class_mermaid.svg | 137 ++- docs/test_cases/t00067.md | 3 +- docs/test_cases/t00067_class.svg | 304 ++++--- docs/test_cases/t00067_class_mermaid.svg | 97 +- docs/test_cases/t00068.md | 31 +- docs/test_cases/t00068_r0_class.svg | 54 +- docs/test_cases/t00068_r0_class_mermaid.svg | 34 +- docs/test_cases/t00068_r1_class.svg | 188 ++-- docs/test_cases/t00068_r1_class_mermaid.svg | 52 +- docs/test_cases/t00068_r2_class.svg | 272 +++--- docs/test_cases/t00068_r2_class_mermaid.svg | 64 +- docs/test_cases/t00069.md | 9 +- docs/test_cases/t00069_class.svg | 302 +++---- docs/test_cases/t00069_class_mermaid.svg | 111 ++- docs/test_cases/t00070.md | 65 +- docs/test_cases/t00070_class.svg | 122 ++- docs/test_cases/t00070_class_mermaid.svg | 49 +- docs/test_cases/t00071.md | 92 +- docs/test_cases/t00071_class.svg | 346 ++++--- docs/test_cases/t00071_class_mermaid.svg | 73 +- docs/test_cases/t00072.md | 448 +++++++++ docs/test_cases/t00072_class.svg | 136 +++ docs/test_cases/t00072_class_mermaid.svg | 269 ++++++ docs/test_cases/t20001.md | 122 ++- docs/test_cases/t20001_sequence.svg | 192 ++-- docs/test_cases/t20001_sequence_mermaid.svg | 45 +- docs/test_cases/t20002.md | 31 +- docs/test_cases/t20002_sequence.svg | 90 +- docs/test_cases/t20002_sequence_mermaid.svg | 18 +- docs/test_cases/t20003.md | 31 +- docs/test_cases/t20003_sequence.svg | 90 +- docs/test_cases/t20003_sequence_mermaid.svg | 18 +- docs/test_cases/t20004.md | 85 +- docs/test_cases/t20004_sequence.svg | 258 +++--- docs/test_cases/t20004_sequence_mermaid.svg | 78 +- docs/test_cases/t20005.md | 61 +- docs/test_cases/t20005_sequence.svg | 90 +- docs/test_cases/t20005_sequence_mermaid.svg | 30 +- docs/test_cases/t20006.md | 295 ++++-- docs/test_cases/t20006_sequence.svg | 344 +++---- docs/test_cases/t20006_sequence_mermaid.svg | 86 +- docs/test_cases/t20007.md | 76 +- docs/test_cases/t20007_sequence.svg | 108 +-- docs/test_cases/t20007_sequence_mermaid.svg | 30 +- docs/test_cases/t20008.md | 139 ++- docs/test_cases/t20008_sequence.svg | 168 ++-- docs/test_cases/t20008_sequence_mermaid.svg | 30 +- docs/test_cases/t20009.md | 139 ++- docs/test_cases/t20009_sequence.svg | 168 ++-- docs/test_cases/t20009_sequence_mermaid.svg | 30 +- docs/test_cases/t20010.md | 148 ++- docs/test_cases/t20010_sequence.svg | 144 +-- docs/test_cases/t20010_sequence_mermaid.svg | 38 +- docs/test_cases/t20011.md | 82 +- docs/test_cases/t20011_sequence.svg | 180 ++-- docs/test_cases/t20011_sequence_mermaid.svg | 14 +- docs/test_cases/t20012.md | 260 ++++-- docs/test_cases/t20012_sequence.svg | 460 +++++----- docs/test_cases/t20012_sequence_mermaid.svg | 70 +- docs/test_cases/t20013.md | 115 ++- docs/test_cases/t20013_sequence.svg | 144 +-- docs/test_cases/t20013_sequence_mermaid.svg | 54 +- docs/test_cases/t20014.md | 184 ++-- docs/test_cases/t20014_sequence.svg | 172 ++-- docs/test_cases/t20014_sequence_mermaid.svg | 62 +- docs/test_cases/t20015.md | 28 +- docs/test_cases/t20015_sequence.svg | 48 +- docs/test_cases/t20015_sequence_mermaid.svg | 10 +- docs/test_cases/t20016.md | 82 +- docs/test_cases/t20016_sequence.svg | 104 ++- docs/test_cases/t20016_sequence_mermaid.svg | 30 +- docs/test_cases/t20017.md | 152 +++- docs/test_cases/t20017_sequence.svg | 132 +-- docs/test_cases/t20017_sequence_mermaid.svg | 54 +- docs/test_cases/t20018.md | 154 +++- docs/test_cases/t20018_sequence.svg | 192 ++-- docs/test_cases/t20018_sequence_mermaid.svg | 34 +- docs/test_cases/t20019.md | 104 ++- docs/test_cases/t20019_sequence.svg | 168 ++-- docs/test_cases/t20019_sequence_mermaid.svg | 38 +- docs/test_cases/t20020.md | 256 ++++-- docs/test_cases/t20020_sequence.svg | 348 +++---- docs/test_cases/t20020_sequence_mermaid.svg | 86 +- docs/test_cases/t20021.md | 204 ++++- docs/test_cases/t20021_sequence.svg | 308 +++---- docs/test_cases/t20021_sequence_mermaid.svg | 86 +- docs/test_cases/t20022.md | 67 +- docs/test_cases/t20022_sequence.svg | 86 +- docs/test_cases/t20022_sequence_mermaid.svg | 18 +- docs/test_cases/t20023.md | 88 +- docs/test_cases/t20023_sequence.svg | 171 ++-- docs/test_cases/t20023_sequence_mermaid.svg | 14 +- docs/test_cases/t20024.md | 172 +++- docs/test_cases/t20024_sequence.svg | 292 +++--- docs/test_cases/t20024_sequence_mermaid.svg | 18 +- docs/test_cases/t20025.md | 37 +- docs/test_cases/t20025_sequence.svg | 78 +- docs/test_cases/t20025_sequence_mermaid.svg | 22 +- docs/test_cases/t20026.md | 28 +- docs/test_cases/t20026_sequence.svg | 48 +- docs/test_cases/t20026_sequence_mermaid.svg | 10 +- docs/test_cases/t20027.md | 28 +- docs/test_cases/t20027_sequence.svg | 48 +- docs/test_cases/t20027_sequence_mermaid.svg | 10 +- docs/test_cases/t20028.md | 82 +- docs/test_cases/t20028_sequence.svg | 115 +-- docs/test_cases/t20028_sequence_mermaid.svg | 38 +- docs/test_cases/t20029.md | 109 ++- docs/test_cases/t20029_sequence.svg | 244 ++--- docs/test_cases/t20029_sequence_mermaid.svg | 42 +- docs/test_cases/t20030.md | 170 +++- docs/test_cases/t20030_sequence.svg | 258 +++--- docs/test_cases/t20030_sequence_mermaid.svg | 58 +- docs/test_cases/t20031.md | 50 +- docs/test_cases/t20031_sequence.svg | 120 +-- docs/test_cases/t20031_sequence_mermaid.svg | 30 +- docs/test_cases/t20032.md | 115 ++- docs/test_cases/t20032_sequence.svg | 156 ++-- docs/test_cases/t20032_sequence_mermaid.svg | 54 +- docs/test_cases/t20033.md | 142 +-- docs/test_cases/t20033_sequence.svg | 407 +++++---- docs/test_cases/t20033_sequence_mermaid.svg | 142 +-- docs/test_cases/t20034.md | 190 +++- docs/test_cases/t20034_sequence.svg | 278 +++--- docs/test_cases/t20034_sequence_mermaid.svg | 98 +- docs/test_cases/t20035.md | 31 +- docs/test_cases/t20035_sequence.svg | 74 +- docs/test_cases/t20035_sequence_mermaid.svg | 18 +- docs/test_cases/t20036.md | 182 +++- docs/test_cases/t20036_sequence.svg | 238 ++--- docs/test_cases/t20036_sequence_mermaid.svg | 86 +- docs/test_cases/t20037.md | 89 +- docs/test_cases/t20037_sequence.svg | 242 ++--- docs/test_cases/t20037_sequence_mermaid.svg | 90 +- docs/test_cases/t20038.md | 187 ++-- docs/test_cases/t20038_sequence.svg | 474 +++++----- docs/test_cases/t20038_sequence_mermaid.svg | 150 +-- docs/test_cases/t30001.md | 59 +- docs/test_cases/t30001_package.svg | 139 ++- docs/test_cases/t30001_package_mermaid.svg | 15 +- docs/test_cases/t30002.md | 98 +- docs/test_cases/t30002_package.svg | 316 +++---- docs/test_cases/t30002_package_mermaid.svg | 48 +- docs/test_cases/t30003.md | 47 +- docs/test_cases/t30003_package.svg | 78 +- docs/test_cases/t30003_package_mermaid.svg | 14 +- docs/test_cases/t30004.md | 44 +- docs/test_cases/t30004_package.svg | 88 +- docs/test_cases/t30004_package_mermaid.svg | 12 +- docs/test_cases/t30005.md | 56 +- docs/test_cases/t30005_package.svg | 116 ++- docs/test_cases/t30005_package_mermaid.svg | 16 +- docs/test_cases/t30006.md | 38 +- docs/test_cases/t30006_package.svg | 53 +- docs/test_cases/t30006_package_mermaid.svg | 16 +- docs/test_cases/t30007.md | 41 +- docs/test_cases/t30007_package.svg | 68 +- docs/test_cases/t30007_package_mermaid.svg | 16 +- docs/test_cases/t30008.md | 53 +- docs/test_cases/t30008_package.svg | 104 +-- docs/test_cases/t30008_package_mermaid.svg | 20 +- docs/test_cases/t30009.md | 59 +- docs/test_cases/t30009_package.svg | 96 +- docs/test_cases/t30009_package_mermaid.svg | 12 +- docs/test_cases/t30010.md | 75 +- docs/test_cases/t30010_package.svg | 80 +- docs/test_cases/t30010_package_mermaid.svg | 20 +- docs/test_cases/t30011.md | 51 +- docs/test_cases/t30011_package.svg | 80 +- docs/test_cases/t30011_package_mermaid.svg | 20 +- docs/test_cases/t30012.md | 61 +- docs/test_cases/t30012_package.svg | 52 +- docs/test_cases/t30012_package_mermaid.svg | 12 +- docs/test_cases/t30013.md | 270 +++--- docs/test_cases/t30013_package.svg | 268 +++--- docs/test_cases/t30013_package_mermaid.svg | 48 +- docs/test_cases/t30014.md | 161 ++++ docs/test_cases/t30014_package.svg | 31 + docs/test_cases/t30014_package_mermaid.svg | 88 ++ docs/test_cases/t30015.md | 655 ++++++++++++++ docs/test_cases/t30015_package.svg | 147 +++ docs/test_cases/t30015_package_mermaid.svg | 432 +++++++++ docs/test_cases/t40001_include.svg | 150 ++- docs/test_cases/t40001_include_mermaid.svg | 33 +- docs/test_cases/t40002.md | 20 +- docs/test_cases/t40002_include.svg | 146 ++- docs/test_cases/t40002_include_mermaid.svg | 32 +- docs/test_cases/t40003.md | 36 +- docs/test_cases/t40003_include.svg | 204 ++--- docs/test_cases/t40003_include_mermaid.svg | 46 +- docs/test_cases/t90000.md | 1 + docs/test_cases/t90000_class.svg | 96 +- docs/test_cases/t90000_class_mermaid.svg | 29 +- 388 files changed, 26517 insertions(+), 24116 deletions(-) create mode 100644 docs/test_cases/t00072.md create mode 100644 docs/test_cases/t00072_class.svg create mode 100644 docs/test_cases/t00072_class_mermaid.svg create mode 100644 docs/test_cases/t30014.md create mode 100644 docs/test_cases/t30014_package.svg create mode 100644 docs/test_cases/t30014_package_mermaid.svg create mode 100644 docs/test_cases/t30015.md create mode 100644 docs/test_cases/t30015_package.svg create mode 100644 docs/test_cases/t30015_package_mermaid.svg diff --git a/docs/test_cases.md b/docs/test_cases.md index 91f72426..32b4da41 100644 --- a/docs/test_cases.md +++ b/docs/test_cases.md @@ -76,6 +76,7 @@ * [t00069](./test_cases/t00069.md) - Coroutine methods in class diagrams * [t00070](./test_cases/t00070.md) - Diagram filter based on C++20 modules * [t00071](./test_cases/t00071.md) - Class diagram with C++20 modules generated as packages + * [t00072](./test_cases/t00072.md) - Class diagram with C++20 module partitions generated as packages ## Sequence diagrams * [t20001](./test_cases/t20001.md) - Basic sequence diagram test case * [t20002](./test_cases/t20002.md) - Free function sequence diagram test case @@ -129,6 +130,8 @@ * [t30011](./test_cases/t30011.md) - Package diagram with packages from directory structure for plain C * [t30012](./test_cases/t30012.md) - C++20 modules package diagram test * [t30013](./test_cases/t30013.md) - C++20 modules package dependencies diagram test + * [t30014](./test_cases/t30014.md) - C++20 modules package diagram test with partitions + * [t30015](./test_cases/t30015.md) - C++20 modules package diagram test with partition dependencies ## Include diagrams * [t40001](./test_cases/t40001.md) - Basic include graph diagram test case * [t40002](./test_cases/t40002.md) - Cyclic include graph diagram test case diff --git a/docs/test_cases/t00002.md b/docs/test_cases/t00002.md index bb31a89c..0ae380e7 100644 --- a/docs/test_cases/t00002.md +++ b/docs/test_cases/t00002.md @@ -139,7 +139,7 @@ private: "raw": "/// \\brief This is class A", "text": "\n \n" }, - "display_name": "clanguml::t00002::A", + "display_name": "A", "id": "987634239855407298", "is_abstract": true, "is_nested": false, @@ -248,7 +248,7 @@ private: "raw": "/// \\brief This is class B", "text": "\n \n" }, - "display_name": "clanguml::t00002::B", + "display_name": "B", "id": "594234458687375950", "is_abstract": false, "is_nested": false, @@ -316,7 +316,7 @@ private: "raw": "/// @brief This is class C - class C has a long comment\n///\n/// Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,\n/// euismod libero facilisi aptent elementum felis blandit cursus gravida sociis\n/// erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est\n/// ad.", "text": "\n \n\n Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,\n euismod libero facilisi aptent elementum felis blandit cursus gravida sociis\n erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est\n ad.\n" }, - "display_name": "clanguml::t00002::C", + "display_name": "C", "id": "1142499429598587507", "is_abstract": false, "is_nested": false, @@ -394,7 +394,7 @@ private: "raw": "/// This is class D\n/// which is a little like B\n/// and a little like C", "text": "\n This is class D\n which is a little like B\n and a little like C\n" }, - "display_name": "clanguml::t00002::D", + "display_name": "D", "id": "60950494980414724", "is_abstract": false, "is_nested": false, @@ -519,7 +519,7 @@ private: "name": "clanguml::t00002::C" } ], - "display_name": "clanguml::t00002::E", + "display_name": "E", "id": "2237886670308966220", "is_abstract": false, "is_nested": false, @@ -631,6 +631,7 @@ private: } ], "name": "t00002_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00002_class.svg b/docs/test_cases/t00002_class.svg index a72d6f50..d6cd675a 100644 --- a/docs/test_cases/t00002_class.svg +++ b/docs/test_cases/t00002_class.svg @@ -1,183 +1,157 @@ - + + + + + + + - Basic class diagram example - - - - - - A - - - - - - - foo_a() = 0 : void - - - - - - - foo_c() = 0 : void - - - + Basic class diagram example + + + + + A + - - - - - - B - - - - - - - foo_a() : void - - - + + + - - - - - - C - - - - - - - foo_c() : void - - - + + foo_a() = 0 : void - - - - - - D - - - - - - - foo_a() : void - - - - - - - foo_c() : void - - - - - - - - as : std::vector<A *> - - + + + - - - - - - E - - - - - - - foo_a() : void - - - - - - - foo_c() : void - - - - - - - - as : std::vector<A *> - - + + foo_c() = 0 : void - - - - This is class A - - - - - This is class B - - - - -     - This is class D - which is a little like B - and a little like C -   - - - - - - - - - - - - - - as - - - - - - - - - - - - - - as - - - - - - - - - + + + + + + B + + + + + + + + foo_a() : void + + + + + + + C + + + + + + + + foo_c() : void + + + + + + + D + + + + + + + + foo_a() : void + + + + + + + foo_c() : void + + + + + + + + as : std::vector<A *> + + + + + + E + + + + + + + + foo_a() : void + + + + + + + foo_c() : void + + + + + + + + as : std::vector<A *> + + + + This is class A + + + This is class B + + + + This is class D + which is a little like B + and a little like C + + + + + + + + + as + + + + + + + + as + + + + diff --git a/docs/test_cases/t00002_class_mermaid.svg b/docs/test_cases/t00002_class_mermaid.svg index 0912a39c..691ba536 100644 --- a/docs/test_cases/t00002_class_mermaid.svg +++ b/docs/test_cases/t00002_class_mermaid.svg @@ -1,71 +1,67 @@ - - + + Basic class diagram example + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - - - - + + + + + + + + + + + @@ -115,7 +111,7 @@ - + - +
- +foo_a() : : void + +foo_a() : void
- +
- +foo_c() : : void + +foo_c() : void
- + @@ -305,20 +301,20 @@ -as : std::vector<A *> - +
- +foo_a() : : void + +foo_a() : void
- +
- +foo_c() : : void + +foo_c() : void
- + @@ -329,7 +325,7 @@ - + @@ -354,5 +350,5 @@ - Basic class diagram example + Basic class diagram example diff --git a/docs/test_cases/t00003.md b/docs/test_cases/t00003.md index 5edc1bbf..1814dcc7 100644 --- a/docs/test_cases/t00003.md +++ b/docs/test_cases/t00003.md @@ -103,7 +103,7 @@ int A::static_int = 1; "elements": [ { "bases": [], - "display_name": "clanguml::t00003::A", + "display_name": "A", "id": "1371951663534295727", "is_abstract": false, "is_nested": false, @@ -852,6 +852,7 @@ int A::static_int = 1; } ], "name": "t00003_class", + "package_type": "namespace", "relationships": [], "using_namespace": "clanguml::t00003" } diff --git a/docs/test_cases/t00003_class.svg b/docs/test_cases/t00003_class.svg index c03a3812..6c754497 100644 --- a/docs/test_cases/t00003_class.svg +++ b/docs/test_cases/t00003_class.svg @@ -1,232 +1,236 @@ - + + + + + + + - - - - - - A - - - - - - - A() = default : void - - - - - - - A(int i) : void - - - - - - - A(A &&) = default : void - - - - - - - A(const A &) = deleted : void - - - A<T>(T t) : void - - - - - - ~A() = default : void - - - - - - - - operator=(A && other) noexcept : A & - - - - - - - operator=(A & other) noexcept : A & - - - - - - - - operator++() : A & - - - - - - - - auto_method() : int - - - - - - - basic_method() : void - - - - - - - const_method() const : void - - - - - - - create_from_int(int i) : A - - - - - - - default_int(int i = 12) : int - - - - - - - default_string(int i, std::string s = "abc") : std::string - - - - - - - double_int(const int i) : int - - - - - - - private_method() : void - - - - - - - protected_method() : void - - - - - - - size() constexpr const : std::size_t - - - - - - - static_method() : int - - - - - - - sum(const double a, const double b) : int - - - - - - - - a_ : int - - - - - - - auto_member : const unsigned long - - - - - - - b_ : int - - - - - - - c_ : int - - - - - - - compare : std::function<bool (const int)> - - - - - - - private_member : int - - - - - - - protected_member : int - - - - - - - public_member : int - - - - - - - static_const_int : const int - - - - - - - static_int : int - - + + + + + A + + + + + + + + A() = default : void + + + + + + + A(int i) : void + + + + + + + A(A &&) = default : void + + + + + + + A(const A &) = deleted : void + + + A<T>(T t) : void + + + + + + ~A() = default : void + + + + + + + + operator=(A && other) noexcept : A & + + + + + + + operator=(A & other) noexcept : A & + + + + + + + + operator++() : A & + + + + + + + + auto_method() : int + + + + + + + basic_method() : void + + + + + + + const_method() const : void + + + + + + + create_from_int(int i) : A + + + + + + + default_int(int i = 12) : int + + + + + + + default_string(int i, std::string s = "abc") : std::string + + + + + + + double_int(const int i) : int + + + + + + + private_method() : void + + + + + + + protected_method() : void + + + + + + + size() constexpr const : std::size_t + + + + + + + static_method() : int + + + + + + + sum(const double a, const double b) : int + + + + + + + + a_ : int + + + + + + + auto_member : const unsigned long + + + + + + + b_ : int + + + + + + + c_ : int + + + + + + + compare : std::function<bool (const int)> + + + + + + + private_member : int + + + + + + + protected_member : int + + + + + + + public_member : int + + + + + + + static_const_int : const int + + + + + + + static_int : int diff --git a/docs/test_cases/t00003_class_mermaid.svg b/docs/test_cases/t00003_class_mermaid.svg index c2accccb..6fc8ac36 100644 --- a/docs/test_cases/t00003_class_mermaid.svg +++ b/docs/test_cases/t00003_class_mermaid.svg @@ -1,55 +1,50 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + @@ -57,11 +52,11 @@ - + - - - + + +
@@ -73,159 +68,159 @@ A
- +
-a_ : int
- +
+auto_member : const unsigned long
- +
-b_ : int
- +
-c_ : int
- +
#compare : std::function<bool (const int)>
- +
-private_member : int
- +
#protected_member : int
- +
+public_member : int
- +
+static_const_int : const int
- +
+static_int : int
- +
- +A() : : [default] void + +A() : [default] void
- +
- +A(int i) : : void + +A(int i) : void
- +
- +A(A &&) : : [default] void + +A(A &&) : [default] void
- +
- +A(const A &) : : void + +A(const A &) : void
- +
- +A(T t) : : void + +A(T t) : void
- +
- +~A() : : [default] void + +~A() : [default] void
- +
- +operator=(A && other) : : A & + +operator=(A && other) : A &
- +
- +operator=(A & other) : : A & + +operator=(A & other) : A &
- +
- +operator++() : : A & + +operator++() : A &
- +
- +auto_method() : : int + +auto_method() : int
- +
- +basic_method() : : void + +basic_method() : void
- +
- +const_method() : : [const] void + +const_method() : [const] void
- +
- +create_from_int(int i) : : A + +create_from_int(int i) : A
- +
- +default_int(int i = 12) : : int + +default_int(int i = 12) : int
- +
- +default_string(int i, std::string s = "abc") : : std::string + +default_string(int i, std::string s = "abc") : std::string
- +
- +double_int(const int i) : : int + +double_int(const int i) : int
- +
- -private_method() : : void + -private_method() : void
- +
- #protected_method() : : void + #protected_method() : void
- +
- +size() : : [const,constexpr] std::size_t + +size() : [const,constexpr] std::size_t
- +
- +static_method() : : int + +static_method() : int
- +
- +sum(const double a, const double b) : : int + +sum(const double a, const double b) : int
diff --git a/docs/test_cases/t00004.md b/docs/test_cases/t00004.md index f3fe5e83..3eb44170 100644 --- a/docs/test_cases/t00004.md +++ b/docs/test_cases/t00004.md @@ -80,7 +80,7 @@ public: "elements": [ { "bases": [], - "display_name": "clanguml::t00004::B", + "display_name": "B", "id": "1232624428734051711", "is_abstract": false, "is_nested": false, @@ -106,7 +106,7 @@ public: "AA_2", "AA_3" ], - "display_name": "clanguml::t00004::B::AA", + "display_name": "B::AA", "id": "1630205507215126623", "is_nested": true, "name": "B::AA", @@ -121,7 +121,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00004::A", + "display_name": "A", "id": "1552274940876611774", "is_abstract": false, "is_nested": false, @@ -196,7 +196,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00004::A::AA", + "display_name": "A::AA", "id": "1742499843727859552", "is_abstract": false, "is_nested": true, @@ -222,7 +222,7 @@ public: "Yellow", "Red" ], - "display_name": "clanguml::t00004::A::AA::Lights", + "display_name": "A::AA::Lights", "id": "590936874508841244", "is_nested": true, "name": "A::AA::Lights", @@ -237,7 +237,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00004::A::AA::AAA", + "display_name": "A::AA::AAA", "id": "1430186633004282131", "is_abstract": false, "is_nested": true, @@ -259,7 +259,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00004::C::B", + "display_name": "C::B", "id": "287819369330075965", "is_abstract": false, "is_nested": false, @@ -288,7 +288,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00004::C", + "display_name": "C", "id": "2278328177727440136", "is_abstract": false, "is_nested": false, @@ -342,7 +342,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00004::C::AA", + "display_name": "C::AA", "id": "623940132897927654", "is_abstract": false, "is_nested": true, @@ -364,7 +364,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00004::C::AA::AAA", + "display_name": "C::AA::AAA", "id": "1597801087286500866", "is_abstract": false, "is_nested": true, @@ -389,7 +389,7 @@ public: "CCC_1", "CCC_2" ], - "display_name": "clanguml::t00004::C::AA::CCC", + "display_name": "C::AA::CCC", "id": "81819202639599734", "is_nested": true, "name": "C::AA::CCC", @@ -404,7 +404,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00004::C::B", + "display_name": "C::B", "id": "1381298335849583950", "is_abstract": false, "is_nested": true, @@ -449,7 +449,7 @@ public: "CC_1", "CC_2" ], - "display_name": "clanguml::t00004::C::CC", + "display_name": "C::CC", "id": "2037378936100378699", "is_nested": true, "name": "C::CC", @@ -464,7 +464,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00004::detail::D", + "display_name": "detail::D", "id": "612133170877135796", "is_abstract": false, "is_nested": false, @@ -490,7 +490,7 @@ public: "AA_2", "AA_3" ], - "display_name": "clanguml::t00004::detail::D::AA", + "display_name": "detail::D::AA", "id": "1572080057917630922", "is_nested": true, "name": "D::AA", @@ -505,7 +505,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00004::detail::D::DD", + "display_name": "detail::D::DD", "id": "600916232677555492", "is_abstract": false, "is_nested": true, @@ -527,6 +527,7 @@ public: } ], "name": "t00004_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00004_class.svg b/docs/test_cases/t00004_class.svg index 3672a8d7..f470643d 100644 --- a/docs/test_cases/t00004_class.svg +++ b/docs/test_cases/t00004_class.svg @@ -1,297 +1,245 @@ - + + + + + + + - - - - - - B - - - + + + + + B + + - - - - - - B::AA - - AA_1 - AA_2 - AA_3 - - + + + + + B::AA + + AA_1 + AA_2 + AA_3 + - - - - - - A - - - - - - - foo() const : void - - - - - - - foo2() const : void - - - + + + + + A + - - - - - - A::AA - - - + + + - - - - - - A::AA::Lights - - Green - Yellow - Red - - + + foo() const : void - - - - - - A::AA::AAA - - - + + + - - - - - - C::B - - int - - - + + foo2() const : void - - - - - - C - - T - - - - - - - - b_int : B<int> - - - - - - - t : T - - + + + + + + A::AA + + - - - - - - C::AA - - - + + + + + A::AA::Lights + + Green + Yellow + Red + - - - - - - C::AA::AAA - - - + + + + + A::AA::AAA + + - - - - - - C::AA::CCC - - CCC_1 - CCC_2 - - + + + + + C::B + + int + + - - - - - - C::B - - V - - - - - - - - b : V - - + + + + + C + + T + + - - - - - - C::CC - - CC_1 - CC_2 - - + + + - - - - - - detail::D - - - + + b_int : B<int> - - - - - - detail::D::AA - - AA_1 - AA_2 - AA_3 - - + + + - - - - - - detail::D::DD - - - + + t : T - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - b_int - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + C::AA + + + + + + + + C::AA::AAA + + + + + + + + C::AA::CCC + + CCC_1 + CCC_2 + + + + + + + C::B + + V + + + + + + + + + b : V + + + + + + C::CC + + CC_1 + CC_2 + + + + + + + detail::D + + + + + + + + detail::D::AA + + AA_1 + AA_2 + AA_3 + + + + + + + detail::D::DD + + + + + + + + + + + + + + + + + + + + + + + + + b_int + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/test_cases/t00004_class_mermaid.svg b/docs/test_cases/t00004_class_mermaid.svg index eaa91c7b..682ada70 100644 --- a/docs/test_cases/t00004_class_mermaid.svg +++ b/docs/test_cases/t00004_class_mermaid.svg @@ -1,73 +1,68 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -125,7 +120,7 @@ - +
@@ -215,7 +210,7 @@ - + @@ -234,7 +229,7 @@ - + @@ -268,11 +263,11 @@ - + - - - + + +
@@ -284,20 +279,20 @@ A
- +
- +foo() : : [const] void + +foo() : [const] void
- +
- +foo2() : : [const] void + +foo2() : [const] void
- + @@ -316,7 +311,7 @@ - + @@ -350,7 +345,7 @@ - + @@ -369,7 +364,7 @@ - + @@ -388,7 +383,7 @@ - + @@ -417,7 +412,7 @@ - + @@ -436,7 +431,7 @@ - + @@ -455,7 +450,7 @@ - + @@ -484,7 +479,7 @@ - + @@ -508,7 +503,7 @@ - + @@ -537,7 +532,7 @@ - + @@ -556,7 +551,7 @@ - + @@ -590,7 +585,7 @@ - + diff --git a/docs/test_cases/t00005.md b/docs/test_cases/t00005.md index 873b54cd..398e3f3a 100644 --- a/docs/test_cases/t00005.md +++ b/docs/test_cases/t00005.md @@ -72,7 +72,7 @@ public: "elements": [ { "bases": [], - "display_name": "clanguml::t00005::A", + "display_name": "A", "id": "96355893895780319", "is_abstract": false, "is_nested": false, @@ -94,7 +94,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00005::B", + "display_name": "B", "id": "1909425857334087541", "is_abstract": false, "is_nested": false, @@ -116,7 +116,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00005::C", + "display_name": "C", "id": "968176384460064907", "is_abstract": false, "is_nested": false, @@ -138,7 +138,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00005::D", + "display_name": "D", "id": "1735599590836186693", "is_abstract": false, "is_nested": false, @@ -160,7 +160,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00005::E", + "display_name": "E", "id": "887960136921844658", "is_abstract": false, "is_nested": false, @@ -182,7 +182,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00005::F", + "display_name": "F", "id": "772719357856231772", "is_abstract": false, "is_nested": false, @@ -204,7 +204,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00005::G", + "display_name": "G", "id": "979147885884736437", "is_abstract": false, "is_nested": false, @@ -226,7 +226,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00005::H", + "display_name": "H", "id": "1440673301054236675", "is_abstract": false, "is_nested": false, @@ -248,7 +248,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00005::I", + "display_name": "I", "id": "109681731550086430", "is_abstract": false, "is_nested": false, @@ -270,7 +270,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00005::J", + "display_name": "J", "id": "338330011969650325", "is_abstract": false, "is_nested": false, @@ -292,7 +292,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00005::K", + "display_name": "K", "id": "2179119389830432509", "is_abstract": false, "is_nested": false, @@ -314,7 +314,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00005::R", + "display_name": "R", "id": "630692407373144211", "is_abstract": false, "is_nested": false, @@ -517,6 +517,7 @@ public: } ], "name": "t00005_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00005_class.svg b/docs/test_cases/t00005_class.svg index 535d9e11..da677e33 100644 --- a/docs/test_cases/t00005_class.svg +++ b/docs/test_cases/t00005_class.svg @@ -1,287 +1,247 @@ - + + + + + + + - - - - - - A - - - + + + + + A + + - - - - - - B - - - + + + + + B + + - - - - - - C - - - + + + + + C + + - - - - - - D - - - + + + + + D + + - - - - - - E - - - + + + + + E + + - - - - - - F - - - + + + + + F + + - - - - - - G - - - + + + + + G + + - - - - - - H - - - + + + + + H + + - - - - - - I - - - + + + + + I + + - - - - - - J - - - + + + + + J + + - - - - - - K - - - + + + + + K + + - - - - - - R - - - - - - - - a : A - - - - - - - b : B * - - - - - - - c : C & - - - - - - - d : const D * - - - - - - - e : const E & - - - - - - - f : F && - - - - - - - g : G ** - - - - - - - h : H *** - - - - - - - i : I *& - - - - - - - j : volatile J * - - - - - - - k : K * - - - - - - - some_int : int - - - - - - - some_int_pointer : int * - - - - - - - some_int_pointer_pointer : int ** - - - - - - - some_int_reference : int & - - + + + + + R + + - - - - +a - - - - - +b - - - - - +c - - - - - +d - - - - - +e - - - - - +f - - - - - +g - - - - - +h - - - - - +i - - - - - +j - - - - - +k - + + + + + + a : A + + + + + + + b : B * + + + + + + + c : C & + + + + + + + d : const D * + + + + + + + e : const E & + + + + + + + f : F && + + + + + + + g : G ** + + + + + + + h : H *** + + + + + + + i : I *& + + + + + + + j : volatile J * + + + + + + + k : K * + + + + + + + some_int : int + + + + + + + some_int_pointer : int * + + + + + + + some_int_pointer_pointer : int ** + + + + + + + some_int_reference : int & + + + + +a + + + +b + + + +c + + + +d + + + +e + + + +f + + + +g + + + +h + + + +i + + + +j + + + +k diff --git a/docs/test_cases/t00005_class_mermaid.svg b/docs/test_cases/t00005_class_mermaid.svg index 4008b39e..7f1235de 100644 --- a/docs/test_cases/t00005_class_mermaid.svg +++ b/docs/test_cases/t00005_class_mermaid.svg @@ -1,71 +1,66 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - - - - + + + + + + + + + + + @@ -191,7 +186,7 @@ - + @@ -210,7 +205,7 @@ - + @@ -229,7 +224,7 @@ - + @@ -248,7 +243,7 @@ - + @@ -267,7 +262,7 @@ - + @@ -286,7 +281,7 @@ - + @@ -305,7 +300,7 @@ - + @@ -324,7 +319,7 @@ - + @@ -343,7 +338,7 @@ - + @@ -362,7 +357,7 @@ - + @@ -381,7 +376,7 @@ - + @@ -400,7 +395,7 @@ - + @@ -423,7 +418,7 @@
- +b : B + +b : B
@@ -433,7 +428,7 @@
- +d : const D + +d : const D
@@ -463,12 +458,12 @@
- +j : volatile J + +j : volatile J
- +k : K + +k : K
@@ -478,7 +473,7 @@
- +some_int_pointer : int + +some_int_pointer : int
diff --git a/docs/test_cases/t00006.md b/docs/test_cases/t00006.md index 60b7e995..3d1aa118 100644 --- a/docs/test_cases/t00006.md +++ b/docs/test_cases/t00006.md @@ -96,7 +96,7 @@ public: "elements": [ { "bases": [], - "display_name": "clanguml::t00006::A", + "display_name": "A", "id": "989095304444672400", "is_abstract": false, "is_nested": false, @@ -118,7 +118,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00006::B", + "display_name": "B", "id": "648285260245005311", "is_abstract": false, "is_nested": false, @@ -140,7 +140,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00006::C", + "display_name": "C", "id": "323304333007297774", "is_abstract": false, "is_nested": false, @@ -162,7 +162,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00006::D", + "display_name": "D", "id": "1006912399043633492", "is_abstract": false, "is_nested": false, @@ -184,7 +184,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00006::E", + "display_name": "E", "id": "1092550394020578978", "is_abstract": false, "is_nested": false, @@ -206,7 +206,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00006::F", + "display_name": "F", "id": "965398761810782236", "is_abstract": false, "is_nested": false, @@ -228,7 +228,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00006::G", + "display_name": "G", "id": "1764732000887030464", "is_abstract": false, "is_nested": false, @@ -250,7 +250,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00006::H", + "display_name": "H", "id": "1669285599837552146", "is_abstract": false, "is_nested": false, @@ -272,7 +272,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00006::I", + "display_name": "I", "id": "2234750598599000377", "is_abstract": false, "is_nested": false, @@ -294,7 +294,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00006::J", + "display_name": "J", "id": "1335933649375465369", "is_abstract": false, "is_nested": false, @@ -316,7 +316,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00006::K", + "display_name": "K", "id": "1603190364864080123", "is_abstract": false, "is_nested": false, @@ -338,7 +338,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00006::L", + "display_name": "L", "id": "305487238408320046", "is_abstract": false, "is_nested": false, @@ -360,7 +360,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00006::M", + "display_name": "M", "id": "1664744512423723275", "is_abstract": false, "is_nested": false, @@ -382,7 +382,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00006::N", + "display_name": "N", "id": "950210019792152600", "is_abstract": false, "is_nested": false, @@ -404,7 +404,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00006::NN", + "display_name": "NN", "id": "1662349735899726224", "is_abstract": false, "is_nested": false, @@ -426,7 +426,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00006::NNN", + "display_name": "NNN", "id": "1963145075481599858", "is_abstract": false, "is_nested": false, @@ -448,7 +448,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00006::custom_container", + "display_name": "custom_container", "id": "916380191954937631", "is_abstract": false, "is_nested": false, @@ -490,7 +490,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00006::custom_container", + "display_name": "custom_container", "id": "50153113082434858", "is_abstract": false, "is_nested": false, @@ -519,7 +519,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00006::R", + "display_name": "R", "id": "303025561016882526", "is_abstract": false, "is_nested": false, @@ -698,6 +698,7 @@ public: } ], "name": "t00006_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00006_class.svg b/docs/test_cases/t00006_class.svg index 48d68a6b..4ad1613a 100644 --- a/docs/test_cases/t00006_class.svg +++ b/docs/test_cases/t00006_class.svg @@ -1,392 +1,324 @@ - + + + + + + + - - - - - - A - - - + + + + + A + + - - - - - - B - - - + + + + + B + + - - - - - - C - - - + + + + + C + + - - - - - - D - - - + + + + + D + + - - - - - - E - - - + + + + + E + + - - - - - - F - - - + + + + + F + + - - - - - - G - - - + + + + + G + + - - - - - - H - - - + + + + + H + + - - - - - - I - - - + + + + + I + + - - - - - - J - - - + + + + + J + + - - - - - - K - - - + + + + + K + + - - - - - - L - - - + + + + + L + + - - - - - - M - - - + + + + + M + + - - - - - - N - - - + + + + + N + + - - - - - - NN - - - + + + + + NN + + - - - - - - NNN - - - + + + + + NNN + + - - - - - - custom_container - - T - - - - - - - - data : std::vector<T> - - + + + + + custom_container + + T + + - - - - - - custom_container - - E - - - + + + - - - - - - R - - - - - - - - a : std::vector<A> - - - - - - - b : std::vector<B *> - - - - - - - c : std::map<int,C> - - - - - - - d : std::map<int,D *> - - - - - - - e : custom_container<E> - - - - - - - f : std::vector<std::vector<F>> - - - - - - - g : std::map<int,std::vector<G *>> - - - - - - - h : std::array<H,10> - - - - - - - i : std::array<I *,5> - - - - - - - j : J[10] - - - - - - - k : K *[20] - - - - - - - lm : std::vector<std::pair<L,M>> - - - - - - - ns : std::tuple<N,NN,NNN> - - + + data : std::vector<T> - - - - - - - - - - - - +a - - - - - +b - - - - - +c - - - - - +d - - - - - +e - - - - - +f - - - - - +g - - - - - +h - - - - - +i - - - - - +j - - - - - +k - - - - - - lm - - - - - - lm - - - - - - ns - - - - - - ns - - - - - - ns - + + + + + custom_container + + E + + + + + + + + R + + + + + + + + + a : std::vector<A> + + + + + + + b : std::vector<B *> + + + + + + + c : std::map<int,C> + + + + + + + d : std::map<int,D *> + + + + + + + e : custom_container<E> + + + + + + + f : std::vector<std::vector<F>> + + + + + + + g : std::map<int,std::vector<G *>> + + + + + + + h : std::array<H,10> + + + + + + + i : std::array<I *,5> + + + + + + + j : J[10] + + + + + + + k : K *[20] + + + + + + + lm : std::vector<std::pair<L,M>> + + + + + + + ns : std::tuple<N,NN,NNN> + + + + + + + + +a + + + +b + + + +c + + + +d + + + +e + + + +f + + + +g + + + +h + + + +i + + + +j + + + +k + + + + lm + + + + lm + + + + ns + + + + ns + + + + ns diff --git a/docs/test_cases/t00006_class_mermaid.svg b/docs/test_cases/t00006_class_mermaid.svg index 76109ab0..7de39c54 100644 --- a/docs/test_cases/t00006_class_mermaid.svg +++ b/docs/test_cases/t00006_class_mermaid.svg @@ -1,78 +1,73 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -275,7 +270,7 @@ - + @@ -294,7 +289,7 @@ - + @@ -313,7 +308,7 @@ - + @@ -332,7 +327,7 @@ - + @@ -351,7 +346,7 @@ - + @@ -370,7 +365,7 @@ - + @@ -389,7 +384,7 @@ - + @@ -408,7 +403,7 @@ - + @@ -427,7 +422,7 @@ - + @@ -446,7 +441,7 @@ - + @@ -465,7 +460,7 @@ - + @@ -484,7 +479,7 @@ - + @@ -503,7 +498,7 @@ - + @@ -522,7 +517,7 @@ - + @@ -541,7 +536,7 @@ - + @@ -560,7 +555,7 @@ - + @@ -579,7 +574,7 @@ - + @@ -603,7 +598,7 @@ - + @@ -622,7 +617,7 @@ - + diff --git a/docs/test_cases/t00007.md b/docs/test_cases/t00007.md index a7185e9b..73bb122d 100644 --- a/docs/test_cases/t00007.md +++ b/docs/test_cases/t00007.md @@ -46,7 +46,7 @@ public: "elements": [ { "bases": [], - "display_name": "clanguml::t00007::A", + "display_name": "A", "id": "98876622534017019", "is_abstract": false, "is_nested": false, @@ -68,7 +68,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00007::B", + "display_name": "B", "id": "696381312773707784", "is_abstract": false, "is_nested": false, @@ -90,7 +90,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00007::C", + "display_name": "C", "id": "972031178679364068", "is_abstract": false, "is_nested": false, @@ -112,7 +112,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00007::R", + "display_name": "R", "id": "66905874721300157", "is_abstract": false, "is_nested": false, @@ -171,6 +171,7 @@ public: } ], "name": "t00007_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00007_class.svg b/docs/test_cases/t00007_class.svg index 455aa85b..f55a19ec 100644 --- a/docs/test_cases/t00007_class.svg +++ b/docs/test_cases/t00007_class.svg @@ -1,83 +1,75 @@ - + + + + + + + - - - - - - A - - - + + + + + A + + - - - - - - B - - - + + + + + B + + - - - - - - C - - - + + + + + C + + - - - - - - R - - - - - - - - a : std::unique_ptr<A> - - - - - - - b : std::shared_ptr<B> - - - - - - - c : std::weak_ptr<C> - - + + + + + R + + - - - - +a - - - - - +b - - - - - +c - + + + + + + a : std::unique_ptr<A> + + + + + + + b : std::shared_ptr<B> + + + + + + + c : std::weak_ptr<C> + + + + +a + + + +b + + + +c diff --git a/docs/test_cases/t00007_class_mermaid.svg b/docs/test_cases/t00007_class_mermaid.svg index 861520b8..106cf3fb 100644 --- a/docs/test_cases/t00007_class_mermaid.svg +++ b/docs/test_cases/t00007_class_mermaid.svg @@ -1,63 +1,58 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - + + + @@ -95,7 +90,7 @@ - + @@ -114,7 +109,7 @@ - + @@ -133,7 +128,7 @@ - + @@ -152,7 +147,7 @@ - + diff --git a/docs/test_cases/t00008.md b/docs/test_cases/t00008.md index de097b7a..5acd5616 100644 --- a/docs/test_cases/t00008.md +++ b/docs/test_cases/t00008.md @@ -79,7 +79,7 @@ template <> struct E::nested_template { "elements": [ { "bases": [], - "display_name": "clanguml::t00008::A", + "display_name": "A", "id": "2293517130897538130", "is_abstract": false, "is_nested": false, @@ -203,7 +203,7 @@ template <> struct E::nested_template { }, { "bases": [], - "display_name": "clanguml::t00008::Vector", + "display_name": "Vector", "id": "1677407014842680311", "is_abstract": false, "is_nested": false, @@ -245,7 +245,7 @@ template <> struct E::nested_template { }, { "bases": [], - "display_name": "clanguml::t00008::B>", + "display_name": "B>", "id": "1968575752686868237", "is_abstract": false, "is_nested": false, @@ -293,7 +293,7 @@ template <> struct E::nested_template { }, { "bases": [], - "display_name": "clanguml::t00008::B", + "display_name": "B", "id": "1449136415707203971", "is_abstract": false, "is_nested": false, @@ -328,7 +328,7 @@ template <> struct E::nested_template { }, { "bases": [], - "display_name": "clanguml::t00008::D", + "display_name": "D", "id": "1562396858816419857", "is_abstract": false, "is_nested": false, @@ -420,7 +420,7 @@ template <> struct E::nested_template { }, { "bases": [], - "display_name": "clanguml::t00008::E", + "display_name": "E", "id": "1787658457052431115", "is_abstract": false, "is_nested": false, @@ -442,7 +442,7 @@ template <> struct E::nested_template { }, { "bases": [], - "display_name": "clanguml::t00008::E::nested_template", + "display_name": "E::nested_template", "id": "1549419203490064906", "is_abstract": false, "is_nested": true, @@ -503,7 +503,7 @@ template <> struct E::nested_template { }, { "bases": [], - "display_name": "clanguml::t00008::E::nested_template", + "display_name": "E::nested_template", "id": "33637089897037832", "is_abstract": false, "is_nested": true, @@ -564,6 +564,7 @@ template <> struct E::nested_template { } ], "name": "t00008_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00008_class.svg b/docs/test_cases/t00008_class.svg index 643c6dc6..2287d43f 100644 --- a/docs/test_cases/t00008_class.svg +++ b/docs/test_cases/t00008_class.svg @@ -1,212 +1,192 @@ - + + + + + + + - - - - - - A - - T,P=T,CMP=nullptr,int N=3 - - - - - - - - comparator : CMP - - - - - - - ints : std::array<int,N> - - - - - - - pointer : T * - - - - - - - reference : T & - - - - - - - value : T - - - - - - - values : std::vector<P> - - + + + + + A + + T,P=T,CMP=nullptr,int N=3 + + - - - - - - Vector - - T - - - - - - - - values : std::vector<T> - - + + + - - - - - - B - - T,C<> - - - - - - - - template_template : C<T> - - + + comparator : CMP - - - - - - B - - int,Vector - - - + + + - - - - - - D - - - D<Items...>(std::tuple<Items...> *) : void - - - - - - - add(int i) : void - - - - - - - - ints : B<int,Vector> - - + + ints : std::array<int,N> - - - - - - E - - - + + + - - - - - - E::nested_template - - ET - - - - - - - get(ET * d) : DT * - - - + + pointer : T * - - - - - - E::nested_template - - char - - - - - - - getDecl(char * c) : DeclType * - - - + + + - - - - - - - - - ints - - - - - - - - - - - - - - - - - + + reference : T & + + + + + + + value : T + + + + + + + values : std::vector<P> + + + + + + Vector + + T + + + + + + + + + values : std::vector<T> + + + + + + B + + T,C<> + + + + + + + + + template_template : C<T> + + + + + + B + + int,Vector + + + + + + + + D + + + D<Items...>(std::tuple<Items...> *) : void + + + + + + + + add(int i) : void + + + + + + + + ints : B<int,Vector> + + + + + + E + + + + + + + + E::nested_template + + ET + + + + + + + + get(ET * d) : DT * + + + + + + + E::nested_template + + char + + + + + + + + getDecl(char * c) : DeclType * + + + + + + + + ints + + + + + + + + + + diff --git a/docs/test_cases/t00008_class_mermaid.svg b/docs/test_cases/t00008_class_mermaid.svg index 7a9afd27..8ac8aafc 100644 --- a/docs/test_cases/t00008_class_mermaid.svg +++ b/docs/test_cases/t00008_class_mermaid.svg @@ -1,65 +1,60 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - + + + + + @@ -73,7 +68,7 @@ - + - +
- +get(ET * d) : : DT * + +get(ET * d) : DT *
- + - - - + + +
@@ -328,9 +323,9 @@ E::nested_template<char>
- +
- +getDecl(char * c) : : DeclType * + +getDecl(char * c) : DeclType *
diff --git a/docs/test_cases/t00009.md b/docs/test_cases/t00009.md index b77d0453..2bccfcb8 100644 --- a/docs/test_cases/t00009.md +++ b/docs/test_cases/t00009.md @@ -47,7 +47,7 @@ public: "elements": [ { "bases": [], - "display_name": "clanguml::t00009::A", + "display_name": "A", "id": "412228989111660105", "is_abstract": false, "is_nested": false, @@ -89,7 +89,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00009::A", + "display_name": "A", "id": "1894387438043499", "is_abstract": false, "is_nested": false, @@ -118,7 +118,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00009::A", + "display_name": "A", "id": "1340793233843139195", "is_abstract": false, "is_nested": false, @@ -147,7 +147,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00009::A>", + "display_name": "A>", "id": "1370808797762248850", "is_abstract": false, "is_nested": false, @@ -183,7 +183,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00009::B", + "display_name": "B", "id": "176239714450247310", "is_abstract": false, "is_nested": false, @@ -242,6 +242,7 @@ public: } ], "name": "t00009_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00009_class.svg b/docs/test_cases/t00009_class.svg index 410bafe7..c8124296 100644 --- a/docs/test_cases/t00009_class.svg +++ b/docs/test_cases/t00009_class.svg @@ -1,123 +1,107 @@ - + + + + + + + - - - - - - A - - T - - - - - - - - value : T - - + + + + + A + + T + + - - - - - - A - - int - - - + + + - - - - - - A - - std::string - - - + + value : T - - - - - - A - - std::vector<std::string> - - - + + + + + A + + int + + - - - - - - B - - - - - - - - aint : A<int> - - - - - - - astring : A<std::string> * - - - - - - - avector : A<std::vector<std::string>> & - - + + + + + A + + std::string + + - - - - - - - - - - - - - - - - - aint - - - - - - astring - - - - - - avector - + + + + + A + + std::vector<std::string> + + + + + + + + B + + + + + + + + + aint : A<int> + + + + + + + astring : A<std::string> * + + + + + + + avector : A<std::vector<std::string>> & + + + + + + + + + + + aint + + + + astring + + + + avector diff --git a/docs/test_cases/t00009_class_mermaid.svg b/docs/test_cases/t00009_class_mermaid.svg index 5bb62d6e..1a4eb5d8 100644 --- a/docs/test_cases/t00009_class_mermaid.svg +++ b/docs/test_cases/t00009_class_mermaid.svg @@ -1,66 +1,61 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - + + + + + + @@ -131,7 +126,7 @@ - + @@ -155,7 +150,7 @@ - + @@ -174,7 +169,7 @@ - + @@ -193,7 +188,7 @@ - + @@ -212,7 +207,7 @@ - + @@ -235,7 +230,7 @@
- +astring : A<std::string> + +astring : A<std::string>
diff --git a/docs/test_cases/t00010.md b/docs/test_cases/t00010.md index 8e8e006d..0ae27f3b 100644 --- a/docs/test_cases/t00010.md +++ b/docs/test_cases/t00010.md @@ -51,7 +51,7 @@ public: "elements": [ { "bases": [], - "display_name": "clanguml::t00010::A", + "display_name": "A", "id": "2222216618904514099", "is_abstract": false, "is_nested": false, @@ -111,7 +111,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00010::A", + "display_name": "A", "id": "1861520693741915300", "is_abstract": false, "is_nested": false, @@ -146,7 +146,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00010::B", + "display_name": "B", "id": "2303611426082708583", "is_abstract": false, "is_nested": false, @@ -188,7 +188,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00010::B", + "display_name": "B", "id": "1498376939480949099", "is_abstract": false, "is_nested": false, @@ -217,7 +217,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00010::C", + "display_name": "C", "id": "1880966578968892571", "is_abstract": false, "is_nested": false, @@ -252,6 +252,7 @@ public: } ], "name": "t00010_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00010_class.svg b/docs/test_cases/t00010_class.svg index 3a91d9be..385fde7e 100644 --- a/docs/test_cases/t00010_class.svg +++ b/docs/test_cases/t00010_class.svg @@ -1,113 +1,101 @@ - + + + + + + + - - - - - - A - - T,P - - - - - - - - first : T - - - - - - - second : P - - + + + + + A + + T,P + + - - - - - - A - - T,std::string - - - + + + - - - - - - B - - T - - - - - - - - astring : A<T,std::string> - - + + first : T - - - - - - B - - int - - - + + + - - - - - - C - - - - - - - - aintstring : B<int> - - + + second : P - - - - - - - - - astring - - - - - - - - - - aintstring - + + + + + A + + T,std::string + + + + + + + + B + + T + + + + + + + + + astring : A<T,std::string> + + + + + + B + + int + + + + + + + + C + + + + + + + + + aintstring : B<int> + + + + + + + astring + + + + + + aintstring diff --git a/docs/test_cases/t00010_class_mermaid.svg b/docs/test_cases/t00010_class_mermaid.svg index 3b4dca23..85ea2f92 100644 --- a/docs/test_cases/t00010_class_mermaid.svg +++ b/docs/test_cases/t00010_class_mermaid.svg @@ -1,64 +1,59 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - + + + + @@ -107,7 +102,7 @@ - + @@ -136,7 +131,7 @@ - + @@ -155,7 +150,7 @@ - + @@ -179,7 +174,7 @@ - + @@ -198,7 +193,7 @@ - + diff --git a/docs/test_cases/t00011.md b/docs/test_cases/t00011.md index 5e8a5007..fee12b52 100644 --- a/docs/test_cases/t00011.md +++ b/docs/test_cases/t00011.md @@ -60,7 +60,7 @@ public: "elements": [ { "bases": [], - "display_name": "clanguml::t00011::D", + "display_name": "D", "id": "1150639902748052276", "is_abstract": false, "is_nested": false, @@ -102,7 +102,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00011::A", + "display_name": "A", "id": "1420516952857803719", "is_abstract": false, "is_nested": false, @@ -151,7 +151,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00011::B", + "display_name": "B", "id": "1687427603952049829", "is_abstract": false, "is_nested": false, @@ -213,6 +213,7 @@ public: } ], "name": "t00011_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00011_class.svg b/docs/test_cases/t00011_class.svg index bfc3d35a..8c8c4d1d 100644 --- a/docs/test_cases/t00011_class.svg +++ b/docs/test_cases/t00011_class.svg @@ -1,79 +1,75 @@ - + + + + + + + - - - - - - D - - T - - - - - - - - value : T - - + + + + + D + + T + + - - - - - - A - - - - - - - foo() : void - - - + + + - - - - - - B - - - - - - - foo() : void - - - - - - - - m_a : A * - - + + value : T - - - - - «friend» - - - - - - m_a - + + + + + A + + + + + + + + foo() : void + + + + + + + B + + + + + + + + foo() : void + + + + + + + + m_a : A * + + + + + «friend» + + + + m_a diff --git a/docs/test_cases/t00011_class_mermaid.svg b/docs/test_cases/t00011_class_mermaid.svg index c0fc4ffd..0131f95e 100644 --- a/docs/test_cases/t00011_class_mermaid.svg +++ b/docs/test_cases/t00011_class_mermaid.svg @@ -1,65 +1,60 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - + + - +
@@ -70,7 +65,7 @@ - +
@@ -83,7 +78,7 @@ - + @@ -107,11 +102,11 @@ - + - - - + + +
@@ -123,19 +118,19 @@ A
- +
- +foo() : : void + +foo() : void
- + - - - + + +
@@ -147,14 +142,14 @@ B
- +
- +m_a : A + +m_a : A
- +
- +foo() : : void + +foo() : void
diff --git a/docs/test_cases/t00012.md b/docs/test_cases/t00012.md index 4b024e4e..47106719 100644 --- a/docs/test_cases/t00012.md +++ b/docs/test_cases/t00012.md @@ -67,7 +67,7 @@ class R { "elements": [ { "bases": [], - "display_name": "clanguml::t00012::A", + "display_name": "A", "id": "1773299890023132282", "is_abstract": false, "is_nested": false, @@ -127,7 +127,7 @@ class R { }, { "bases": [], - "display_name": "clanguml::t00012::B", + "display_name": "B", "id": "2061171077567279746", "is_abstract": false, "is_nested": false, @@ -170,7 +170,7 @@ class R { }, { "bases": [], - "display_name": "clanguml::t00012::C", + "display_name": "C", "id": "627809578407650629", "is_abstract": false, "is_nested": false, @@ -219,7 +219,7 @@ class R { }, { "bases": [], - "display_name": "clanguml::t00012::A", + "display_name": "A", "id": "286972398942005457", "is_abstract": false, "is_nested": false, @@ -260,7 +260,7 @@ class R { }, { "bases": [], - "display_name": "clanguml::t00012::A", + "display_name": "A", "id": "299466181098300963", "is_abstract": false, "is_nested": false, @@ -301,7 +301,7 @@ class R { }, { "bases": [], - "display_name": "clanguml::t00012::B<3,2,1>", + "display_name": "B<3,2,1>", "id": "489063277971613593", "is_abstract": false, "is_nested": false, @@ -342,7 +342,7 @@ class R { }, { "bases": [], - "display_name": "clanguml::t00012::B<1,1,1,1>", + "display_name": "B<1,1,1,1>", "id": "14232362483200599", "is_abstract": false, "is_nested": false, @@ -389,7 +389,7 @@ class R { }, { "bases": [], - "display_name": "clanguml::t00012::C>>>,3,3,3>", + "display_name": "C>>>,3,3,3>", "id": "1478239414632239754", "is_abstract": false, "is_nested": false, @@ -470,7 +470,7 @@ class R { }, { "bases": [], - "display_name": "clanguml::t00012::R", + "display_name": "R", "id": "559263385732885469", "is_abstract": false, "is_nested": false, @@ -553,6 +553,7 @@ class R { } ], "name": "t00012_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00012_class.svg b/docs/test_cases/t00012_class.svg index 754f03b0..7370ba01 100644 --- a/docs/test_cases/t00012_class.svg +++ b/docs/test_cases/t00012_class.svg @@ -1,231 +1,197 @@ - + + + + + + + - - - - - - A - - T,Ts... - - - - - - - - value : T - - - - - - - values : std::variant<Ts...> - - + + + + + A + + T,Ts... + + - - - - - - B - - int... Is - - - - - - - - ints : std::array<int,sizeof...(Is)> - - + + + - - - - - - C - - T,int... Is - - - - - - - - ints : std::array<T,sizeof...(Is)> - - + + value : T - - - - - - A - - int,std::string,float - - - + + + - - - - - - A - - int,std::string,bool - - - + + values : std::variant<Ts...> - - - - - - B - - 3,2,1 - - - + + + + + B + + int... Is + + - - - - - - B - - 1,1,1,1 - - - + + + - - - - - - C - - std::map<int,std::vector<std::vector<std::vector<std::string>>>>,3,3,3 - - - + + ints : std::array<int,sizeof...(Is)> - - - - - - R - - - - - - - - a1 : A<int,std::string,float> - - - - - - - a2 : A<int,std::string,bool> - - - - - - - b1 : B<3,2,1> - - - - - - - b2 : B<1,1,1,1> - - - - - - - c1 : C<std::map<int,std::vector<std::vector<std::vector<std::string>>>>,3,3,3> - - + + + + + C + + T,int... Is + + - - - - Long template annotation - - - - - - - - - - - - - - - - - - - - - - - - - - a1 - - - - - - a2 - - - - - - b1 - - - - - - b2 - - - - - - c1 - + + + + + + ints : std::array<T,sizeof...(Is)> + + + + + + A + + int,std::string,float + + + + + + + + A + + int,std::string,bool + + + + + + + + B + + 3,2,1 + + + + + + + + B + + 1,1,1,1 + + + + + + + + C + + std::map<int,std::vector<std::vector<std::vector<std::string>>>>,3,3,3 + + + + + + + + R + + + + + + + + + a1 : A<int,std::string,float> + + + + + + + a2 : A<int,std::string,bool> + + + + + + + b1 : B<3,2,1> + + + + + + + b2 : B<1,1,1,1> + + + + + + + c1 : C<std::map<int,std::vector<std::vector<std::vector<std::string>>>>,3,3,3> + + + + Long template annotation + + + + + + + + + + + + + + a1 + + + + a2 + + + + b1 + + + + b2 + + + + c1 diff --git a/docs/test_cases/t00012_class_mermaid.svg b/docs/test_cases/t00012_class_mermaid.svg index 8663f35d..fa787783 100644 --- a/docs/test_cases/t00012_class_mermaid.svg +++ b/docs/test_cases/t00012_class_mermaid.svg @@ -1,70 +1,65 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - - - + + + + + + + + + + @@ -179,7 +174,7 @@ - + @@ -208,7 +203,7 @@ - + @@ -232,7 +227,7 @@ - + @@ -256,7 +251,7 @@ - + @@ -275,7 +270,7 @@ - + @@ -294,7 +289,7 @@ - + @@ -313,7 +308,7 @@ - + @@ -332,7 +327,7 @@ - + @@ -351,7 +346,7 @@ - + diff --git a/docs/test_cases/t00013.md b/docs/test_cases/t00013.md index 0163deb8..1e54e3d5 100644 --- a/docs/test_cases/t00013.md +++ b/docs/test_cases/t00013.md @@ -166,7 +166,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00013::A", + "display_name": "A", "id": "519995486237427479", "is_abstract": false, "is_nested": false, @@ -201,7 +201,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00013::B", + "display_name": "B", "id": "1177487653597650440", "is_abstract": false, "is_nested": false, @@ -236,7 +236,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00013::C", + "display_name": "C", "id": "1028245818073128358", "is_abstract": false, "is_nested": false, @@ -271,7 +271,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00013::D", + "display_name": "D", "id": "409373870621931875", "is_abstract": false, "is_nested": false, @@ -338,7 +338,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00013::E", + "display_name": "E", "id": "864055993755439230", "is_abstract": false, "is_nested": false, @@ -380,7 +380,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00013::G", + "display_name": "G", "id": "205927019127027617", "is_abstract": false, "is_nested": false, @@ -440,7 +440,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00013::E", + "display_name": "E", "id": "1977486318799565722", "is_abstract": false, "is_nested": false, @@ -469,7 +469,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00013::G", + "display_name": "G", "id": "1526733274613822014", "is_abstract": false, "is_nested": false, @@ -510,7 +510,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00013::E", + "display_name": "E", "id": "531523220915557686", "is_abstract": false, "is_nested": false, @@ -539,7 +539,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00013::R", + "display_name": "R", "id": "2198686676355573844", "is_abstract": false, "is_nested": false, @@ -916,6 +916,7 @@ private: } ], "name": "t00013_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00013_class.svg b/docs/test_cases/t00013_class.svg index 8a68cb28..9e01ec4e 100644 --- a/docs/test_cases/t00013_class.svg +++ b/docs/test_cases/t00013_class.svg @@ -1,349 +1,301 @@ - + + + + + + + - - - - - - ABCD::F - - T - - - - - - - - f : T - - + + + + + ABCD::F + + T + + - - - - - - ABCD::F - - int - - - + + + - - - - - - A - - - - - - - - a : int - - + + f : T - - - - - - B - - - - - - - - b : int - - + + + + + ABCD::F + + int + + - - - - - - C - - - - - - - - c : int - - + + + + + A + + - - - - - - D - - - - - - - print(R * r) : void - - - - - - - - d : int - - + + + - - - - - - E - - T - - - - - - - - e : T - - + + a : int - - - - - - G - - T,Args... - - - - - - - - args : std::tuple<Args...> - - - - - - - g : T - - + + + + + B + + - - - - - - E - - int - - - + + + - - - - - - G - - int,float,std::string - - - + + b : int - - - - - - E - - std::string - - - + + + + + C + + - - - - - - R - - - - - - - get_a(A * a) : int - - - - - - - get_b(B & b) : int - - - - - - - get_c(C c) : int - - - - - - - get_const_b(const B & b) : int - - - - - - - get_d(D && d) : int - - - - - - - get_d2(D && d) : int - - - get_e<T>(E<T> e) : T - - get_f<T>(const F<T> & f) : T - - - - - - get_int_e(const E<int> & e) : int - - - - - - - get_int_e2(E<int> & e) : int - - - - - - - get_int_f(const ABCD::F<int> & f) : int - - - - - - - - estring : E<std::string> - - - - - - - gintstring : G<int,float,std::string> - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - gintstring - - - - - - estring - + + c : int + + + + + + D + + + + + + + + print(R * r) : void + + + + + + + + d : int + + + + + + E + + T + + + + + + + + + e : T + + + + + + G + + T,Args... + + + + + + + + + args : std::tuple<Args...> + + + + + + + g : T + + + + + + E + + int + + + + + + + + G + + int,float,std::string + + + + + + + + E + + std::string + + + + + + + + R + + + + + + + + get_a(A * a) : int + + + + + + + get_b(B & b) : int + + + + + + + get_c(C c) : int + + + + + + + get_const_b(const B & b) : int + + + + + + + get_d(D && d) : int + + + + + + + get_d2(D && d) : int + + + get_e<T>(E<T> e) : T + + get_f<T>(const F<T> & f) : T + + + + + + get_int_e(const E<int> & e) : int + + + + + + + get_int_e2(E<int> & e) : int + + + + + + + get_int_f(const ABCD::F<int> & f) : int + + + + + + + + estring : E<std::string> + + + + + + + gintstring : G<int,float,std::string> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + gintstring + + + + estring diff --git a/docs/test_cases/t00013_class_mermaid.svg b/docs/test_cases/t00013_class_mermaid.svg index dfd27b4b..cba04955 100644 --- a/docs/test_cases/t00013_class_mermaid.svg +++ b/docs/test_cases/t00013_class_mermaid.svg @@ -1,75 +1,70 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -239,7 +234,7 @@ - + @@ -263,7 +258,7 @@ - + @@ -282,7 +277,7 @@ - + @@ -306,7 +301,7 @@ - + @@ -330,7 +325,7 @@ - + @@ -354,11 +349,11 @@ - + - - - + + +
@@ -370,20 +365,20 @@ D
- +
+d : int
- +
- +print(R * r) : : void + +print(R * r) : void
- + @@ -407,7 +402,7 @@ - + @@ -436,7 +431,7 @@ - + @@ -455,7 +450,7 @@ - + @@ -474,7 +469,7 @@ - + @@ -493,11 +488,11 @@ - + - - - + + +
@@ -509,69 +504,69 @@ R
- +
-estring : E<std::string>
- +
+gintstring : G<int,float,std::string>
- +
- +get_a(A * a) : : int + +get_a(A * a) : int
- +
- +get_b(B & b) : : int + +get_b(B & b) : int
- +
- +get_c(C c) : : int + +get_c(C c) : int
- +
- +get_const_b(const B & b) : : int + +get_const_b(const B & b) : int
- +
- +get_d(D && d) : : int + +get_d(D && d) : int
- +
- +get_d2(D && d) : : int + +get_d2(D && d) : int
- +
- +get_e(E e) : : T + +get_e(E e) : T
- +
- +get_f(const F & f) : : T + +get_f(const F & f) : T
- +
- +get_int_e(const E & e) : : int + +get_int_e(const E & e) : int
- +
- +get_int_e2(E & e) : : int + +get_int_e2(E & e) : int
- +
- +get_int_f(const ABCD::F & f) : : int + +get_int_f(const ABCD::F & f) : int
diff --git a/docs/test_cases/t00014.md b/docs/test_cases/t00014.md index 93ed171b..bc04bc1c 100644 --- a/docs/test_cases/t00014.md +++ b/docs/test_cases/t00014.md @@ -115,7 +115,7 @@ public: "elements": [ { "bases": [], - "display_name": "clanguml::t00014::A", + "display_name": "A", "id": "765890579167335652", "is_abstract": false, "is_nested": false, @@ -175,7 +175,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00014::B", + "display_name": "B", "id": "934136012292043506", "is_abstract": false, "is_nested": false, @@ -210,7 +210,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00014::A", + "display_name": "A", "id": "2186387853087008570", "is_abstract": false, "is_nested": false, @@ -245,7 +245,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00014::A>", + "display_name": "A>", "id": "947292733740993297", "is_abstract": false, "is_nested": false, @@ -287,7 +287,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00014::A", + "display_name": "A", "id": "1700006390494465667", "is_abstract": false, "is_nested": false, @@ -322,7 +322,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00014::A", + "display_name": "A", "id": "2017665567517853203", "is_abstract": false, "is_nested": false, @@ -357,7 +357,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00014::A", + "display_name": "A", "id": "906557320263235873", "is_abstract": false, "is_nested": false, @@ -392,7 +392,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00014::A", + "display_name": "A", "id": "378898020828430636", "is_abstract": false, "is_nested": false, @@ -427,7 +427,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00014::A", + "display_name": "A", "id": "2082013375525130414", "is_abstract": false, "is_nested": false, @@ -462,7 +462,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00014::A", + "display_name": "A", "id": "51978493292659230", "is_abstract": false, "is_nested": false, @@ -497,7 +497,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00014::A", + "display_name": "A", "id": "197769253782961588", "is_abstract": false, "is_nested": false, @@ -532,7 +532,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00014::A", + "display_name": "A", "id": "895940711566401184", "is_abstract": false, "is_nested": false, @@ -567,7 +567,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00014::A>", + "display_name": "A>", "id": "1751732625010742161", "is_abstract": false, "is_nested": false, @@ -609,7 +609,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00014::A", + "display_name": "A", "id": "887121441210847583", "is_abstract": false, "is_nested": false, @@ -644,7 +644,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00014::A", + "display_name": "A", "id": "1119452495635561975", "is_abstract": false, "is_nested": false, @@ -679,7 +679,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00014::A", + "display_name": "A", "id": "340562099063642390", "is_abstract": false, "is_nested": false, @@ -714,7 +714,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00014::A", + "display_name": "A", "id": "1388877149159894665", "is_abstract": false, "is_nested": false, @@ -749,7 +749,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00014::R", + "display_name": "R", "id": "1758213171584933144", "is_abstract": false, "is_nested": false, @@ -971,6 +971,7 @@ public: } ], "name": "t00014_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00014_class.svg b/docs/test_cases/t00014_class.svg index 60207025..8dbf31b8 100644 --- a/docs/test_cases/t00014_class.svg +++ b/docs/test_cases/t00014_class.svg @@ -1,526 +1,426 @@ - + + + + + + + - - - - - - A - - T,P - - - - - - - - p : P - - - - - - - t : T - - + + + + + A + + T,P + + - - - - - - B - - - - - - - - value : std::string - - + + + - - - - - - A - - T,std::string - - - + + p : P - - - - - - A - - T,std::unique_ptr<std::string> - - - + + + - - - - - - A - - long,T - - - + + t : T - - - - - - A - - double,T - - - + + + + + B + + - - - - - - A - - long,U - - - + + + - - - - - - A - - long,bool - - - + + value : std::string - - - - - - A - - double,bool - - - + + + + + A + + T,std::string + + - - - - - - A - - long,float - - - + + + + + A + + T,std::unique_ptr<std::string> + + - - - - - - A - - double,float - - - + + + + + A + + long,T + + - - - - - - A - - bool,std::string - - - + + + + + A + + double,T + + - - - - - - A - - float,std::unique_ptr<std::string> - - - + + + + + A + + long,U + + - - - - - - A - - int,std::string - - - + + + + + A + + long,bool + + - - - - - - A - - std::string,std::string - - - + + + + + A + + double,bool + + - - - - - A - - char,std::string - - - - - - - - A - - wchar_t,std::string - - - - - - - - - R - - T - - - - - - - - abool : APtr<bool> - - - - - - - aboolfloat : AAPtr<bool,float> - - - - - - - afloat : ASharedPtr<float> - - - - - - - atfloat : AAPtr<T,float> - - - - - - - bapair : PairPairBA<bool> - - - - - - - boolstring : A<bool,std::string> - - - - - - - bs : BVector - - - - - - - bs2 : BVector2 - - - - - - - bstringstring : BStringString - - - - - - - cb : SimpleCallback<ACharString> - - - - - - - floatstring : AStringPtr<float> - - - - - - - gcb : GenericCallback<AWCharString> - - - - - - - intstring : AIntString - - - - - - - stringstring : AStringString - - - - - - - vcb : VoidCallback - - - - - - - vps : VectorPtr<B> - - + + + + + A + + long,float + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bapair - - - - - - bs - - - - - - bs2 - - - - - - vps - - - - - - bapair - - - - - - abool - - - - - - aboolfloat - - - - - - aboolfloat - - - - - - atfloat - - - - - - afloat - - - - - - boolstring - - - - - - floatstring - - - - - - intstring - - - - - - stringstring - - - - - - bstringstring - - - - - - atfloat - - - - - - - - - - cb - - - - - - - - - - gcb - + + + + + A + + double,float + + + + + + + + A + + bool,std::string + + + + + + + + A + + float,std::unique_ptr<std::string> + + + + + + + + A + + int,std::string + + + + + + + + A + + std::string,std::string + + + + + + + A + + char,std::string + + + + + + A + + wchar_t,std::string + + + + + + + R + + T + + + + + + + + + abool : APtr<bool> + + + + + + + aboolfloat : AAPtr<bool,float> + + + + + + + afloat : ASharedPtr<float> + + + + + + + atfloat : AAPtr<T,float> + + + + + + + bapair : PairPairBA<bool> + + + + + + + boolstring : A<bool,std::string> + + + + + + + bs : BVector + + + + + + + bs2 : BVector2 + + + + + + + bstringstring : BStringString + + + + + + + cb : SimpleCallback<ACharString> + + + + + + + floatstring : AStringPtr<float> + + + + + + + gcb : GenericCallback<AWCharString> + + + + + + + intstring : AIntString + + + + + + + stringstring : AStringString + + + + + + + vcb : VoidCallback + + + + + + + vps : VectorPtr<B> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bapair + + + + bs + + + + bs2 + + + + vps + + + + bapair + + + + abool + + + + aboolfloat + + + + aboolfloat + + + + atfloat + + + + afloat + + + + boolstring + + + + floatstring + + + + intstring + + + + stringstring + + + + bstringstring + + + + atfloat + + + + + + cb + + + + + + gcb diff --git a/docs/test_cases/t00014_class_mermaid.svg b/docs/test_cases/t00014_class_mermaid.svg index d5b58ad7..4bcc9089 100644 --- a/docs/test_cases/t00014_class_mermaid.svg +++ b/docs/test_cases/t00014_class_mermaid.svg @@ -1,95 +1,90 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -479,7 +474,7 @@ - + @@ -508,7 +503,7 @@ - + @@ -532,7 +527,7 @@ - + @@ -551,7 +546,7 @@ - + @@ -570,7 +565,7 @@ - + @@ -589,7 +584,7 @@ - + @@ -608,7 +603,7 @@ - + @@ -627,7 +622,7 @@ - + @@ -646,7 +641,7 @@ - + @@ -665,7 +660,7 @@ - + @@ -684,7 +679,7 @@ - + @@ -703,7 +698,7 @@ - + @@ -722,7 +717,7 @@ - + @@ -741,7 +736,7 @@ - + @@ -760,7 +755,7 @@ - + @@ -779,7 +774,7 @@ - + @@ -798,7 +793,7 @@ - + @@ -817,7 +812,7 @@ - + diff --git a/docs/test_cases/t00015.md b/docs/test_cases/t00015.md index 395b6ddb..f2490582 100644 --- a/docs/test_cases/t00015.md +++ b/docs/test_cases/t00015.md @@ -55,7 +55,7 @@ class B : public ns1::ns2::Anon { }; "elements": [ { "bases": [], - "display_name": "clanguml::t00015::ns1::A", + "display_name": "ns1::A", "id": "1410694888805149453", "is_abstract": false, "is_nested": false, @@ -77,7 +77,7 @@ class B : public ns1::ns2::Anon { }; }, { "bases": [], - "display_name": "clanguml::t00015::ns1::ns2_v0_9_0::A", + "display_name": "ns1::ns2_v0_9_0::A", "id": "485552648049088863", "is_abstract": false, "is_nested": false, @@ -106,7 +106,7 @@ class B : public ns1::ns2::Anon { }; "name": "clanguml::t00015::ns1::A" } ], - "display_name": "clanguml::t00015::ns1::Anon", + "display_name": "ns1::Anon", "id": "1060731132374575329", "is_abstract": false, "is_nested": false, @@ -135,7 +135,7 @@ class B : public ns1::ns2::Anon { }; "name": "clanguml::t00015::ns1::A" } ], - "display_name": "clanguml::t00015::ns3::ns1::ns2::Anon", + "display_name": "ns3::ns1::ns2::Anon", "id": "1797521288354158629", "is_abstract": false, "is_nested": false, @@ -164,7 +164,7 @@ class B : public ns1::ns2::Anon { }; "name": "clanguml::t00015::ns3::ns1::ns2::Anon" } ], - "display_name": "clanguml::t00015::ns3::B", + "display_name": "ns3::B", "id": "870882387819356092", "is_abstract": false, "is_nested": false, @@ -186,6 +186,7 @@ class B : public ns1::ns2::Anon { }; } ], "name": "t00015_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00015_class.svg b/docs/test_cases/t00015_class.svg index a5b82925..073d3408 100644 --- a/docs/test_cases/t00015_class.svg +++ b/docs/test_cases/t00015_class.svg @@ -1,69 +1,59 @@ - + + + + + + + - - - - - - ns1::A - - - + + + + + ns1::A + + - - - - - - ns1::ns2_v0_9_0::A - - - + + + + + ns1::ns2_v0_9_0::A + + - - - - - - ns1::Anon - - - + + + + + ns1::Anon + + - - - - - - ns3::ns1::ns2::Anon - - - + + + + + ns3::ns1::ns2::Anon + + - - - - - - ns3::B - - - + + + + + ns3::B + + - - - - - - - - - - - - + + + + + + diff --git a/docs/test_cases/t00015_class_mermaid.svg b/docs/test_cases/t00015_class_mermaid.svg index 23dbeb0b..94093f80 100644 --- a/docs/test_cases/t00015_class_mermaid.svg +++ b/docs/test_cases/t00015_class_mermaid.svg @@ -1,63 +1,58 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - + + + @@ -89,7 +84,7 @@ - + @@ -108,7 +103,7 @@ - + @@ -127,7 +122,7 @@ - + @@ -146,7 +141,7 @@ - + @@ -165,7 +160,7 @@ - + diff --git a/docs/test_cases/t00016.md b/docs/test_cases/t00016.md index 756dbe38..3f32887d 100644 --- a/docs/test_cases/t00016.md +++ b/docs/test_cases/t00016.md @@ -56,7 +56,7 @@ template <> struct is_numeric { "elements": [ { "bases": [], - "display_name": "clanguml::t00016::is_numeric", + "display_name": "is_numeric", "id": "932856332558460389", "is_abstract": false, "is_nested": false, @@ -92,7 +92,7 @@ template <> struct is_numeric { }, { "bases": [], - "display_name": "clanguml::t00016::is_numeric", + "display_name": "is_numeric", "id": "95618295648274199", "is_abstract": false, "is_nested": false, @@ -128,7 +128,7 @@ template <> struct is_numeric { }, { "bases": [], - "display_name": "clanguml::t00016::is_numeric", + "display_name": "is_numeric", "id": "979129381790761728", "is_abstract": false, "is_nested": false, @@ -164,7 +164,7 @@ template <> struct is_numeric { }, { "bases": [], - "display_name": "clanguml::t00016::is_numeric", + "display_name": "is_numeric", "id": "2090787690027341836", "is_abstract": false, "is_nested": false, @@ -200,7 +200,7 @@ template <> struct is_numeric { }, { "bases": [], - "display_name": "clanguml::t00016::is_numeric", + "display_name": "is_numeric", "id": "500603075237446075", "is_abstract": false, "is_nested": false, @@ -236,7 +236,7 @@ template <> struct is_numeric { }, { "bases": [], - "display_name": "clanguml::t00016::is_numeric", + "display_name": "is_numeric", "id": "2111316837513419920", "is_abstract": false, "is_nested": false, @@ -272,6 +272,7 @@ template <> struct is_numeric { } ], "name": "t00016_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00016_class.svg b/docs/test_cases/t00016_class.svg index c3606a89..f049ef76 100644 --- a/docs/test_cases/t00016_class.svg +++ b/docs/test_cases/t00016_class.svg @@ -1,111 +1,95 @@ - + + + + + + + - - - - - - is_numeric - - typename - - - - value : enum - + + + + + is_numeric + + typename + + + + value : enum - - - - - - is_numeric - - float - - - - value : enum - + + + + + is_numeric + + float + + + + value : enum - - - - - - is_numeric - - char - - - - value : enum - + + + + + is_numeric + + char + + + + value : enum - - - - - - is_numeric - - unsigned int - - - - value : enum - + + + + + is_numeric + + unsigned int + + + + value : enum - - - - - - is_numeric - - int - - - - value : enum - + + + + + is_numeric + + int + + + + value : enum - - - - - - is_numeric - - bool - - - - value : enum - + + + + + is_numeric + + bool + + + + value : enum - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/docs/test_cases/t00016_class_mermaid.svg b/docs/test_cases/t00016_class_mermaid.svg index 39c39051..5301198e 100644 --- a/docs/test_cases/t00016_class_mermaid.svg +++ b/docs/test_cases/t00016_class_mermaid.svg @@ -1,65 +1,60 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - + + + + + @@ -119,7 +114,7 @@ - + @@ -143,7 +138,7 @@ - + @@ -167,7 +162,7 @@ - + @@ -191,7 +186,7 @@ - + @@ -215,7 +210,7 @@ - + @@ -239,7 +234,7 @@ - + diff --git a/docs/test_cases/t00017.md b/docs/test_cases/t00017.md index 23094b05..ca028a62 100644 --- a/docs/test_cases/t00017.md +++ b/docs/test_cases/t00017.md @@ -84,7 +84,7 @@ private: "elements": [ { "bases": [], - "display_name": "clanguml::t00017::A", + "display_name": "A", "id": "121332093434690887", "is_abstract": false, "is_nested": false, @@ -106,7 +106,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00017::B", + "display_name": "B", "id": "1424864837456200487", "is_abstract": false, "is_nested": false, @@ -128,7 +128,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00017::C", + "display_name": "C", "id": "2151170391844743478", "is_abstract": false, "is_nested": false, @@ -150,7 +150,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00017::D", + "display_name": "D", "id": "1378112127131766972", "is_abstract": false, "is_nested": false, @@ -172,7 +172,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00017::E", + "display_name": "E", "id": "1535300935831802489", "is_abstract": false, "is_nested": false, @@ -194,7 +194,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00017::F", + "display_name": "F", "id": "1803800465279710134", "is_abstract": false, "is_nested": false, @@ -216,7 +216,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00017::G", + "display_name": "G", "id": "1135797791892670246", "is_abstract": false, "is_nested": false, @@ -238,7 +238,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00017::H", + "display_name": "H", "id": "1243547836571712317", "is_abstract": false, "is_nested": false, @@ -260,7 +260,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00017::I", + "display_name": "I", "id": "387733199705628658", "is_abstract": false, "is_nested": false, @@ -282,7 +282,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00017::J", + "display_name": "J", "id": "747991828672433537", "is_abstract": false, "is_nested": false, @@ -304,7 +304,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00017::K", + "display_name": "K", "id": "1783571342994833467", "is_abstract": false, "is_nested": false, @@ -326,7 +326,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00017::R", + "display_name": "R", "id": "287495916564113342", "is_abstract": false, "is_nested": false, @@ -577,6 +577,7 @@ private: } ], "name": "t00017_class", + "package_type": "namespace", "relationships": [ { "access": "private", diff --git a/docs/test_cases/t00017_class.svg b/docs/test_cases/t00017_class.svg index 27975de0..4b59c1d3 100644 --- a/docs/test_cases/t00017_class.svg +++ b/docs/test_cases/t00017_class.svg @@ -1,217 +1,177 @@ - + + + + + + + - - - - - - A - - - + + + + + A + + - - - - - - B - - - + + + + + B + + - - - - - - C - - - + + + + + C + + - - - - - - D - - - + + + + + D + + - - - - - - E - - - + + + + + E + + - - - - - - F - - - + + + + + F + + - - - - - - G - - - + + + + + G + + - - - - - - H - - - + + + + + H + + - - - - - - I - - - + + + + + I + + - - - - - - J - - - + + + + + J + + - - - - - - K - - - + + + + + K + + - - - - - - R - - - - - - - R(int & some_int, C & cc, const E & ee, F && ff, I *& ii) : void - - - - - - - - some_int : int - - - - - - - some_int_pointer : int * - - - - - - - some_int_pointer_pointer : int ** - - - - - - - some_int_reference : int & - - + + + + + R + - - - - -a - - - - - -b - - - - - -c - - - - - -d - - - - - -e - - - - - -f - - - - - -g - - - - - -h - - - - - -i - - - - - -j - - - - - -k - + + + + + + R(int & some_int, C & cc, const E & ee, F && ff, I *& ii) : void + + + + + + + + some_int : int + + + + + + + some_int_pointer : int * + + + + + + + some_int_pointer_pointer : int ** + + + + + + + some_int_reference : int & + + + + -a + + + -b + + + -c + + + -d + + + -e + + + -f + + + -g + + + -h + + + -i + + + -j + + + -k diff --git a/docs/test_cases/t00017_class_mermaid.svg b/docs/test_cases/t00017_class_mermaid.svg index adea92c5..312c0448 100644 --- a/docs/test_cases/t00017_class_mermaid.svg +++ b/docs/test_cases/t00017_class_mermaid.svg @@ -1,71 +1,66 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - - - - + + + + + + + + + + + @@ -191,7 +186,7 @@ - + @@ -210,7 +205,7 @@ - + @@ -229,7 +224,7 @@ - + @@ -248,7 +243,7 @@ - + @@ -267,7 +262,7 @@ - + @@ -286,7 +281,7 @@ - + @@ -305,7 +300,7 @@ - + @@ -324,7 +319,7 @@ - + @@ -343,7 +338,7 @@ - + @@ -362,7 +357,7 @@ - + @@ -381,7 +376,7 @@ - + @@ -400,11 +395,11 @@ - + - - - + + +
@@ -416,29 +411,29 @@ R
- +
-some_int : int
- +
- -some_int_pointer : int + -some_int_pointer : int
- +
-some_int_pointer_pointer : int *
- +
-some_int_reference : int &
- +
- -R(int & some_int, C & cc, const E & ee, F && ff, I *& ii) : : void + -R(int & some_int, C & cc, const E & ee, F && ff, I *& ii) : void
diff --git a/docs/test_cases/t00018.md b/docs/test_cases/t00018.md index d9e5d875..3b358daa 100644 --- a/docs/test_cases/t00018.md +++ b/docs/test_cases/t00018.md @@ -141,7 +141,7 @@ void widget::draw(const clanguml::t00018::widget &w) "elements": [ { "bases": [], - "display_name": "clanguml::t00018::impl::widget", + "display_name": "impl::widget", "id": "130502639682787993", "is_abstract": false, "is_nested": false, @@ -270,7 +270,7 @@ void widget::draw(const clanguml::t00018::widget &w) }, { "bases": [], - "display_name": "clanguml::t00018::widget", + "display_name": "widget", "id": "1005661284373854088", "is_abstract": false, "is_nested": false, @@ -565,6 +565,7 @@ void widget::draw(const clanguml::t00018::widget &w) } ], "name": "t00018_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00018_class.svg b/docs/test_cases/t00018_class.svg index a7fbcc88..e057e753 100644 --- a/docs/test_cases/t00018_class.svg +++ b/docs/test_cases/t00018_class.svg @@ -1,138 +1,136 @@ - + + + + + + + - - - - - - impl::widget - - - - - - - widget(int n) : void - - - - - - - - draw(const widget & w) const : void - - - - - - - draw(const widget & w) : void - - - - - - - - n : int - - + + + + + impl::widget + - - - - - - widget - - - - - - - widget(int) : void - - - - - - - widget(widget &&) : void - - - - - - - widget(const widget &) = deleted : void - - - - - - - ~widget() : void - - - - - - - - operator=(widget &&) : widget & - - - - - - - operator=(const widget &) = deleted : widget & - - - - - - - - draw() const : void - - - - - - - draw() : void - - - - - - - shown() const : bool - - - - - - - - pImpl : std::unique_ptr<impl::widget> - - + + + - - - - - - - - - pImpl - + + widget(int n) : void + + + + + + + + draw(const widget & w) const : void + + + + + + + draw(const widget & w) : void + + + + + + + + n : int + + + + + + widget + + + + + + + + widget(int) : void + + + + + + + widget(widget &&) : void + + + + + + + widget(const widget &) = deleted : void + + + + + + + ~widget() : void + + + + + + + + operator=(widget &&) : widget & + + + + + + + operator=(const widget &) = deleted : widget & + + + + + + + + draw() const : void + + + + + + + draw() : void + + + + + + + shown() const : bool + + + + + + + + pImpl : std::unique_ptr<impl::widget> + + + + + + + pImpl diff --git a/docs/test_cases/t00018_class_mermaid.svg b/docs/test_cases/t00018_class_mermaid.svg index 322ffe3d..5a941d07 100644 --- a/docs/test_cases/t00018_class_mermaid.svg +++ b/docs/test_cases/t00018_class_mermaid.svg @@ -1,62 +1,57 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - + + @@ -70,7 +65,7 @@ - +
@@ -83,11 +78,11 @@ - + - - - + + +
@@ -99,34 +94,34 @@ impl::widget
- +
-n : int
- +
- +widget(int n) : : void + +widget(int n) : void
- +
- +draw(const widget & w) : : [const] void + +draw(const widget & w) : [const] void
- +
- +draw(const widget & w) : : void + +draw(const widget & w) : void
- + - - - + + +
@@ -138,54 +133,54 @@ widget
- +
-pImpl : std::unique_ptr<impl::widget>
- +
- +widget(int) : : void + +widget(int) : void
- +
- +widget(widget &&) : : void + +widget(widget &&) : void
- +
- +widget(const widget &) : : void + +widget(const widget &) : void
- +
- +~widget() : : void + +~widget() : void
- +
- +operator=(widget &&) : : widget & + +operator=(widget &&) : widget &
- +
- +operator=(const widget &) : : widget & + +operator=(const widget &) : widget &
- +
- +draw() : : [const] void + +draw() : [const] void
- +
- +draw() : : void + +draw() : void
- +
- +shown() : : [const] bool + +shown() : [const] bool
diff --git a/docs/test_cases/t00019.md b/docs/test_cases/t00019.md index e376b36b..94c5ffe0 100644 --- a/docs/test_cases/t00019.md +++ b/docs/test_cases/t00019.md @@ -14,43 +14,6 @@ diagrams: ``` ## Source code -File `tests/t00019/t00019_layer3.h` -```cpp -#pragma once - -#include - -namespace clanguml { -namespace t00019 { - -template class Layer3 : public LowerLayer { - - using LowerLayer::LowerLayer; - - virtual int m1() override - { - m_m1_calls++; - return LowerLayer::m1(); - } - - virtual std::string m2() override - { - m_m2_calls++; - return LowerLayer::m2(); - } - - int m1_calls() const { return m_m1_calls; } - - int m2_calls() const { return m_m2_calls; } - -private: - int m_m1_calls{}; - int m_m2_calls{}; -}; -} -} - -``` File `tests/t00019/t00019_layer1.h` ```cpp #pragma once @@ -100,29 +63,6 @@ public: } } -``` -File `tests/t00019/t00019_base.h` -```cpp -#pragma once - -#include - -namespace clanguml { -namespace t00019 { - -class Base { - - Base() = default; - - virtual ~Base() = default; - - virtual int m1() { return 2; } - - virtual std::string m2() { return "two"; } -}; -} -} - ``` File `tests/t00019/t00019_layer2.h` ```cpp @@ -147,6 +87,66 @@ template class Layer2 : public LowerLayer { } } +``` +File `tests/t00019/t00019_layer3.h` +```cpp +#pragma once + +#include + +namespace clanguml { +namespace t00019 { + +template class Layer3 : public LowerLayer { + + using LowerLayer::LowerLayer; + + virtual int m1() override + { + m_m1_calls++; + return LowerLayer::m1(); + } + + virtual std::string m2() override + { + m_m2_calls++; + return LowerLayer::m2(); + } + + int m1_calls() const { return m_m1_calls; } + + int m2_calls() const { return m_m2_calls; } + +private: + int m_m1_calls{}; + int m_m2_calls{}; +}; +} +} + +``` +File `tests/t00019/t00019_base.h` +```cpp +#pragma once + +#include + +namespace clanguml { +namespace t00019 { + +class Base { + + Base() = default; + + virtual ~Base() = default; + + virtual int m1() { return 2; } + + virtual std::string m2() { return "two"; } +}; +} +} + ``` ## Generated PlantUML diagrams ![t00019_class](./t00019_class.svg "Layercake pattern") @@ -159,7 +159,7 @@ template class Layer2 : public LowerLayer { "elements": [ { "bases": [], - "display_name": "clanguml::t00019::Base", + "display_name": "Base", "id": "261668487476634123", "is_abstract": false, "is_nested": false, @@ -286,7 +286,7 @@ template class Layer2 : public LowerLayer { }, { "bases": [], - "display_name": "clanguml::t00019::Layer1", + "display_name": "Layer1", "id": "902631298537519271", "is_abstract": false, "is_nested": false, @@ -368,7 +368,7 @@ template class Layer2 : public LowerLayer { }, { "bases": [], - "display_name": "clanguml::t00019::Layer2", + "display_name": "Layer2", "id": "1115150925302580647", "is_abstract": false, "is_nested": false, @@ -424,7 +424,7 @@ template class Layer2 : public LowerLayer { }, { "bases": [], - "display_name": "clanguml::t00019::Layer3", + "display_name": "Layer3", "id": "1853410560073854945", "is_abstract": false, "is_nested": false, @@ -590,7 +590,7 @@ template class Layer2 : public LowerLayer { "name": "clanguml::t00019::Base" } ], - "display_name": "clanguml::t00019::Layer3", + "display_name": "Layer3", "id": "972890420743280319", "is_abstract": false, "is_nested": false, @@ -604,7 +604,7 @@ template class Layer2 : public LowerLayer { "source_location": { "column": 11, "file": "", - "line": 277, + "line": 269, "translation_unit": "t00019.cc" }, "template_parameters": [ @@ -626,7 +626,7 @@ template class Layer2 : public LowerLayer { "name": "clanguml::t00019::Layer3" } ], - "display_name": "clanguml::t00019::Layer2>", + "display_name": "Layer2>", "id": "129784999866998870", "is_abstract": false, "is_nested": false, @@ -640,7 +640,7 @@ template class Layer2 : public LowerLayer { "source_location": { "column": 11, "file": "", - "line": 277, + "line": 269, "translation_unit": "t00019.cc" }, "template_parameters": [ @@ -669,7 +669,7 @@ template class Layer2 : public LowerLayer { "name": "clanguml::t00019::Layer2>" } ], - "display_name": "clanguml::t00019::Layer1>>", + "display_name": "Layer1>>", "id": "659076058325663708", "is_abstract": false, "is_nested": false, @@ -683,7 +683,7 @@ template class Layer2 : public LowerLayer { "source_location": { "column": 11, "file": "", - "line": 277, + "line": 269, "translation_unit": "t00019.cc" }, "template_parameters": [ @@ -712,7 +712,7 @@ template class Layer2 : public LowerLayer { }, { "bases": [], - "display_name": "clanguml::t00019::A", + "display_name": "A", "id": "1015164998787089197", "is_abstract": false, "is_nested": false, @@ -747,6 +747,7 @@ template class Layer2 : public LowerLayer { } ], "name": "t00019_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00019_class.svg b/docs/test_cases/t00019_class.svg index a028924b..973774db 100644 --- a/docs/test_cases/t00019_class.svg +++ b/docs/test_cases/t00019_class.svg @@ -1,222 +1,198 @@ - + + + + + + + - - - - - - Base - - - - - - - Base() = default : void - - - - - - - ~Base() constexpr = default : void - - - - - - - - m1() : int - - - - - - - m2() : std::string - - - + + + + + Base + - - - - - - Layer1 - - LowerLayer - - - - - - - m1() : int - - - - - - - m2() : std::string - - - + + + - - - - - - Layer2 - - LowerLayer - - - - - - - all_calls_count() const : int - - - + + Base() = default : void - - - - - - Layer3 - - LowerLayer - - - - - - - m1() : int - - - - - - - m1_calls() const : int - - - - - - - m2() : std::string - - - - - - - m2_calls() const : int - - - - - - - - m_m1_calls : int - - - - - - - m_m2_calls : int - - + + + - - - - - Layer3 - - Base - - - - - - - - Layer2 - - Layer3<Base> - - - - - - - - Layer1 - - Layer2<Layer3<Base>> - - - - - - - - - A - - - - - - - - layers : std::unique_ptr<Layer1<Layer2<Layer3<Base>>>> - - + + ~Base() constexpr = default : void - - - - - - - - - - - - - - - - - - - - - - - - - - - - - layers - + + + + + + + m1() : int + + + + + + + m2() : std::string + + + + + + + Layer1 + + LowerLayer + + + + + + + + m1() : int + + + + + + + m2() : std::string + + + + + + + Layer2 + + LowerLayer + + + + + + + + all_calls_count() const : int + + + + + + + Layer3 + + LowerLayer + + + + + + + + m1() : int + + + + + + + m1_calls() const : int + + + + + + + m2() : std::string + + + + + + + m2_calls() const : int + + + + + + + + m_m1_calls : int + + + + + + + m_m2_calls : int + + + + + Layer3 + + Base + + + + + + Layer2 + + Layer3<Base> + + + + + + Layer1 + + Layer2<Layer3<Base>> + + + + + + + A + + + + + + + + + layers : std::unique_ptr<Layer1<Layer2<Layer3<Base>>>> + + + + + + + + + + + + + + + + + layers diff --git a/docs/test_cases/t00019_class_mermaid.svg b/docs/test_cases/t00019_class_mermaid.svg index d5c02ec1..ab2d4cc5 100644 --- a/docs/test_cases/t00019_class_mermaid.svg +++ b/docs/test_cases/t00019_class_mermaid.svg @@ -1,67 +1,62 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - + + + + + + + @@ -124,7 +119,7 @@ - + - +
- -m1() : : int + -m1() : int
- +
- -m2() : : std::string + -m2() : std::string
- + - - - + + +
@@ -221,19 +216,19 @@ Layer2<LowerLayer>
- +
- -all_calls_count() : : [const] int + -all_calls_count() : [const] int
- + - - - + + +
@@ -245,40 +240,40 @@ Layer3<LowerLayer>
- +
-m_m1_calls : int
- +
-m_m2_calls : int
- +
- -m1() : : int + -m1() : int
- +
- -m1_calls() : : [const] int + -m1_calls() : [const] int
- +
- -m2() : : std::string + -m2() : std::string
- +
- -m2_calls() : : [const] int + -m2_calls() : [const] int
- + @@ -297,7 +292,7 @@ - + @@ -316,7 +311,7 @@ - + @@ -335,7 +330,7 @@ - + diff --git a/docs/test_cases/t00020.md b/docs/test_cases/t00020.md index 80829fbb..7a3b031a 100644 --- a/docs/test_cases/t00020.md +++ b/docs/test_cases/t00020.md @@ -104,7 +104,7 @@ public: "elements": [ { "bases": [], - "display_name": "clanguml::t00020::ProductA", + "display_name": "ProductA", "id": "425267229659464944", "is_abstract": true, "is_nested": false, @@ -191,7 +191,7 @@ public: "name": "clanguml::t00020::ProductA" } ], - "display_name": "clanguml::t00020::ProductA1", + "display_name": "ProductA1", "id": "1756496029797864207", "is_abstract": false, "is_nested": false, @@ -252,7 +252,7 @@ public: "name": "clanguml::t00020::ProductA" } ], - "display_name": "clanguml::t00020::ProductA2", + "display_name": "ProductA2", "id": "1531708592885216981", "is_abstract": false, "is_nested": false, @@ -306,7 +306,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00020::ProductB", + "display_name": "ProductB", "id": "2235759006374865842", "is_abstract": true, "is_nested": false, @@ -393,7 +393,7 @@ public: "name": "clanguml::t00020::ProductB" } ], - "display_name": "clanguml::t00020::ProductB1", + "display_name": "ProductB1", "id": "1465493024233223845", "is_abstract": false, "is_nested": false, @@ -454,7 +454,7 @@ public: "name": "clanguml::t00020::ProductB" } ], - "display_name": "clanguml::t00020::ProductB2", + "display_name": "ProductB2", "id": "2154665562370057871", "is_abstract": false, "is_nested": false, @@ -508,7 +508,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00020::AbstractFactory", + "display_name": "AbstractFactory", "id": "1705546469218961425", "is_abstract": true, "is_nested": false, @@ -590,7 +590,7 @@ public: "name": "clanguml::t00020::AbstractFactory" } ], - "display_name": "clanguml::t00020::Factory1", + "display_name": "Factory1", "id": "692346848484854107", "is_abstract": false, "is_nested": false, @@ -672,7 +672,7 @@ public: "name": "clanguml::t00020::AbstractFactory" } ], - "display_name": "clanguml::t00020::Factory2", + "display_name": "Factory2", "id": "1566325870805013023", "is_abstract": false, "is_nested": false, @@ -747,6 +747,7 @@ public: } ], "name": "t00020_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00020_class.svg b/docs/test_cases/t00020_class.svg index 4f36cd93..9a9567ae 100644 --- a/docs/test_cases/t00020_class.svg +++ b/docs/test_cases/t00020_class.svg @@ -1,261 +1,217 @@ - + + + + + + + - - - - - - ProductA - - - - - - - ~ProductA() constexpr = default : void - - - - - - - - sell(int price) const = 0 : bool - - - + + + + + ProductA + - - - - - - ProductA1 - - - - - - - sell(int price) const : bool - - - + + + - - - - - - ProductA2 - - - - - - - sell(int price) const : bool - - - + + ~ProductA() constexpr = default : void - - - - - - ProductB - - - - - - - ~ProductB() constexpr = default : void - - - - - - - - buy(int price) const = 0 : bool - - - + + + + - - - - - - ProductB1 - - - - - - - buy(int price) const : bool - - - + + sell(int price) const = 0 : bool - - - - - - ProductB2 - - - - - - - buy(int price) const : bool - - - + + + + + + ProductA1 + - - - - - - AbstractFactory - - - - - - - make_a() const = 0 : std::unique_ptr<ProductA> - - - - - - - make_b() const = 0 : std::unique_ptr<ProductB> - - - + + + - - - - - - Factory1 - - - - - - - make_a() const : std::unique_ptr<ProductA> - - - - - - - make_b() const : std::unique_ptr<ProductB> - - - + + sell(int price) const : bool - - - - - - Factory2 - - - - - - - make_a() const : std::unique_ptr<ProductA> - - - - - - - make_b() const : std::unique_ptr<ProductB> - - - + + + + + + ProductA2 + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + sell(int price) const : bool + + + + + + + ProductB + + + + + + + + ~ProductB() constexpr = default : void + + + + + + + + buy(int price) const = 0 : bool + + + + + + + ProductB1 + + + + + + + + buy(int price) const : bool + + + + + + + ProductB2 + + + + + + + + buy(int price) const : bool + + + + + + + AbstractFactory + + + + + + + + make_a() const = 0 : std::unique_ptr<ProductA> + + + + + + + make_b() const = 0 : std::unique_ptr<ProductB> + + + + + + + Factory1 + + + + + + + + make_a() const : std::unique_ptr<ProductA> + + + + + + + make_b() const : std::unique_ptr<ProductB> + + + + + + + Factory2 + + + + + + + + make_a() const : std::unique_ptr<ProductA> + + + + + + + make_b() const : std::unique_ptr<ProductB> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/test_cases/t00020_class_mermaid.svg b/docs/test_cases/t00020_class_mermaid.svg index 5e5b2c89..c7cc3dad 100644 --- a/docs/test_cases/t00020_class_mermaid.svg +++ b/docs/test_cases/t00020_class_mermaid.svg @@ -1,72 +1,67 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -191,11 +186,11 @@ - + - - - + + +
@@ -207,24 +202,24 @@ ProductA
- +
- +~ProductA() : : [default,constexpr] void + +~ProductA() : [default,constexpr] void
- +
- +sell(int price) : : [const] bool + +sell(int price) : [const] bool
- + - - - + + +
@@ -236,19 +231,19 @@ ProductA1
- +
- +sell(int price) : : [const] bool + +sell(int price) : [const] bool
- + - - - + + +
@@ -260,19 +255,19 @@ ProductA2
- +
- +sell(int price) : : [const] bool + +sell(int price) : [const] bool
- + - - - + + +
@@ -284,24 +279,24 @@ ProductB
- +
- +~ProductB() : : [default,constexpr] void + +~ProductB() : [default,constexpr] void
- +
- +buy(int price) : : [const] bool + +buy(int price) : [const] bool
- + - - - + + +
@@ -313,19 +308,19 @@ ProductB1
- +
- +buy(int price) : : [const] bool + +buy(int price) : [const] bool
- + - - - + + +
@@ -337,19 +332,19 @@ ProductB2
- +
- +buy(int price) : : [const] bool + +buy(int price) : [const] bool
- + - - - + + +
@@ -361,24 +356,24 @@ AbstractFactory
- +
- +make_a() : : [const] std::unique_ptr<ProductA> + +make_a() : [const] std::unique_ptr<ProductA>
- +
- +make_b() : : [const] std::unique_ptr<ProductB> + +make_b() : [const] std::unique_ptr<ProductB>
- + - - - + + +
@@ -390,24 +385,24 @@ Factory1
- +
- +make_a() : : [const] std::unique_ptr<ProductA> + +make_a() : [const] std::unique_ptr<ProductA>
- +
- +make_b() : : [const] std::unique_ptr<ProductB> + +make_b() : [const] std::unique_ptr<ProductB>
- + - - - + + +
@@ -419,14 +414,14 @@ Factory2
- +
- +make_a() : : [const] std::unique_ptr<ProductA> + +make_a() : [const] std::unique_ptr<ProductA>
- +
- +make_b() : : [const] std::unique_ptr<ProductB> + +make_b() : [const] std::unique_ptr<ProductB>
diff --git a/docs/test_cases/t00021.md b/docs/test_cases/t00021.md index 9cce1b0a..f67c0a26 100644 --- a/docs/test_cases/t00021.md +++ b/docs/test_cases/t00021.md @@ -78,7 +78,7 @@ public: "elements": [ { "bases": [], - "display_name": "clanguml::t00021::Visitor", + "display_name": "Visitor", "id": "1668671110672744395", "is_abstract": true, "is_nested": false, @@ -196,7 +196,7 @@ public: "name": "clanguml::t00021::Visitor" } ], - "display_name": "clanguml::t00021::Visitor1", + "display_name": "Visitor1", "id": "1028369219400401946", "is_abstract": false, "is_nested": false, @@ -288,7 +288,7 @@ public: "name": "clanguml::t00021::Visitor" } ], - "display_name": "clanguml::t00021::Visitor2", + "display_name": "Visitor2", "id": "1710373315476287130", "is_abstract": false, "is_nested": false, @@ -380,7 +380,7 @@ public: "name": "clanguml::t00021::Visitor" } ], - "display_name": "clanguml::t00021::Visitor3", + "display_name": "Visitor3", "id": "1399026228179178025", "is_abstract": false, "is_nested": false, @@ -465,7 +465,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00021::Item", + "display_name": "Item", "id": "1491568826758947722", "is_abstract": true, "is_nested": false, @@ -552,7 +552,7 @@ public: "name": "clanguml::t00021::Item" } ], - "display_name": "clanguml::t00021::A", + "display_name": "A", "id": "1494142745564026823", "is_abstract": false, "is_nested": false, @@ -613,7 +613,7 @@ public: "name": "clanguml::t00021::Item" } ], - "display_name": "clanguml::t00021::B", + "display_name": "B", "id": "1452948650450999568", "is_abstract": false, "is_nested": false, @@ -667,6 +667,7 @@ public: } ], "name": "t00021_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00021_class.svg b/docs/test_cases/t00021_class.svg index 0002d50e..f70b1f1f 100644 --- a/docs/test_cases/t00021_class.svg +++ b/docs/test_cases/t00021_class.svg @@ -1,234 +1,194 @@ - + + + + + + + - - - - - - Visitor - - - - - - - ~Visitor() constexpr = default : void - - - - - - - - visit_A(const A & item) const = 0 : void - - - - - - - visit_B(const B & item) const = 0 : void - - - + + + + + Visitor + - - - - - - Visitor1 - - - - - - - visit_A(const A & item) const : void - - - - - - - visit_B(const B & item) const : void - - - + + + - - - - - - Visitor2 - - - - - - - visit_A(const A & item) const : void - - - - - - - visit_B(const B & item) const : void - - - + + ~Visitor() constexpr = default : void - - - - - - Visitor3 - - - - - - - visit_A(const A & item) const : void - - - - - - - visit_B(const B & item) const : void - - - + + + + - - - - - - Item - - - - - - - ~Item() constexpr = default : void - - - - - - - - accept(const Visitor & visitor) const = 0 : void - - - + + visit_A(const A & item) const = 0 : void - - - - - - A - - - - - - - accept(const Visitor & visitor) const : void - - - + + + - - - - - - B - - - - - - - accept(const Visitor & visitor) const : void - - - + + visit_B(const B & item) const = 0 : void - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + Visitor1 + + + + + + + + visit_A(const A & item) const : void + + + + + + + visit_B(const B & item) const : void + + + + + + + Visitor2 + + + + + + + + visit_A(const A & item) const : void + + + + + + + visit_B(const B & item) const : void + + + + + + + Visitor3 + + + + + + + + visit_A(const A & item) const : void + + + + + + + visit_B(const B & item) const : void + + + + + + + Item + + + + + + + + ~Item() constexpr = default : void + + + + + + + + accept(const Visitor & visitor) const = 0 : void + + + + + + + A + + + + + + + + accept(const Visitor & visitor) const : void + + + + + + + B + + + + + + + + accept(const Visitor & visitor) const : void + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/test_cases/t00021_class_mermaid.svg b/docs/test_cases/t00021_class_mermaid.svg index a8fb772c..40c75c43 100644 --- a/docs/test_cases/t00021_class_mermaid.svg +++ b/docs/test_cases/t00021_class_mermaid.svg @@ -1,76 +1,71 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -241,11 +236,11 @@ - + - - - + + +
@@ -257,29 +252,29 @@ Visitor
- +
- +~Visitor() : : [default,constexpr] void + +~Visitor() : [default,constexpr] void
- +
- +visit_A(const A & item) : : [const] void + +visit_A(const A & item) : [const] void
- +
- +visit_B(const B & item) : : [const] void + +visit_B(const B & item) : [const] void
- + - - - + + +
@@ -291,24 +286,24 @@ Visitor1
- +
- +visit_A(const A & item) : : [const] void + +visit_A(const A & item) : [const] void
- +
- +visit_B(const B & item) : : [const] void + +visit_B(const B & item) : [const] void
- + - - - + + +
@@ -320,24 +315,24 @@ Visitor2
- +
- +visit_A(const A & item) : : [const] void + +visit_A(const A & item) : [const] void
- +
- +visit_B(const B & item) : : [const] void + +visit_B(const B & item) : [const] void
- + - - - + + +
@@ -349,24 +344,24 @@ Visitor3
- +
- +visit_A(const A & item) : : [const] void + +visit_A(const A & item) : [const] void
- +
- +visit_B(const B & item) : : [const] void + +visit_B(const B & item) : [const] void
- + - - - + + +
@@ -378,24 +373,24 @@ Item
- +
- +~Item() : : [default,constexpr] void + +~Item() : [default,constexpr] void
- +
- +accept(const Visitor & visitor) : : [const] void + +accept(const Visitor & visitor) : [const] void
- + - - - + + +
@@ -407,19 +402,19 @@ A
- +
- +accept(const Visitor & visitor) : : [const] void + +accept(const Visitor & visitor) : [const] void
- + - - - + + +
@@ -431,9 +426,9 @@ B
- +
- +accept(const Visitor & visitor) : : [const] void + +accept(const Visitor & visitor) : [const] void
diff --git a/docs/test_cases/t00022.md b/docs/test_cases/t00022.md index ed51033b..f3f741e2 100644 --- a/docs/test_cases/t00022.md +++ b/docs/test_cases/t00022.md @@ -59,7 +59,7 @@ protected: "elements": [ { "bases": [], - "display_name": "clanguml::t00022::A", + "display_name": "A", "id": "2012435893382068755", "is_abstract": true, "is_nested": false, @@ -167,7 +167,7 @@ protected: "name": "clanguml::t00022::A" } ], - "display_name": "clanguml::t00022::A1", + "display_name": "A1", "id": "2282061426381077447", "is_abstract": false, "is_nested": false, @@ -249,7 +249,7 @@ protected: "name": "clanguml::t00022::A" } ], - "display_name": "clanguml::t00022::A2", + "display_name": "A2", "id": "158819862916671538", "is_abstract": false, "is_nested": false, @@ -324,6 +324,7 @@ protected: } ], "name": "t00022_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00022_class.svg b/docs/test_cases/t00022_class.svg index c76e6ef0..0ae05e6a 100644 --- a/docs/test_cases/t00022_class.svg +++ b/docs/test_cases/t00022_class.svg @@ -1,94 +1,90 @@ - + + + + + + + - - - - - - A - - - - - - - method1() = 0 : void - - - - - - - method2() = 0 : void - - - - - - - template_method() : void - - - + + + + + A + - - - - - - A1 - - - - - - - method1() : void - - - - - - - method2() : void - - - + + + - - - - - - A2 - - - - - - - method1() : void - - - - - - - method2() : void - - - + + method1() = 0 : void - - - - - - - - + + + + + + method2() = 0 : void + + + + + + + template_method() : void + + + + + + + A1 + + + + + + + + method1() : void + + + + + + + method2() : void + + + + + + + A2 + + + + + + + + method1() : void + + + + + + + method2() : void + + + + + + diff --git a/docs/test_cases/t00022_class_mermaid.svg b/docs/test_cases/t00022_class_mermaid.svg index e25823f5..0d7761de 100644 --- a/docs/test_cases/t00022_class_mermaid.svg +++ b/docs/test_cases/t00022_class_mermaid.svg @@ -1,62 +1,57 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - + + @@ -79,11 +74,11 @@ - + - - - + + +
@@ -95,29 +90,29 @@ A
- +
- #method1() : : void + #method1() : void
- +
- #method2() : : void + #method2() : void
- +
- +template_method() : : void + +template_method() : void
- + - - - + + +
@@ -129,24 +124,24 @@ A1
- +
- #method1() : : void + #method1() : void
- +
- #method2() : : void + #method2() : void
- + - - - + + +
@@ -158,14 +153,14 @@ A2
- +
- #method1() : : void + #method1() : void
- +
- #method2() : : void + #method2() : void
diff --git a/docs/test_cases/t00023.md b/docs/test_cases/t00023.md index 9b9afebd..2ac5d7d8 100644 --- a/docs/test_cases/t00023.md +++ b/docs/test_cases/t00023.md @@ -68,7 +68,7 @@ private: "elements": [ { "bases": [], - "display_name": "clanguml::t00023::Strategy", + "display_name": "Strategy", "id": "1469857696438841976", "is_abstract": true, "is_nested": false, @@ -150,7 +150,7 @@ private: "name": "clanguml::t00023::Strategy" } ], - "display_name": "clanguml::t00023::StrategyA", + "display_name": "StrategyA", "id": "1245533075819635385", "is_abstract": false, "is_nested": false, @@ -206,7 +206,7 @@ private: "name": "clanguml::t00023::Strategy" } ], - "display_name": "clanguml::t00023::StrategyB", + "display_name": "StrategyB", "id": "264986406899645", "is_abstract": false, "is_nested": false, @@ -262,7 +262,7 @@ private: "name": "clanguml::t00023::Strategy" } ], - "display_name": "clanguml::t00023::StrategyC", + "display_name": "StrategyC", "id": "174795176193483089", "is_abstract": false, "is_nested": false, @@ -311,7 +311,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00023::Context", + "display_name": "Context", "id": "2038594012979479050", "is_abstract": false, "is_nested": false, @@ -404,6 +404,7 @@ private: } ], "name": "t00023_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00023_class.svg b/docs/test_cases/t00023_class.svg index cd26f024..e21c22a4 100644 --- a/docs/test_cases/t00023_class.svg +++ b/docs/test_cases/t00023_class.svg @@ -1,133 +1,121 @@ - + + + + + + + - - - - - - Strategy - - - - - - - ~Strategy() constexpr = default : void - - - - - - - - algorithm() = 0 : void - - - + + + + + Strategy + - - - - - - StrategyA - - - - - - - algorithm() : void - - - + + + - - - - - - StrategyB - - - - - - - algorithm() : void - - - + + ~Strategy() constexpr = default : void - - - - - - StrategyC - - - - - - - algorithm() : void - - - + + + + - - - - - - Context - - - - - - - Context(std::unique_ptr<Strategy> strategy) : void - - - - - - - - apply() : void - - - - - - - - m_strategy : std::unique_ptr<Strategy> - - + + algorithm() = 0 : void - - - - - - - - - - - - - - - - - m_strategy - + + + + + + StrategyA + + + + + + + + algorithm() : void + + + + + + + StrategyB + + + + + + + + algorithm() : void + + + + + + + StrategyC + + + + + + + + algorithm() : void + + + + + + + Context + + + + + + + + Context(std::unique_ptr<Strategy> strategy) : void + + + + + + + + apply() : void + + + + + + + + m_strategy : std::unique_ptr<Strategy> + + + + + + + + + + + m_strategy diff --git a/docs/test_cases/t00023_class_mermaid.svg b/docs/test_cases/t00023_class_mermaid.svg index 48aa8304..d9ca6f01 100644 --- a/docs/test_cases/t00023_class_mermaid.svg +++ b/docs/test_cases/t00023_class_mermaid.svg @@ -1,64 +1,59 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - + + + + @@ -88,7 +83,7 @@ - +
@@ -101,11 +96,11 @@ - + - - - + + +
@@ -117,24 +112,24 @@ Strategy
- +
- +~Strategy() : : [default,constexpr] void + +~Strategy() : [default,constexpr] void
- +
- +algorithm() : : void + +algorithm() : void
- + - - - + + +
@@ -146,19 +141,19 @@ StrategyA
- +
- +algorithm() : : void + +algorithm() : void
- + - - - + + +
@@ -170,19 +165,19 @@ StrategyB
- +
- +algorithm() : : void + +algorithm() : void
- + - - - + + +
@@ -194,19 +189,19 @@ StrategyC
- +
- +algorithm() : : void + +algorithm() : void
- + - - - + + +
@@ -218,19 +213,19 @@ Context
- +
-m_strategy : std::unique_ptr<Strategy>
- +
- +Context(std::unique_ptr strategy) : : void + +Context(std::unique_ptr strategy) : void
- +
- +apply() : : void + +apply() : void
diff --git a/docs/test_cases/t00024.md b/docs/test_cases/t00024.md index adc1e13a..e16bb8c6 100644 --- a/docs/test_cases/t00024.md +++ b/docs/test_cases/t00024.md @@ -67,7 +67,7 @@ private: "elements": [ { "bases": [], - "display_name": "clanguml::t00024::Target", + "display_name": "Target", "id": "1116408959993110019", "is_abstract": true, "is_nested": false, @@ -175,7 +175,7 @@ private: "name": "clanguml::t00024::Target" } ], - "display_name": "clanguml::t00024::Target1", + "display_name": "Target1", "id": "669517069151826610", "is_abstract": false, "is_nested": false, @@ -257,7 +257,7 @@ private: "name": "clanguml::t00024::Target" } ], - "display_name": "clanguml::t00024::Target2", + "display_name": "Target2", "id": "1210513233906695933", "is_abstract": false, "is_nested": false, @@ -339,7 +339,7 @@ private: "name": "clanguml::t00024::Target" } ], - "display_name": "clanguml::t00024::Proxy", + "display_name": "Proxy", "id": "594707401639991215", "is_abstract": false, "is_nested": false, @@ -458,6 +458,7 @@ private: } ], "name": "t00024_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00024_class.svg b/docs/test_cases/t00024_class.svg index 27d5b4bf..e92b81cf 100644 --- a/docs/test_cases/t00024_class.svg +++ b/docs/test_cases/t00024_class.svg @@ -1,144 +1,134 @@ - + + + + + + + - - - - - - Target - - - - - - - ~Target() = 0 : void - - - - - - - - m1() = 0 : void - - - - - - - m2() = 0 : void - - - + + + + + Target + - - - - - - Target1 - - - - - - - m1() : void - - - - - - - m2() : void - - - + + + - - - - - - Target2 - - - - - - - m1() : void - - - - - - - m2() : void - - - + + ~Target() = 0 : void - - - - - - Proxy - - - - - - - Proxy(std::shared_ptr<Target> target) : void - - - - - - - - m1() : void - - - - - - - m2() : void - - - - - - - - m_target : std::shared_ptr<Target> - - + + + + - - - - - - - - - - - - - m_target - - - - - + + m1() = 0 : void + + + + + + + m2() = 0 : void + + + + + + + Target1 + + + + + + + + m1() : void + + + + + + + m2() : void + + + + + + + Target2 + + + + + + + + m1() : void + + + + + + + m2() : void + + + + + + + Proxy + + + + + + + + Proxy(std::shared_ptr<Target> target) : void + + + + + + + + m1() : void + + + + + + + m2() : void + + + + + + + + m_target : std::shared_ptr<Target> + + + + + + + + + m_target + + diff --git a/docs/test_cases/t00024_class_mermaid.svg b/docs/test_cases/t00024_class_mermaid.svg index 7e9583fb..5fde8140 100644 --- a/docs/test_cases/t00024_class_mermaid.svg +++ b/docs/test_cases/t00024_class_mermaid.svg @@ -1,64 +1,59 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - + + + + @@ -79,7 +74,7 @@ - +
@@ -101,11 +96,11 @@ - + - - - + + +
@@ -117,29 +112,29 @@ Target
- +
- +~Target() : : void + +~Target() : void
- +
- +m1() : : void + +m1() : void
- +
- +m2() : : void + +m2() : void
- + - - - + + +
@@ -151,24 +146,24 @@ Target1
- +
- +m1() : : void + +m1() : void
- +
- +m2() : : void + +m2() : void
- + - - - + + +
@@ -180,24 +175,24 @@ Target2
- +
- +m1() : : void + +m1() : void
- +
- +m2() : : void + +m2() : void
- + - - - + + +
@@ -209,24 +204,24 @@ Proxy
- +
-m_target : std::shared_ptr<Target>
- +
- +Proxy(std::shared_ptr target) : : void + +Proxy(std::shared_ptr target) : void
- +
- +m1() : : void + +m1() : void
- +
- +m2() : : void + +m2() : void
diff --git a/docs/test_cases/t00025.md b/docs/test_cases/t00025.md index 473ac3d2..8b63bdf3 100644 --- a/docs/test_cases/t00025.md +++ b/docs/test_cases/t00025.md @@ -65,7 +65,7 @@ public: "elements": [ { "bases": [], - "display_name": "clanguml::t00025::Target1", + "display_name": "Target1", "id": "1573849034571194138", "is_abstract": false, "is_nested": false, @@ -140,7 +140,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00025::Target2", + "display_name": "Target2", "id": "751896409461834669", "is_abstract": false, "is_nested": false, @@ -215,7 +215,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00025::Proxy", + "display_name": "Proxy", "id": "1483353300536405088", "is_abstract": false, "is_nested": false, @@ -341,7 +341,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00025::Proxy", + "display_name": "Proxy", "id": "1644966842838139424", "is_abstract": false, "is_nested": false, @@ -370,7 +370,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00025::Proxy", + "display_name": "Proxy", "id": "1190103100236298763", "is_abstract": false, "is_nested": false, @@ -399,7 +399,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00025::ProxyHolder", + "display_name": "ProxyHolder", "id": "1906317303950647748", "is_abstract": false, "is_nested": false, @@ -446,6 +446,7 @@ public: } ], "name": "t00025_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00025_class.svg b/docs/test_cases/t00025_class.svg index b6270f3d..5afc8ebd 100644 --- a/docs/test_cases/t00025_class.svg +++ b/docs/test_cases/t00025_class.svg @@ -1,172 +1,154 @@ - + + + + + + + - - - - - - Target1 - - - - - - - m1() : void - - - - - - - m2() : void - - - + + + + + Target1 + - - - - - - Target2 - - - - - - - m1() : void - - - - - - - m2() : void - - - + + + - - - - - - Proxy - - T - - - - - - - Proxy(std::shared_ptr<T> target) : void - - - - - - - - m1() : void - - - - - - - m2() : void - - - - - - - - m_target : std::shared_ptr<T> - - + + m1() : void - - - - - - Proxy - - Target1 - - - + + + - - - - - - Proxy - - Target2 - - - + + m2() : void - - - - - - ProxyHolder - - - - - - - - proxy1 : Proxy<Target1> - - - - - - - proxy2 : Proxy<Target2> - - + + + + + + Target2 + - - - - - - - - - - - - - - - - - - - - - proxy1 - - - - - - proxy2 - + + + + + + m1() : void + + + + + + + m2() : void + + + + + + + Proxy + + T + + + + + + + + Proxy(std::shared_ptr<T> target) : void + + + + + + + + m1() : void + + + + + + + m2() : void + + + + + + + + m_target : std::shared_ptr<T> + + + + + + Proxy + + Target1 + + + + + + + + Proxy + + Target2 + + + + + + + + ProxyHolder + + + + + + + + + proxy1 : Proxy<Target1> + + + + + + + proxy2 : Proxy<Target2> + + + + + + + + + + + + + proxy1 + + + + proxy2 diff --git a/docs/test_cases/t00025_class_mermaid.svg b/docs/test_cases/t00025_class_mermaid.svg index b0775ddf..39f224bc 100644 --- a/docs/test_cases/t00025_class_mermaid.svg +++ b/docs/test_cases/t00025_class_mermaid.svg @@ -1,66 +1,61 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - + + + + + + @@ -118,7 +113,7 @@ - +
@@ -131,11 +126,11 @@ - + - - - + + +
@@ -147,24 +142,24 @@ Target1
- +
- +m1() : : void + +m1() : void
- +
- +m2() : : void + +m2() : void
- + - - - + + +
@@ -176,24 +171,24 @@ Target2
- +
- +m1() : : void + +m1() : void
- +
- +m2() : : void + +m2() : void
- + - - - + + +
@@ -205,30 +200,30 @@ Proxy<T>
- +
-m_target : std::shared_ptr<T>
- +
- +Proxy(std::shared_ptr target) : : void + +Proxy(std::shared_ptr target) : void
- +
- +m1() : : void + +m1() : void
- +
- +m2() : : void + +m2() : void
- + @@ -247,7 +242,7 @@ - + @@ -266,7 +261,7 @@ - + diff --git a/docs/test_cases/t00026.md b/docs/test_cases/t00026.md index bfecdf4d..e0e52803 100644 --- a/docs/test_cases/t00026.md +++ b/docs/test_cases/t00026.md @@ -86,7 +86,7 @@ struct StringMemento { "elements": [ { "bases": [], - "display_name": "clanguml::t00026::Memento", + "display_name": "Memento", "id": "1241204213727905390", "is_abstract": false, "is_nested": false, @@ -186,7 +186,7 @@ struct StringMemento { }, { "bases": [], - "display_name": "clanguml::t00026::Originator", + "display_name": "Originator", "id": "1324770803720816727", "is_abstract": false, "is_nested": false, @@ -374,7 +374,7 @@ struct StringMemento { }, { "bases": [], - "display_name": "clanguml::t00026::Caretaker", + "display_name": "Caretaker", "id": "2032715387182792204", "is_abstract": false, "is_nested": false, @@ -483,7 +483,7 @@ struct StringMemento { }, { "bases": [], - "display_name": "clanguml::t00026::Caretaker", + "display_name": "Caretaker", "id": "1708482137721157489", "is_abstract": false, "is_nested": false, @@ -512,7 +512,7 @@ struct StringMemento { }, { "bases": [], - "display_name": "clanguml::t00026::Originator", + "display_name": "Originator", "id": "1014247960805363560", "is_abstract": false, "is_nested": false, @@ -541,7 +541,7 @@ struct StringMemento { }, { "bases": [], - "display_name": "clanguml::t00026::StringMemento", + "display_name": "StringMemento", "id": "851750942915129289", "is_abstract": false, "is_nested": false, @@ -588,6 +588,7 @@ struct StringMemento { } ], "name": "t00026_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00026_class.svg b/docs/test_cases/t00026_class.svg index 3c7eadb6..d20c58a1 100644 --- a/docs/test_cases/t00026_class.svg +++ b/docs/test_cases/t00026_class.svg @@ -1,207 +1,189 @@ - + + + + + + + - - - - - - Memento - - T - - - - - - - Memento(T && v) : void - - - - - - - - value() const : T - - - - - - - - m_value : T - - + + + + + Memento + + T + - - - - - - Originator - - T - - - - - - - Originator(T && v) : void - - - - - - - - load(const Memento<T> & m) : void - - - - - - - memoize_value() const : Memento<T> - - - - - - - print() const : void - - - - - - - set(T && v) : void - - - - - - - - m_value : T - - + + + - - - - - - Caretaker - - T - - - - - - - set_state(const std::string & s, Memento<T> && m) : void - - - - - - - state(const std::string & n) : Memento<T> & - - - - - - - - m_mementos : std::unordered_map<std::string,Memento<T>> - - + + Memento(T && v) : void - - - - - - Caretaker - - std::string - - - + + + + - - - - - - Originator - - std::string - - - + + value() const : T - - - - - - StringMemento - - - - - - - - caretaker : Caretaker<std::string> - - - - - - - originator : Originator<std::string> - - + + + + - - - - - - - - - m_mementos - - - - - - - - - - - - - - caretaker - - - - - - originator - + + m_value : T + + + + + + Originator + + T + + + + + + + + Originator(T && v) : void + + + + + + + + load(const Memento<T> & m) : void + + + + + + + memoize_value() const : Memento<T> + + + + + + + print() const : void + + + + + + + set(T && v) : void + + + + + + + + m_value : T + + + + + + Caretaker + + T + + + + + + + + set_state(const std::string & s, Memento<T> && m) : void + + + + + + + state(const std::string & n) : Memento<T> & + + + + + + + + m_mementos : std::unordered_map<std::string,Memento<T>> + + + + + + Caretaker + + std::string + + + + + + + + Originator + + std::string + + + + + + + + StringMemento + + + + + + + + + caretaker : Caretaker<std::string> + + + + + + + originator : Originator<std::string> + + + + + + + m_mementos + + + + + + + + caretaker + + + + originator diff --git a/docs/test_cases/t00026_class_mermaid.svg b/docs/test_cases/t00026_class_mermaid.svg index 3a16234c..91fc675c 100644 --- a/docs/test_cases/t00026_class_mermaid.svg +++ b/docs/test_cases/t00026_class_mermaid.svg @@ -1,66 +1,61 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - + + + + + + @@ -74,7 +69,7 @@ - +
@@ -107,7 +102,7 @@ - +
@@ -118,7 +113,7 @@ - + - +
- +set_state(const std::string & s, Memento && m) : : void + +set_state(const std::string & s, Memento && m) : void
- +
- +state(const std::string & n) : : Memento<T> & + +state(const std::string & n) : Memento<T> &
- + @@ -267,7 +262,7 @@ - + @@ -286,7 +281,7 @@ - + diff --git a/docs/test_cases/t00027.md b/docs/test_cases/t00027.md index fb7f645b..c289e0ad 100644 --- a/docs/test_cases/t00027.md +++ b/docs/test_cases/t00027.md @@ -83,7 +83,7 @@ struct Window { "elements": [ { "bases": [], - "display_name": "clanguml::t00027::Shape", + "display_name": "Shape", "id": "1593092483959332221", "is_abstract": true, "is_nested": false, @@ -158,7 +158,7 @@ struct Window { }, { "bases": [], - "display_name": "clanguml::t00027::Line", + "display_name": "Line", "id": "1568932879061562228", "is_abstract": false, "is_nested": false, @@ -193,7 +193,7 @@ struct Window { "name": "T>" } ], - "display_name": "clanguml::t00027::Line...>", + "display_name": "Line...>", "id": "142374082478337852", "is_abstract": false, "is_nested": false, @@ -249,7 +249,7 @@ struct Window { }, { "bases": [], - "display_name": "clanguml::t00027::Text", + "display_name": "Text", "id": "1833467466291294724", "is_abstract": false, "is_nested": false, @@ -284,7 +284,7 @@ struct Window { "name": "T>" } ], - "display_name": "clanguml::t00027::Text...>", + "display_name": "Text...>", "id": "1114634647721878603", "is_abstract": false, "is_nested": false, @@ -340,7 +340,7 @@ struct Window { }, { "bases": [], - "display_name": "clanguml::t00027::ShapeDecorator", + "display_name": "ShapeDecorator", "id": "2049188825706164566", "is_abstract": true, "is_nested": false, @@ -396,7 +396,7 @@ struct Window { "name": "clanguml::t00027::ShapeDecorator" } ], - "display_name": "clanguml::t00027::Color", + "display_name": "Color", "id": "1473536569433029444", "is_abstract": false, "is_nested": false, @@ -459,7 +459,7 @@ struct Window { "name": "clanguml::t00027::ShapeDecorator" } ], - "display_name": "clanguml::t00027::Weight", + "display_name": "Weight", "id": "2049455532387561338", "is_abstract": false, "is_nested": false, @@ -515,7 +515,7 @@ struct Window { }, { "bases": [], - "display_name": "clanguml::t00027::Line", + "display_name": "Line", "id": "2082936326417164202", "is_abstract": false, "is_nested": false, @@ -550,7 +550,7 @@ struct Window { }, { "bases": [], - "display_name": "clanguml::t00027::Line", + "display_name": "Line", "id": "675132943535054947", "is_abstract": false, "is_nested": false, @@ -579,7 +579,7 @@ struct Window { }, { "bases": [], - "display_name": "clanguml::t00027::Text", + "display_name": "Text", "id": "1678874302644303776", "is_abstract": false, "is_nested": false, @@ -614,7 +614,7 @@ struct Window { }, { "bases": [], - "display_name": "clanguml::t00027::Text", + "display_name": "Text", "id": "1887786688778664182", "is_abstract": false, "is_nested": false, @@ -643,7 +643,7 @@ struct Window { }, { "bases": [], - "display_name": "clanguml::t00027::Window", + "display_name": "Window", "id": "1373544984027721472", "is_abstract": false, "is_nested": false, @@ -714,6 +714,7 @@ struct Window { } ], "name": "t00027_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00027_class.svg b/docs/test_cases/t00027_class.svg index f0685bf4..cc60c721 100644 --- a/docs/test_cases/t00027_class.svg +++ b/docs/test_cases/t00027_class.svg @@ -1,287 +1,243 @@ - + + + + + + + - - - - - - Shape - - - - - - - ~Shape() constexpr = default : void - - - - - - - - display() = 0 : void - - - + + + + + Shape + - - - - - - Line - - - + + + - - - - - - Line - - T<>... - - - - - - - display() : void - - - + + ~Shape() constexpr = default : void - - - - - - Text - - - + + + + - - - - - - Text - - T<>... - - - - - - - display() : void - - - + + display() = 0 : void - - - - - - ShapeDecorator - - - - - - - display() = 0 : void - - - + + + + + + Line + + - - - - - - Color - - T - - - - - - - display() : void - - - + + + + + Line + + T<>... + - - - - - - Weight - - T - - - - - - - display() : void - - - + + + - - - - - - Line - - Color,Weight - - - + + display() : void - - - - - - Line - - Color - - - + + + + + + Text + + - - - - - - Text - - Color,Weight - - - + + + + + Text + + T<>... + - - - - - - Text - - Color - - - + + + - - - - - - Window - - - - - - - - border : Line<Color,Weight> - - - - - - - description : Text<Color> - - - - - - - divider : Line<Color> - - - - - - - title : Text<Color,Weight> - - + + display() : void - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - border - - - - - - divider - - - - - - title - - - - - - description - + + + + + + ShapeDecorator + + + + + + + + display() = 0 : void + + + + + + + Color + + T + + + + + + + + display() : void + + + + + + + Weight + + T + + + + + + + + display() : void + + + + + + + Line + + Color,Weight + + + + + + + + Line + + Color + + + + + + + + Text + + Color,Weight + + + + + + + + Text + + Color + + + + + + + + Window + + + + + + + + + border : Line<Color,Weight> + + + + + + + description : Text<Color> + + + + + + + divider : Line<Color> + + + + + + + title : Text<Color,Weight> + + + + + + + + + + + + + + + + + + + + + border + + + + divider + + + + title + + + + description diff --git a/docs/test_cases/t00027_class_mermaid.svg b/docs/test_cases/t00027_class_mermaid.svg index 3d24f677..c6ff8433 100644 --- a/docs/test_cases/t00027_class_mermaid.svg +++ b/docs/test_cases/t00027_class_mermaid.svg @@ -1,72 +1,67 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -149,7 +144,7 @@ - +
@@ -160,7 +155,7 @@ - +
@@ -171,7 +166,7 @@ - +
@@ -182,7 +177,7 @@ - + - +
- +display() : : void + +display() : void
- + - - - + + +
@@ -350,19 +345,19 @@ Color<T>
- +
- +display() : : void + +display() : void
- + - - - + + +
@@ -374,15 +369,15 @@ Weight<T>
- +
- +display() : : void + +display() : void
- + @@ -401,7 +396,7 @@ - + @@ -420,7 +415,7 @@ - + @@ -439,7 +434,7 @@ - + @@ -458,7 +453,7 @@ - + diff --git a/docs/test_cases/t00028.md b/docs/test_cases/t00028.md index 3eea0c92..e66b4280 100644 --- a/docs/test_cases/t00028.md +++ b/docs/test_cases/t00028.md @@ -96,7 +96,7 @@ class R { "formatted": "\\uml{note[top] A class note.}", "raw": "/// \\uml{note[top] A class note.}" }, - "display_name": "clanguml::t00028::A", + "display_name": "A", "id": "1519850480962783588", "is_abstract": false, "is_nested": false, @@ -122,7 +122,7 @@ class R { "formatted": "\\uml{note[] B class note.}", "raw": "/// \\uml{note[] B class note.}" }, - "display_name": "clanguml::t00028::B", + "display_name": "B", "id": "1980597091567213070", "is_abstract": false, "is_nested": false, @@ -148,7 +148,7 @@ class R { "formatted": "\n @uml{note:t00028_class[bottom] C class note.}\n This is class C.", "raw": "///\n/// @uml{note:t00028_class[bottom] C class note.}\n/// This is class C." }, - "display_name": "clanguml::t00028::C", + "display_name": "C", "id": "984577258575112753", "is_abstract": false, "is_nested": false, @@ -174,7 +174,7 @@ class R { "formatted": "\\uml{note\nD\nclass\nnote.}", "raw": "/// \\uml{note\n/// D\n/// class\n/// note.}" }, - "display_name": "clanguml::t00028::D", + "display_name": "D", "id": "1263778658518784070", "is_abstract": false, "is_nested": false, @@ -200,7 +200,7 @@ class R { "formatted": "\\uml{note E template class note.}", "raw": "/// \\uml{note E template class note.}" }, - "display_name": "clanguml::t00028::E", + "display_name": "E", "id": "1014136565447389473", "is_abstract": false, "is_nested": false, @@ -246,7 +246,7 @@ class R { "formatted": "\\uml{note:other_diagram[left] G class note.}", "raw": "/// \\uml{note:other_diagram[left] G class note.}" }, - "display_name": "clanguml::t00028::G", + "display_name": "G", "id": "764713728396057122", "is_abstract": false, "is_nested": false, @@ -276,7 +276,7 @@ class R { "two", "three" ], - "display_name": "clanguml::t00028::F", + "display_name": "F", "id": "589227897266388677", "is_nested": false, "name": "F", @@ -291,7 +291,7 @@ class R { }, { "bases": [], - "display_name": "clanguml::t00028::E", + "display_name": "E", "id": "1949673179441298667", "is_abstract": false, "is_nested": false, @@ -324,7 +324,7 @@ class R { "formatted": "\\uml{note[right] R class note.}", "raw": "/// \\uml{note[right] R class note.}" }, - "display_name": "clanguml::t00028::R", + "display_name": "R", "id": "1189142882239313116", "is_abstract": false, "is_nested": false, @@ -459,6 +459,7 @@ class R { } ], "name": "t00028_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00028_class.svg b/docs/test_cases/t00028_class.svg index 3f5d3d01..e7c750d5 100644 --- a/docs/test_cases/t00028_class.svg +++ b/docs/test_cases/t00028_class.svg @@ -1,243 +1,203 @@ - + + + + + + + - - - - - - A - - - + + + + + A + + - - - - A class note. - - - - - - - B - - - + + + A class note. + + + + + B + + - - - - B class note. - - - - - - - C - - - + + + B class note. + + + + + C + + - - - - C class note. - - - - - - - D - - - + + + C class note. + + + + + D + + - - - - D - class - note. - - - - - - - E - - T - - - - - - - - param : T - - + + + D + class + note. + + + + + E + + T + + - - - - E template class note. - - - - - - - G - - - + + + - - - - - - F - - one - two - three - - + + param : T - - - - F enum note. - - - - - - - E - - int - - - + + + E template class note. + + + + + G + + - - - - - - R - - - - - - - R(C & c) : void - - - - - - - - aaa : A - - - - - - - bbb : B * - - - - - - - ccc : C & - - - - - - - ddd : std::vector<std::shared_ptr<D>> - - - - - - - eee : E<int> - - - - - - - ggg : G ** - - + + + + + F + + one + two + three + - - - - R class note. - - - - R contains an instance of A. - - - Reference to C. - - - - - - - - - aaa - - - - - - bbb - - - - - - ccc - - - - - - ddd - - - - - - eee - - - - - - ggg - + + + F enum note. + + + + + E + + int + + + + + + + + R + + + + + + + + R(C & c) : void + + + + + + + + aaa : A + + + + + + + bbb : B * + + + + + + + ccc : C & + + + + + + + ddd : std::vector<std::shared_ptr<D>> + + + + + + + eee : E<int> + + + + + + + ggg : G ** + + + + R class note. + + + R contains an instance of A. + + + Reference to C. + + + + + + aaa + + + + bbb + + + + ccc + + + + ddd + + + + eee + + + + ggg diff --git a/docs/test_cases/t00028_class_mermaid.svg b/docs/test_cases/t00028_class_mermaid.svg index f5be132f..0daf7d52 100644 --- a/docs/test_cases/t00028_class_mermaid.svg +++ b/docs/test_cases/t00028_class_mermaid.svg @@ -1,67 +1,62 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - + + + + + + + @@ -223,7 +218,7 @@ - + @@ -242,7 +237,7 @@ - + @@ -261,7 +256,7 @@ - + @@ -280,7 +275,7 @@ - + @@ -299,7 +294,7 @@ - + @@ -323,7 +318,7 @@ - + @@ -342,7 +337,7 @@ - + @@ -376,7 +371,7 @@ - + @@ -395,7 +390,7 @@ - + @@ -418,7 +413,7 @@
- -bbb : B + -bbb : B
@@ -441,9 +436,9 @@ -ggg : G *
- +
- -R(C & c) : : void + -R(C & c) : void
diff --git a/docs/test_cases/t00029.md b/docs/test_cases/t00029.md index caa23a4e..2574fbed 100644 --- a/docs/test_cases/t00029.md +++ b/docs/test_cases/t00029.md @@ -75,7 +75,7 @@ struct R { "elements": [ { "bases": [], - "display_name": "clanguml::t00029::A", + "display_name": "A", "id": "1970994826766369014", "is_abstract": false, "is_nested": false, @@ -97,7 +97,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00029::C", + "display_name": "C", "id": "543766389270348470", "is_abstract": false, "is_nested": false, @@ -143,7 +143,7 @@ struct R { "formatted": "@uml{skip:t00029_class}", "raw": "/// @uml{skip:t00029_class}" }, - "display_name": "clanguml::t00029::D", + "display_name": "D", "id": "1496914969429483234", "is_abstract": false, "is_nested": false, @@ -182,7 +182,7 @@ struct R { "two", "three" ], - "display_name": "clanguml::t00029::E", + "display_name": "E", "id": "1936873082456592219", "is_nested": false, "name": "E", @@ -197,7 +197,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00029::G1", + "display_name": "G1", "id": "1980718063838190763", "is_abstract": false, "is_nested": false, @@ -219,7 +219,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00029::G2", + "display_name": "G2", "id": "2204627213593766591", "is_abstract": false, "is_nested": false, @@ -241,7 +241,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00029::G3", + "display_name": "G3", "id": "767180516665070631", "is_abstract": false, "is_nested": false, @@ -263,7 +263,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00029::G4", + "display_name": "G4", "id": "715074622924270214", "is_abstract": false, "is_nested": false, @@ -285,7 +285,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00029::R", + "display_name": "R", "id": "348749731659902910", "is_abstract": false, "is_nested": false, @@ -348,6 +348,7 @@ struct R { } ], "name": "t00029_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00029_class.svg b/docs/test_cases/t00029_class.svg index 0b9c73e3..e92ca254 100644 --- a/docs/test_cases/t00029_class.svg +++ b/docs/test_cases/t00029_class.svg @@ -1,149 +1,133 @@ - + + + + + + + - - - - - - A - - - + + + + + A + + - - - - - - C - - T - - - - - - - - param : T - - + + + + + C + + T + + - - - - - - D - - - - - - - - param : T - - + + + - - - - - - E - - one - two - three - - + + param : T - - - - - - G1 - - - + + + + + D + + - - - - - - G2 - - - + + + - - - - - - G3 - - - + + param : T - - - - - - G4 - - - + + + + + E + + one + two + three + - - - - - - R - - - - - - - - g1 : G1 - - - - - - - g3 : G3 & - - - - - - - g4 : std::shared_ptr<G4> - - + + + + + G1 + + - - - - - g1 - - - - - - g4 - + + + + + G2 + + + + + + + + G3 + + + + + + + + G4 + + + + + + + + R + + + + + + + + + g1 : G1 + + + + + + + g3 : G3 & + + + + + + + g4 : std::shared_ptr<G4> + + + + + g1 + + + + g4 diff --git a/docs/test_cases/t00029_class_mermaid.svg b/docs/test_cases/t00029_class_mermaid.svg index 4529e08a..6687ad63 100644 --- a/docs/test_cases/t00029_class_mermaid.svg +++ b/docs/test_cases/t00029_class_mermaid.svg @@ -1,62 +1,57 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - + + @@ -83,7 +78,7 @@ - + @@ -102,7 +97,7 @@ - + @@ -126,7 +121,7 @@ - + @@ -150,7 +145,7 @@ - + @@ -184,7 +179,7 @@ - + @@ -203,7 +198,7 @@ - + @@ -222,7 +217,7 @@ - + @@ -241,7 +236,7 @@ - + @@ -260,7 +255,7 @@ - + diff --git a/docs/test_cases/t00030.md b/docs/test_cases/t00030.md index f7b750b7..c05d7c5b 100644 --- a/docs/test_cases/t00030.md +++ b/docs/test_cases/t00030.md @@ -63,7 +63,7 @@ struct R { "elements": [ { "bases": [], - "display_name": "clanguml::t00030::A", + "display_name": "A", "id": "64769484767514424", "is_abstract": false, "is_nested": false, @@ -85,7 +85,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00030::B", + "display_name": "B", "id": "156923198106222307", "is_abstract": false, "is_nested": false, @@ -107,7 +107,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00030::C", + "display_name": "C", "id": "1651557398557662399", "is_abstract": false, "is_nested": false, @@ -129,7 +129,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00030::D", + "display_name": "D", "id": "1089781072752262158", "is_abstract": false, "is_nested": false, @@ -151,7 +151,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00030::E", + "display_name": "E", "id": "425964641881054607", "is_abstract": false, "is_nested": false, @@ -173,7 +173,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00030::R", + "display_name": "R", "id": "263468735940481091", "is_abstract": false, "is_nested": false, @@ -276,6 +276,7 @@ struct R { } ], "name": "t00030_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00030_class.svg b/docs/test_cases/t00030_class.svg index 73fc0628..6b46e951 100644 --- a/docs/test_cases/t00030_class.svg +++ b/docs/test_cases/t00030_class.svg @@ -1,138 +1,122 @@ - + + + + + + + - - - - - - A - - - + + + + + A + + - - - - - - B - - - + + + + + B + + - - - - - - C - - - + + + + + C + + - - - - - - D - - - + + + + + D + + - - - - - - E - - - + + + + + E + + - - - - - - R - - - - - - - - aaa : A - - - - - - - bbb : std::vector<B> - - - - - - - ccc : std::vector<C> - - - - - - - ddd : D - - - - - - - eee : E * - - + + + + + R + + - - - - - aaa - - - - - - bbb - 0..1 - 1..* - - - - - - ccc - 0..1 - 1..5 - - - - - - ddd - 1 - - - - - - eee - 1 - + + + + + + aaa : A + + + + + + + bbb : std::vector<B> + + + + + + + ccc : std::vector<C> + + + + + + + ddd : D + + + + + + + eee : E * + + + + + aaa + + + + bbb + 0..1 + 1..* + + + + ccc + 0..1 + 1..5 + + + + ddd + 1 + + + + eee + 1 diff --git a/docs/test_cases/t00030_class_mermaid.svg b/docs/test_cases/t00030_class_mermaid.svg index 74a57f33..1e97b1d1 100644 --- a/docs/test_cases/t00030_class_mermaid.svg +++ b/docs/test_cases/t00030_class_mermaid.svg @@ -1,65 +1,60 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - + + + + + @@ -84,7 +79,7 @@ - +
@@ -93,7 +88,7 @@ - +
@@ -112,7 +107,7 @@ - +
@@ -121,7 +116,7 @@ - +
@@ -140,7 +135,7 @@ - +
@@ -159,7 +154,7 @@ - +
@@ -169,7 +164,7 @@ - + @@ -188,7 +183,7 @@ - + @@ -207,7 +202,7 @@ - + @@ -226,7 +221,7 @@ - + @@ -245,7 +240,7 @@ - + @@ -264,7 +259,7 @@ - + @@ -302,7 +297,7 @@
- +eee : E + +eee : E
diff --git a/docs/test_cases/t00031.md b/docs/test_cases/t00031.md index 3d4b3846..ae7ed19d 100644 --- a/docs/test_cases/t00031.md +++ b/docs/test_cases/t00031.md @@ -71,7 +71,7 @@ struct R { "formatted": "@uml{style[#back:lightgreen|yellow;header:blue/red]}", "raw": "/// @uml{style[#back:lightgreen|yellow;header:blue/red]}" }, - "display_name": "clanguml::t00031::A", + "display_name": "A", "id": "847775539502907247", "is_abstract": false, "is_nested": false, @@ -101,7 +101,7 @@ struct R { "two", "three" ], - "display_name": "clanguml::t00031::B", + "display_name": "B", "id": "1441796358326382179", "is_nested": false, "name": "B", @@ -120,7 +120,7 @@ struct R { "formatted": "@uml{style[#pink;line:red;line.bold;text:red]}", "raw": "/// @uml{style[#pink;line:red;line.bold;text:red]}" }, - "display_name": "clanguml::t00031::C", + "display_name": "C", "id": "116209144733282955", "is_abstract": false, "is_nested": false, @@ -162,7 +162,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00031::D", + "display_name": "D", "id": "2266534344475505157", "is_abstract": false, "is_nested": false, @@ -184,7 +184,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00031::C", + "display_name": "C", "id": "208700529175860645", "is_abstract": false, "is_nested": false, @@ -213,7 +213,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00031::R", + "display_name": "R", "id": "484712092364868032", "is_abstract": false, "is_nested": false, @@ -332,6 +332,7 @@ struct R { } ], "name": "t00031_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00031_class.svg b/docs/test_cases/t00031_class.svg index 42a52250..124465ef 100644 --- a/docs/test_cases/t00031_class.svg +++ b/docs/test_cases/t00031_class.svg @@ -1,159 +1,140 @@ - + - + - + + + + + + + - - - - - - - - - A - - - + + + + + + A + + - - - - - - B - - one - two - three - - + + + + + B + + one + two + three + - - - - - - C - - T - - - - - - - - ttt : T - - + + + + + + C + + T + + - - - - - - D - - - + + + - - - - - - C - - int - - - + + ttt : T - - - - - - R - - - - - - - add_b(B b) : void - - - - - - - - aaa : A * - - - - - - - bbb : std::vector<B> - - - - - - - ccc : C<int> - - - - - - - ddd : D * - - + + + + + D + + - - - - - - - - - - - - - bbb - - - - - - aaa - - - - - - ccc - - - - - - ddd - + + + + + C + + int + + + + + + + + R + + + + + + + + add_b(B b) : void + + + + + + + + aaa : A * + + + + + + + bbb : std::vector<B> + + + + + + + ccc : C<int> + + + + + + + ddd : D * + + + + + + + + + bbb + + + + aaa + + + + ccc + + + + ddd diff --git a/docs/test_cases/t00031_class_mermaid.svg b/docs/test_cases/t00031_class_mermaid.svg index 360b468d..8094d804 100644 --- a/docs/test_cases/t00031_class_mermaid.svg +++ b/docs/test_cases/t00031_class_mermaid.svg @@ -1,66 +1,61 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - + + + + + + @@ -131,7 +126,7 @@ - + @@ -150,7 +145,7 @@ - + @@ -184,7 +179,7 @@ - + @@ -208,7 +203,7 @@ - + @@ -227,7 +222,7 @@ - + @@ -246,7 +241,7 @@ - + @@ -264,7 +259,7 @@
- +aaa : A + +aaa : A
@@ -279,12 +274,12 @@
- +ddd : D + +ddd : D
- +
- +add_b(B b) : : void + +add_b(B b) : void
diff --git a/docs/test_cases/t00032.md b/docs/test_cases/t00032.md index 8c155730..e4d15f16 100644 --- a/docs/test_cases/t00032.md +++ b/docs/test_cases/t00032.md @@ -64,7 +64,7 @@ struct R { "elements": [ { "bases": [], - "display_name": "clanguml::t00032::Base", + "display_name": "Base", "id": "1619396229227632210", "is_abstract": false, "is_nested": false, @@ -86,7 +86,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00032::TBase", + "display_name": "TBase", "id": "543776954602127752", "is_abstract": false, "is_nested": false, @@ -108,7 +108,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00032::A", + "display_name": "A", "id": "687909853333071234", "is_abstract": false, "is_nested": false, @@ -157,7 +157,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00032::B", + "display_name": "B", "id": "737235057776029746", "is_abstract": false, "is_nested": false, @@ -206,7 +206,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00032::C", + "display_name": "C", "id": "1497964256865073382", "is_abstract": false, "is_nested": false, @@ -262,7 +262,7 @@ struct R { "name": "clanguml::t00032::Base" } ], - "display_name": "clanguml::t00032::Overload", + "display_name": "Overload", "id": "1463422997970691679", "is_abstract": false, "is_nested": false, @@ -341,7 +341,7 @@ struct R { "name": "clanguml::t00032::C" } ], - "display_name": "clanguml::t00032::Overload", + "display_name": "Overload", "id": "1706455047176879286", "is_abstract": false, "is_nested": false, @@ -394,7 +394,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00032::R", + "display_name": "R", "id": "85539867332573320", "is_abstract": false, "is_nested": false, @@ -429,6 +429,7 @@ struct R { } ], "name": "t00032_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00032_class.svg b/docs/test_cases/t00032_class.svg index 8b17c560..82e2a80d 100644 --- a/docs/test_cases/t00032_class.svg +++ b/docs/test_cases/t00032_class.svg @@ -1,156 +1,132 @@ - + + + + + + + - - - - - - Base - - - + + + + + Base + + - - - - - - TBase - - - + + + + + TBase + + - - - - - - A - - - - - - - operator()() : void - - - + + + + + A + - - - - - - B - - - - - - - operator()() : void - - - + + + - - - - - - C - - - - - - - operator()() : void - - - + + operator()() : void - - - - - - Overload - - T,L,Ts... - - - - - - - - counter : L - - + + + + + + B + - - - - - - Overload - - TBase,int,A,B,C - - - + + + - - - - - - R - - - - - - - - overload : Overload<TBase,int,A,B,C> - - + + operator()() : void - - - - - - - - - - - - - - - - - - - - - - - - - - - - - overload - + + + + + + C + + + + + + + + operator()() : void + + + + + + + Overload + + T,L,Ts... + + + + + + + + + counter : L + + + + + + Overload + + TBase,int,A,B,C + + + + + + + + R + + + + + + + + + overload : Overload<TBase,int,A,B,C> + + + + + + + + + + + + + + + + + overload diff --git a/docs/test_cases/t00032_class_mermaid.svg b/docs/test_cases/t00032_class_mermaid.svg index b4c58c30..8a0f10f6 100644 --- a/docs/test_cases/t00032_class_mermaid.svg +++ b/docs/test_cases/t00032_class_mermaid.svg @@ -1,67 +1,62 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - + + + + + + + @@ -120,7 +115,7 @@ - +
@@ -133,7 +128,7 @@ - + @@ -152,7 +147,7 @@ - + @@ -171,11 +166,11 @@ - + - - - + + +
@@ -187,19 +182,19 @@ A
- +
- +operator()() : : void + +operator() : ) : void
- + - - - + + +
@@ -211,19 +206,19 @@ B
- +
- +operator()() : : void + +operator() : ) : void
- + - - - + + +
@@ -235,15 +230,15 @@ C
- +
- +operator()() : : void + +operator() : ) : void
- + @@ -267,7 +262,7 @@ - + @@ -286,7 +281,7 @@ - + diff --git a/docs/test_cases/t00033.md b/docs/test_cases/t00033.md index 3ab036b7..921e661a 100644 --- a/docs/test_cases/t00033.md +++ b/docs/test_cases/t00033.md @@ -56,7 +56,7 @@ struct R { "elements": [ { "bases": [], - "display_name": "clanguml::t00033::A", + "display_name": "A", "id": "2036031998980633871", "is_abstract": false, "is_nested": false, @@ -98,7 +98,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00033::B", + "display_name": "B", "id": "765515233845859023", "is_abstract": false, "is_nested": false, @@ -140,7 +140,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00033::C", + "display_name": "C", "id": "1436835384265552869", "is_abstract": false, "is_nested": false, @@ -182,7 +182,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00033::D", + "display_name": "D", "id": "2199581366769423637", "is_abstract": false, "is_nested": false, @@ -217,7 +217,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00033::C", + "display_name": "C", "id": "1609446044604054241", "is_abstract": false, "is_nested": false, @@ -246,7 +246,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00033::B>>", + "display_name": "B>>", "id": "384927316081978893", "is_abstract": false, "is_nested": false, @@ -289,7 +289,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00033::A>>>", + "display_name": "A>>>", "id": "1747493965420341251", "is_abstract": false, "is_nested": false, @@ -339,7 +339,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00033::R", + "display_name": "R", "id": "1866392706312766470", "is_abstract": false, "is_nested": false, @@ -374,6 +374,7 @@ struct R { } ], "name": "t00033_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00033_class.svg b/docs/test_cases/t00033_class.svg index 66fb15cd..2d23dde8 100644 --- a/docs/test_cases/t00033_class.svg +++ b/docs/test_cases/t00033_class.svg @@ -1,164 +1,140 @@ - + + + + + + + - - - - - - A - - T - - - - - - - - aaa : T - - + + + + + A + + T + + - - - - - - B - - T - - - - - - - - bbb : T - - + + + - - - - - - C - - T - - - - - - - - ccc : T - - + + aaa : T - - - - - - D - - - - - - - - ddd : int - - + + + + + B + + T + + - - - - - - C - - D - - - + + + - - - - - - B - - std::unique_ptr<C<D>> - - - + + bbb : T - - - - - - A - - B<std::unique_ptr<C<D>>> - - - + + + + + C + + T + + - - - - - - R - - - - - - - - abc : A<B<std::unique_ptr<C<D>>>> - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - abc - + + ccc : T + + + + + + D + + + + + + + + + ddd : int + + + + + + C + + D + + + + + + + + B + + std::unique_ptr<C<D>> + + + + + + + + A + + B<std::unique_ptr<C<D>>> + + + + + + + + R + + + + + + + + + abc : A<B<std::unique_ptr<C<D>>>> + + + + + + + + + + + + + + + + + abc diff --git a/docs/test_cases/t00033_class_mermaid.svg b/docs/test_cases/t00033_class_mermaid.svg index 36c07cd7..579c40ee 100644 --- a/docs/test_cases/t00033_class_mermaid.svg +++ b/docs/test_cases/t00033_class_mermaid.svg @@ -1,67 +1,62 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - + + + + + + + @@ -143,7 +138,7 @@ - + @@ -167,7 +162,7 @@ - + @@ -191,7 +186,7 @@ - + @@ -215,7 +210,7 @@ - + @@ -239,7 +234,7 @@ - + @@ -258,7 +253,7 @@ - + @@ -277,7 +272,7 @@ - + @@ -296,7 +291,7 @@ - + diff --git a/docs/test_cases/t00034.md b/docs/test_cases/t00034.md index 61fb8c94..8671ef16 100644 --- a/docs/test_cases/t00034.md +++ b/docs/test_cases/t00034.md @@ -82,7 +82,7 @@ struct R { "elements": [ { "bases": [], - "display_name": "clanguml::t00034::Void", + "display_name": "Void", "id": "1704456490210873213", "is_abstract": false, "is_nested": false, @@ -167,7 +167,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00034::lift_void", + "display_name": "lift_void", "id": "867472442996685316", "is_abstract": false, "is_nested": false, @@ -196,7 +196,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00034::lift_void", + "display_name": "lift_void", "id": "126450862226197239", "is_abstract": false, "is_nested": false, @@ -225,7 +225,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00034::drop_void", + "display_name": "drop_void", "id": "1578745816100337706", "is_abstract": false, "is_nested": false, @@ -254,7 +254,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00034::drop_void", + "display_name": "drop_void", "id": "1849836134504075115", "is_abstract": false, "is_nested": false, @@ -283,7 +283,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00034::A", + "display_name": "A", "id": "1383912907884688827", "is_abstract": false, "is_nested": false, @@ -305,7 +305,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00034::R", + "display_name": "R", "id": "1713991735741265309", "is_abstract": false, "is_nested": false, @@ -352,6 +352,7 @@ struct R { } ], "name": "t00034_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00034_class.svg b/docs/test_cases/t00034_class.svg index cc6a2cfe..48b023a4 100644 --- a/docs/test_cases/t00034_class.svg +++ b/docs/test_cases/t00034_class.svg @@ -1,137 +1,119 @@ - + + + + + + + - - - - - - Void - - - - - - - operator!=(const Void &) constexpr const : bool - - - - - - - operator==(const Void &) constexpr const : bool - - - + + + + + Void + - - - - - - lift_void - - T - - - + + + - - - - - - lift_void - - void - - - + + operator!=(const Void &) constexpr const : bool - - - - - - drop_void - - T - - - + + + - - - - - - drop_void - - Void - - - + + operator==(const Void &) constexpr const : bool - - - - - - A - - - + + + + + + lift_void + + T + + - - - - - - R - - - - - - - - la : lift_void_t<A> * - - - - - - - lv : lift_void_t<void> * - - + + + + + lift_void + + void + + - - - - - - - - - - - - - - - - - la - - - - - - la - + + + + + drop_void + + T + + + + + + + + drop_void + + Void + + + + + + + + A + + + + + + + + R + + + + + + + + + la : lift_void_t<A> * + + + + + + + lv : lift_void_t<void> * + + + + + + + + + + + la + + + + la diff --git a/docs/test_cases/t00034_class_mermaid.svg b/docs/test_cases/t00034_class_mermaid.svg index 7f4426a8..01b5fbd4 100644 --- a/docs/test_cases/t00034_class_mermaid.svg +++ b/docs/test_cases/t00034_class_mermaid.svg @@ -1,64 +1,59 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - + + + + @@ -94,7 +89,7 @@ - +
@@ -107,11 +102,11 @@ - + - - - + + +
@@ -123,20 +118,20 @@ Void
- +
- +operator!=(const Void &) : : [const,constexpr] bool + +operator!=(const Void &) : [const,constexpr] bool
- +
- +operator==(const Void &) : : [const,constexpr] bool + +operator==(const Void &) : [const,constexpr] bool
- + @@ -155,7 +150,7 @@ - + @@ -174,7 +169,7 @@ - + @@ -193,7 +188,7 @@ - + @@ -212,7 +207,7 @@ - + @@ -231,7 +226,7 @@ - + @@ -249,12 +244,12 @@
- +la : lift_void_t<A> + +la : lift_void_t<A>
- +lv : lift_void_t<void> + +lv : lift_void_t<void>
diff --git a/docs/test_cases/t00035.md b/docs/test_cases/t00035.md index ce6fb517..f06c66a0 100644 --- a/docs/test_cases/t00035.md +++ b/docs/test_cases/t00035.md @@ -49,7 +49,7 @@ struct Right { }; "elements": [ { "bases": [], - "display_name": "clanguml::t00035::Top", + "display_name": "Top", "id": "2241062883697294772", "is_abstract": false, "is_nested": false, @@ -71,7 +71,7 @@ struct Right { }; }, { "bases": [], - "display_name": "clanguml::t00035::Left", + "display_name": "Left", "id": "242562856080127946", "is_abstract": false, "is_nested": false, @@ -93,7 +93,7 @@ struct Right { }; }, { "bases": [], - "display_name": "clanguml::t00035::Center", + "display_name": "Center", "id": "1933304541849408421", "is_abstract": false, "is_nested": false, @@ -115,7 +115,7 @@ struct Right { }; }, { "bases": [], - "display_name": "clanguml::t00035::Bottom", + "display_name": "Bottom", "id": "1646691079607377420", "is_abstract": false, "is_nested": false, @@ -137,7 +137,7 @@ struct Right { }; }, { "bases": [], - "display_name": "clanguml::t00035::Right", + "display_name": "Right", "id": "200121820090372322", "is_abstract": false, "is_nested": false, @@ -159,6 +159,7 @@ struct Right { }; } ], "name": "t00035_class", + "package_type": "namespace", "relationships": [], "using_namespace": "clanguml::t00035" } diff --git a/docs/test_cases/t00035_class.svg b/docs/test_cases/t00035_class.svg index 2e7431bd..ca350e25 100644 --- a/docs/test_cases/t00035_class.svg +++ b/docs/test_cases/t00035_class.svg @@ -1,57 +1,53 @@ - + + + + + + + - - - - - - Top - - - + + + + + Top + + - - - - - - Left - - - + + + + + Left + + - - - - - - Center - - - + + + + + Center + + - - - - - - Bottom - - - + + + + + Bottom + + - - - - - - Right - - - + + + + + Right + + diff --git a/docs/test_cases/t00035_class_mermaid.svg b/docs/test_cases/t00035_class_mermaid.svg index c5c6d420..88b19390 100644 --- a/docs/test_cases/t00035_class_mermaid.svg +++ b/docs/test_cases/t00035_class_mermaid.svg @@ -1,55 +1,50 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + @@ -57,7 +52,7 @@ - + @@ -76,7 +71,7 @@ - + @@ -95,7 +90,7 @@ - + @@ -114,7 +109,7 @@ - + @@ -133,7 +128,7 @@ - + diff --git a/docs/test_cases/t00036.md b/docs/test_cases/t00036.md index 222d1ff4..eabe606f 100644 --- a/docs/test_cases/t00036.md +++ b/docs/test_cases/t00036.md @@ -37,7 +37,7 @@ struct B { A a_int; }; -} +} // namespace ns111 } // namespace ns11 } // namespace ns1 @@ -49,8 +49,8 @@ struct C { }; struct D { }; -} -} +} // namespace ns22 +} // namespace ns2 namespace ns3 { namespace ns33 { @@ -74,14 +74,14 @@ struct DImpl : public ns2::ns22::D { }; "diagram_type": "class", "elements": [ { - "display_name": "clanguml::t00036::ns1", + "display_name": "ns1", "elements": [ { "constants": [ "blue", "yellow" ], - "display_name": "clanguml::t00036::ns1::E", + "display_name": "ns1::E", "id": "2144761953049158478", "is_nested": false, "name": "E", @@ -95,11 +95,11 @@ struct DImpl : public ns2::ns22::D { }; "type": "enum" }, { - "display_name": "clanguml::t00036::ns1::ns11", + "display_name": "ns11", "elements": [ { "bases": [], - "display_name": "clanguml::t00036::ns1::ns11::A", + "display_name": "ns1::ns11::A", "id": "571573305652194946", "is_abstract": false, "is_nested": false, @@ -140,11 +140,11 @@ struct DImpl : public ns2::ns22::D { }; "type": "class" }, { - "display_name": "clanguml::t00036::ns1::ns11::ns111", + "display_name": "ns111", "elements": [ { "bases": [], - "display_name": "clanguml::t00036::ns1::ns11::ns111::B", + "display_name": "ns1::ns11::ns111::B", "id": "1964031933563607376", "is_abstract": false, "is_nested": false, @@ -183,7 +183,7 @@ struct DImpl : public ns2::ns22::D { }; }, { "bases": [], - "display_name": "clanguml::t00036::ns1::ns11::A", + "display_name": "ns1::ns11::A", "id": "1832710427462319797", "is_abstract": false, "is_nested": false, @@ -219,14 +219,14 @@ struct DImpl : public ns2::ns22::D { }; "type": "namespace" }, { - "display_name": "clanguml::t00036::ns2", + "display_name": "ns2", "elements": [ { - "display_name": "clanguml::t00036::ns2::ns22", + "display_name": "ns22", "elements": [ { "bases": [], - "display_name": "clanguml::t00036::ns2::ns22::C", + "display_name": "ns2::ns22::C", "id": "2038956882066165590", "is_abstract": false, "is_nested": false, @@ -255,13 +255,13 @@ struct DImpl : public ns2::ns22::D { }; "type": "namespace" }, { - "display_name": "clanguml::t00036::ns3", + "display_name": "ns3", "elements": [ { - "display_name": "clanguml::t00036::ns3::ns33", + "display_name": "ns33", "elements": [ { - "display_name": "clanguml::t00036::ns3::ns33::detail", + "display_name": "detail", "name": "detail", "type": "namespace" } @@ -275,6 +275,7 @@ struct DImpl : public ns2::ns22::D { }; } ], "name": "t00036_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00036_class.svg b/docs/test_cases/t00036_class.svg index f5ed74e2..9987d7a0 100644 --- a/docs/test_cases/t00036_class.svg +++ b/docs/test_cases/t00036_class.svg @@ -1,112 +1,94 @@ - + + + + + + + - - - - ns1 - - - - - ns11 - - - - - ns111 - - - - - ns2 - - - - - ns22 - - - - - - - E - - blue - yellow - - + + + ns1 + + + ns11 + + + ns111 + + + ns2 + + + ns22 + + + + + E + + blue + yellow + - - - - - - A - - T - - - - - - - - a : T - - + + + + + A + + T + + - - - - - - A - - int - - - + + + - - - - - - B - - - - - - - - a_int : A<int> - - + + a : T - - - - - - C - - - + + + + + A + + int + + - - - - - a_int - - - - - + + + + + B + + + + + + + + + a_int : A<int> + + + + + + C + + + + + + + a_int + + diff --git a/docs/test_cases/t00036_class_mermaid.svg b/docs/test_cases/t00036_class_mermaid.svg index 74486438..6eb60a71 100644 --- a/docs/test_cases/t00036_class_mermaid.svg +++ b/docs/test_cases/t00036_class_mermaid.svg @@ -1,62 +1,57 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - + + @@ -83,7 +78,7 @@ - + @@ -112,7 +107,7 @@ - + @@ -136,7 +131,7 @@ - + @@ -160,7 +155,7 @@ - + @@ -179,7 +174,7 @@ - + diff --git a/docs/test_cases/t00037.md b/docs/test_cases/t00037.md index 098da27f..f31e2e0d 100644 --- a/docs/test_cases/t00037.md +++ b/docs/test_cases/t00037.md @@ -61,7 +61,7 @@ struct A { "elements": [ { "bases": [], - "display_name": "clanguml::t00037::ST", + "display_name": "ST", "id": "11203041379038775", "is_abstract": false, "is_nested": false, @@ -108,7 +108,7 @@ struct A { }, { "bases": [], - "display_name": "clanguml::t00037::ST::(dimensions)", + "display_name": "ST::(dimensions)", "id": "1980820317972901050", "is_abstract": false, "is_nested": true, @@ -179,7 +179,7 @@ struct A { }, { "bases": [], - "display_name": "clanguml::t00037::ST::(units)", + "display_name": "ST::(units)", "id": "1811145508890403377", "is_abstract": false, "is_nested": true, @@ -226,7 +226,7 @@ struct A { }, { "bases": [], - "display_name": "clanguml::t00037::A", + "display_name": "A", "id": "1322794181774144954", "is_abstract": false, "is_nested": false, @@ -288,6 +288,7 @@ struct A { } ], "name": "t00037_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00037_class.svg b/docs/test_cases/t00037_class.svg index 886be4f8..4f965b6f 100644 --- a/docs/test_cases/t00037_class.svg +++ b/docs/test_cases/t00037_class.svg @@ -1,135 +1,127 @@ - + + + + + + + - - - - - - ST - - - - - - - - dimensions : ST::(anonymous_662) - - - - - - - units : ST::(anonymous_792) - - + + + + + ST + + - - - - - - ST::(dimensions) - - - - - - - - t : double - - - - - - - x : double - - - - - - - y : double - - - - - - - z : double - - + + + - - - - - - ST::(units) - - - - - - - - c : double - - - - - - - h : double - - + + dimensions : ST::(anonymous_662) - - - - - - A - - - - - - - A() : void - - - - - - - - st : ST - - + + + - - - - - dimensions - - - - - - units - - - - - - st - + + units : ST::(anonymous_792) + + + + + + ST::(dimensions) + + + + + + + + + t : double + + + + + + + x : double + + + + + + + y : double + + + + + + + z : double + + + + + + ST::(units) + + + + + + + + + c : double + + + + + + + h : double + + + + + + A + + + + + + + + A() : void + + + + + + + + st : ST + + + + + dimensions + + + + units + + + + st diff --git a/docs/test_cases/t00037_class_mermaid.svg b/docs/test_cases/t00037_class_mermaid.svg index e4134f43..c50a3d86 100644 --- a/docs/test_cases/t00037_class_mermaid.svg +++ b/docs/test_cases/t00037_class_mermaid.svg @@ -1,63 +1,58 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - + + + @@ -95,7 +90,7 @@ - + @@ -124,7 +119,7 @@ - + @@ -163,7 +158,7 @@ - + @@ -192,11 +187,11 @@ - + - - - + + +
@@ -208,14 +203,14 @@ A
- +
+st : ST
- +
- +A() : : void + +A() : void
diff --git a/docs/test_cases/t00038.md b/docs/test_cases/t00038.md index fd0e2441..29bbeb56 100644 --- a/docs/test_cases/t00038.md +++ b/docs/test_cases/t00038.md @@ -125,7 +125,7 @@ struct map", + "display_name": "map", "id": "1917560728132448300", "is_abstract": false, "is_nested": false, @@ -277,7 +277,7 @@ struct map>", + "display_name": "map>", "id": "1664022047310891203", "is_abstract": false, "is_nested": false, @@ -326,7 +326,7 @@ struct map>", + "display_name": "map>", "id": "307700801045535833", "is_abstract": false, "is_nested": false, @@ -375,7 +375,7 @@ struct map>>", + "display_name": "map>>", "id": "548231528417484191", "is_abstract": false, "is_nested": false, @@ -431,7 +431,7 @@ struct map>>>", + "display_name": "map>>>", "id": "1510200402118706005", "is_abstract": false, "is_nested": false, @@ -493,6 +493,7 @@ struct map + + + + + + + - - - - - - thirdparty::ns1::color_t - - red - green - blue - - + + + + + thirdparty::ns1::color_t + + red + green + blue + - - - - - - thirdparty::ns1::E - - - + + + + + thirdparty::ns1::E + + - - - - - - property_t - - property_a - property_b - property_c - - + + + + + property_t + + property_a + property_b + property_c + - - - - - - A - - - + + + + + A + + - - - - - - B - - - + + + + + B + + - - - - - - C - - - + + + + + C + + - - - - - - key_t - - - - - - - - key : std::string - - + + + + + key_t + + - - - - - - map - - T - - - + + + - - - - - - map - - std::integral_constant<thirdparty::ns1::color_t,thirdparty::ns1::color_t::red> - - - + + key : std::string - - - - - - map - - std::integral_constant<property_t,property_t::property_a> - - - + + + + + map + + T + + - - - - - - map - - std::vector<std::integral_constant<property_t,property_t::property_b>> - - - + + + + + map + + std::integral_constant<thirdparty::ns1::color_t,thirdparty::ns1::color_t::red> + + - - - - - - map - - std::map<key_t,std::vector<std::integral_constant<property_t,property_t::property_c>>> - - - + + + + + map + + std::integral_constant<property_t,property_t::property_a> + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + map + + std::vector<std::integral_constant<property_t,property_t::property_b>> + + + + + + + + map + + std::map<key_t,std::vector<std::integral_constant<property_t,property_t::property_c>>> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/test_cases/t00038_class_mermaid.svg b/docs/test_cases/t00038_class_mermaid.svg index 295655d0..f3d43227 100644 --- a/docs/test_cases/t00038_class_mermaid.svg +++ b/docs/test_cases/t00038_class_mermaid.svg @@ -1,73 +1,68 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -207,7 +202,7 @@ - + @@ -241,7 +236,7 @@ - + @@ -260,7 +255,7 @@ - + @@ -294,7 +289,7 @@ - + @@ -313,7 +308,7 @@ - + @@ -332,7 +327,7 @@ - + @@ -351,7 +346,7 @@ - + @@ -375,7 +370,7 @@ - + @@ -394,7 +389,7 @@ - + @@ -413,7 +408,7 @@ - + @@ -432,7 +427,7 @@ - + @@ -451,7 +446,7 @@ - + diff --git a/docs/test_cases/t00039.md b/docs/test_cases/t00039.md index 93ee3eb8..fe316946 100644 --- a/docs/test_cases/t00039.md +++ b/docs/test_cases/t00039.md @@ -95,7 +95,7 @@ template struct FFF : public FF { "elements": [ { "bases": [], - "display_name": "clanguml::t00039::C", + "display_name": "C", "id": "241234977032861936", "is_abstract": false, "is_nested": false, @@ -117,7 +117,7 @@ template struct FFF : public FF { }, { "bases": [], - "display_name": "clanguml::t00039::D", + "display_name": "D", "id": "1975187139659616784", "is_abstract": false, "is_nested": false, @@ -139,7 +139,7 @@ template struct FFF : public FF { }, { "bases": [], - "display_name": "clanguml::t00039::E", + "display_name": "E", "id": "1959131184346890363", "is_abstract": false, "is_nested": false, @@ -174,7 +174,7 @@ template struct FFF : public FF { "name": "clanguml::t00039::D" } ], - "display_name": "clanguml::t00039::CD", + "display_name": "CD", "id": "850483622527996929", "is_abstract": false, "is_nested": false, @@ -209,7 +209,7 @@ template struct FFF : public FF { "name": "clanguml::t00039::E" } ], - "display_name": "clanguml::t00039::DE", + "display_name": "DE", "id": "1316022308303681160", "is_abstract": false, "is_nested": false, @@ -250,7 +250,7 @@ template struct FFF : public FF { "name": "clanguml::t00039::E" } ], - "display_name": "clanguml::t00039::CDE", + "display_name": "CDE", "id": "1877487144594774465", "is_abstract": false, "is_nested": false, @@ -272,7 +272,7 @@ template struct FFF : public FF { }, { "bases": [], - "display_name": "clanguml::t00039::A", + "display_name": "A", "id": "1051171525946759825", "is_abstract": false, "is_nested": false, @@ -301,7 +301,7 @@ template struct FFF : public FF { "name": "clanguml::t00039::A" } ], - "display_name": "clanguml::t00039::AA", + "display_name": "AA", "id": "1761969273600680013", "is_abstract": false, "is_nested": false, @@ -330,7 +330,7 @@ template struct FFF : public FF { "name": "clanguml::t00039::AA" } ], - "display_name": "clanguml::t00039::AAA", + "display_name": "AAA", "id": "2158483243842147804", "is_abstract": false, "is_nested": false, @@ -372,7 +372,7 @@ template struct FFF : public FF { "name": "clanguml::t00039::AAA" } ], - "display_name": "clanguml::t00039::ns2::AAAA", + "display_name": "ns2::AAAA", "id": "1857294881176816154", "is_abstract": false, "is_nested": false, @@ -394,7 +394,7 @@ template struct FFF : public FF { }, { "bases": [], - "display_name": "clanguml::t00039::ns3::F", + "display_name": "ns3::F", "id": "955785395599769805", "is_abstract": false, "is_nested": false, @@ -443,7 +443,7 @@ template struct FFF : public FF { "name": "F" } ], - "display_name": "clanguml::t00039::ns3::FF", + "display_name": "ns3::FF", "id": "1321996888067531304", "is_abstract": false, "is_nested": false, @@ -498,7 +498,7 @@ template struct FFF : public FF { "name": "F" } ], - "display_name": "clanguml::t00039::ns3::FE", + "display_name": "ns3::FE", "id": "2008055732881129924", "is_abstract": false, "is_nested": false, @@ -553,7 +553,7 @@ template struct FFF : public FF { "name": "FF" } ], - "display_name": "clanguml::t00039::ns3::FFF", + "display_name": "ns3::FFF", "id": "1617455840736919039", "is_abstract": false, "is_nested": false, @@ -607,6 +607,7 @@ template struct FFF : public FF { } ], "name": "t00039_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00039_class.svg b/docs/test_cases/t00039_class.svg index c7908bc0..8717a5f5 100644 --- a/docs/test_cases/t00039_class.svg +++ b/docs/test_cases/t00039_class.svg @@ -1,242 +1,194 @@ - + + + + + + + - - - - - - C - - - + + + + + C + + - - - - - - D - - - + + + + + D + + - - - - - - E - - - + + + + + E + + - - - - - - CD - - - + + + + + CD + + - - - - - - DE - - - + + + + + DE + + - - - - - - CDE - - - + + + + + CDE + + - - - - - - A - - - + + + + + A + + - - - - - - AA - - - + + + + + AA + + - - - - - - AAA - - - - - - - - b : B * - - + + + + + AAA + + - - - - - - ns2::AAAA - - - + + + - - - - - - ns3::F - - T - - - - - - - - t : T * - - + + b : B * - - - - - - ns3::FF - - T,M - - - - - - - - m : M * - - + + + + + ns2::AAAA + + - - - - - - ns3::FE - - T,M - - - - - - - - m : M * - - + + + + + ns3::F + + T + + - - - - - - ns3::FFF - - T,M,N - - - - - - - - n : N * - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + t : T * + + + + + + ns3::FF + + T,M + + + + + + + + + m : M * + + + + + + ns3::FE + + T,M + + + + + + + + + m : M * + + + + + + ns3::FFF + + T,M,N + + + + + + + + + n : N * + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/test_cases/t00039_class_mermaid.svg b/docs/test_cases/t00039_class_mermaid.svg index 1b7fa36d..1ce167e2 100644 --- a/docs/test_cases/t00039_class_mermaid.svg +++ b/docs/test_cases/t00039_class_mermaid.svg @@ -1,73 +1,68 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -189,7 +184,7 @@ - + @@ -208,7 +203,7 @@ - + @@ -227,7 +222,7 @@ - + @@ -246,7 +241,7 @@ - + @@ -265,7 +260,7 @@ - + @@ -284,7 +279,7 @@ - + @@ -303,7 +298,7 @@ - + @@ -322,7 +317,7 @@ - + @@ -341,7 +336,7 @@ - + @@ -359,13 +354,13 @@
- +b : B + +b : B
- + @@ -384,7 +379,7 @@ - + @@ -402,13 +397,13 @@
- +t : T + +t : T
- + @@ -426,13 +421,13 @@
- +m : M + +m : M
- + @@ -450,13 +445,13 @@
- +m : M + +m : M
- + @@ -474,7 +469,7 @@
- +n : N + +n : N
diff --git a/docs/test_cases/t00040.md b/docs/test_cases/t00040.md index e056f27a..fe1d5978 100644 --- a/docs/test_cases/t00040.md +++ b/docs/test_cases/t00040.md @@ -71,7 +71,7 @@ struct R { "elements": [ { "bases": [], - "display_name": "clanguml::t00040::A", + "display_name": "A", "id": "307580006083737677", "is_abstract": false, "is_nested": false, @@ -152,7 +152,7 @@ struct R { "name": "clanguml::t00040::A" } ], - "display_name": "clanguml::t00040::AA", + "display_name": "AA", "id": "534115812779766127", "is_abstract": false, "is_nested": false, @@ -181,7 +181,7 @@ struct R { "name": "clanguml::t00040::AA" } ], - "display_name": "clanguml::t00040::AAA", + "display_name": "AAA", "id": "745371908432158369", "is_abstract": false, "is_nested": false, @@ -255,7 +255,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00040::R", + "display_name": "R", "id": "1539035020975101539", "is_abstract": false, "is_nested": false, @@ -309,6 +309,7 @@ struct R { } ], "name": "t00040_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00040_class.svg b/docs/test_cases/t00040_class.svg index 10544533..485e74a9 100644 --- a/docs/test_cases/t00040_class.svg +++ b/docs/test_cases/t00040_class.svg @@ -1,90 +1,84 @@ - + + + + + + + - - - - - - A - - - - - - - get_a() : int - - - - - - - - ii_ : int - - + + + + + A + - - - - - - AA - - - + + + - - - - - - AAA - - - - - - - get_aaa() : int - - - - - - - - b : B * - - + + get_a() : int - - - - - - R - - - - - - - foo(A * a) : void - - - + + + + - - - - - - - - + + ii_ : int + + + + + + AA + + + + + + + + AAA + + + + + + + + get_aaa() : int + + + + + + + + b : B * + + + + + + R + + + + + + + + foo(A * a) : void + + + + + + diff --git a/docs/test_cases/t00040_class_mermaid.svg b/docs/test_cases/t00040_class_mermaid.svg index 80686e75..f73719bd 100644 --- a/docs/test_cases/t00040_class_mermaid.svg +++ b/docs/test_cases/t00040_class_mermaid.svg @@ -1,62 +1,57 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - + + @@ -79,11 +74,11 @@ - + - - - + + +
@@ -95,20 +90,20 @@ A
- +
#ii_ : int
- +
- +get_a() : : int + +get_a() : int
- + @@ -127,11 +122,11 @@ - + - - - + + +
@@ -143,24 +138,24 @@ AAA
- +
- +b : B + +b : B
- +
- +get_aaa() : : int + +get_aaa() : int
- + - - - + + +
@@ -172,9 +167,9 @@ R
- +
- +foo(A * a) : : void + +foo(A * a) : void
diff --git a/docs/test_cases/t00041.md b/docs/test_cases/t00041.md index b722a0d3..d881e31d 100644 --- a/docs/test_cases/t00041.md +++ b/docs/test_cases/t00041.md @@ -82,7 +82,7 @@ struct NM : public N { }; "elements": [ { "bases": [], - "display_name": "clanguml::t00041::R", + "display_name": "R", "id": "775317088453163919", "is_abstract": false, "is_nested": false, @@ -104,7 +104,7 @@ struct NM : public N { }; }, { "bases": [], - "display_name": "clanguml::t00041::D", + "display_name": "D", "id": "1798851434286108347", "is_abstract": false, "is_nested": false, @@ -139,7 +139,7 @@ struct NM : public N { }; }, { "bases": [], - "display_name": "clanguml::t00041::E", + "display_name": "E", "id": "2158730167547707264", "is_abstract": false, "is_nested": false, @@ -161,7 +161,7 @@ struct NM : public N { }; }, { "bases": [], - "display_name": "clanguml::t00041::F", + "display_name": "F", "id": "430600213408545846", "is_abstract": false, "is_nested": false, @@ -190,7 +190,7 @@ struct NM : public N { }; "name": "clanguml::t00041::R" } ], - "display_name": "clanguml::t00041::RR", + "display_name": "RR", "id": "175608867682236642", "is_abstract": false, "is_nested": false, @@ -288,7 +288,7 @@ struct NM : public N { }; "name": "clanguml::t00041::RR" } ], - "display_name": "clanguml::t00041::RRR", + "display_name": "RRR", "id": "819254010294444715", "is_abstract": false, "is_nested": false, @@ -310,7 +310,7 @@ struct NM : public N { }; }, { "bases": [], - "display_name": "clanguml::t00041::ns1::N", + "display_name": "ns1::N", "id": "220253364661036147", "is_abstract": false, "is_nested": false, @@ -339,7 +339,7 @@ struct NM : public N { }; "name": "clanguml::t00041::ns1::N" } ], - "display_name": "clanguml::t00041::ns1::NN", + "display_name": "ns1::NN", "id": "618038667214398895", "is_abstract": false, "is_nested": false, @@ -368,7 +368,7 @@ struct NM : public N { }; "name": "clanguml::t00041::ns1::N" } ], - "display_name": "clanguml::t00041::ns1::NM", + "display_name": "ns1::NM", "id": "1206750351408617127", "is_abstract": false, "is_nested": false, @@ -390,6 +390,7 @@ struct NM : public N { }; } ], "name": "t00041_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00041_class.svg b/docs/test_cases/t00041_class.svg index d180aeb3..4bb4b9dc 100644 --- a/docs/test_cases/t00041_class.svg +++ b/docs/test_cases/t00041_class.svg @@ -1,164 +1,138 @@ - + + + + + + + - - - - - - R - - - + + + + + R + + - - - - - - D - - - - - - - - rr : RR * - - + + + + + D + + - - - - - - E - - - + + + - - - - - - F - - - + + rr : RR * - - - - - - RR - - - - - - - foo(H * h) : void - - - - - - - - e : E * - - - - - - - f : F * - - - - - - - g : detail::G * - - + + + + + E + + - - - - - - RRR - - - + + + + + F + + - - - - - - ns1::N - - - + + + + + RR + - - - - - - ns1::NN - - - + + + - - - - - - ns1::NM - - - + + foo(H * h) : void - - - - - rr - - - - - +e - - - - - +f - - - - - - - - - - - - - - - - - + + + + + + + e : E * + + + + + + + f : F * + + + + + + + g : detail::G * + + + + + + RRR + + + + + + + + ns1::N + + + + + + + + ns1::NN + + + + + + + + ns1::NM + + + + + + + rr + + + +e + + + +f + + + + + + + + diff --git a/docs/test_cases/t00041_class_mermaid.svg b/docs/test_cases/t00041_class_mermaid.svg index 8fcc6158..a73afadb 100644 --- a/docs/test_cases/t00041_class_mermaid.svg +++ b/docs/test_cases/t00041_class_mermaid.svg @@ -1,67 +1,62 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - + + + + + + + @@ -135,7 +130,7 @@ - + @@ -154,7 +149,7 @@ - + @@ -172,13 +167,13 @@
- +rr : RR + +rr : RR
- + @@ -197,7 +192,7 @@ - + @@ -216,11 +211,11 @@ - + - - - + + +
@@ -232,30 +227,30 @@ RR
- +
- +e : E + +e : E
- +
- +f : F + +f : F
- +
- +g : detail::G + +g : detail::G
- +
- +foo(H * h) : : void + +foo(H * h) : void
- + @@ -274,7 +269,7 @@ - + @@ -293,7 +288,7 @@ - + @@ -312,7 +307,7 @@ - + diff --git a/docs/test_cases/t00042.md b/docs/test_cases/t00042.md index 33b62d25..f9e2e655 100644 --- a/docs/test_cases/t00042.md +++ b/docs/test_cases/t00042.md @@ -67,7 +67,7 @@ struct R { "elements": [ { "bases": [], - "display_name": "clanguml::t00042::A", + "display_name": "A", "id": "462160951579835462", "is_abstract": false, "is_nested": false, @@ -109,7 +109,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00042::A", + "display_name": "A", "id": "1422802342059669545", "is_abstract": false, "is_nested": false, @@ -151,7 +151,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00042::B", + "display_name": "B", "id": "1414456934388678010", "is_abstract": false, "is_nested": false, @@ -211,7 +211,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00042::A", + "display_name": "A", "id": "364538479078826988", "is_abstract": false, "is_nested": false, @@ -240,7 +240,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00042::A", + "display_name": "A", "id": "496773262538580186", "is_abstract": false, "is_nested": false, @@ -269,7 +269,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00042::B", + "display_name": "B", "id": "1833471931530161359", "is_abstract": false, "is_nested": false, @@ -304,6 +304,7 @@ struct R { } ], "name": "t00042_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00042_class.svg b/docs/test_cases/t00042_class.svg index 717a876a..1569025d 100644 --- a/docs/test_cases/t00042_class.svg +++ b/docs/test_cases/t00042_class.svg @@ -1,123 +1,109 @@ - + + + + + + + - - - - - - A - - T - - - - - - - - a : T - - + + + + + A + + T + + - - - - - - A - - void - - - - - - - - a : void * - - + + + - - - - - - B - - T,K - - - - - - - - b : T - - - - - - - bb : K - - + + a : T - - - - - - A - - double - - - + + + + + A + + void + + - - - - - - A - - std::string - - - + + + - - - - - - B - - int,float - - - + + a : void * - - - - - - - - - - - - - - - - + + + + + B + + T,K + + + + + + + + + b : T + + + + + + + bb : K + + + + + + A + + double + + + + + + + + A + + std::string + + + + + + + + B + + int,float + + + + + + + + + + + diff --git a/docs/test_cases/t00042_class_mermaid.svg b/docs/test_cases/t00042_class_mermaid.svg index 7066f0dd..c9b59370 100644 --- a/docs/test_cases/t00042_class_mermaid.svg +++ b/docs/test_cases/t00042_class_mermaid.svg @@ -1,64 +1,59 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - + + + + @@ -107,7 +102,7 @@ - + @@ -131,7 +126,7 @@ - + @@ -149,13 +144,13 @@
- +a : void + +a : void
- + @@ -184,7 +179,7 @@ - + @@ -203,7 +198,7 @@ - + @@ -222,7 +217,7 @@ - + diff --git a/docs/test_cases/t00043.md b/docs/test_cases/t00043.md index 3c402377..be2f8518 100644 --- a/docs/test_cases/t00043.md +++ b/docs/test_cases/t00043.md @@ -85,11 +85,11 @@ struct J { "diagram_type": "class", "elements": [ { - "display_name": "clanguml::t00043::dependants", + "display_name": "dependants", "elements": [ { "bases": [], - "display_name": "clanguml::t00043::dependants::A", + "display_name": "dependants::A", "id": "1454679300998460550", "is_abstract": false, "is_nested": false, @@ -111,7 +111,7 @@ struct J { }, { "bases": [], - "display_name": "clanguml::t00043::dependants::B", + "display_name": "dependants::B", "id": "1972977265990430931", "is_abstract": false, "is_nested": false, @@ -165,7 +165,7 @@ struct J { }, { "bases": [], - "display_name": "clanguml::t00043::dependants::BB", + "display_name": "dependants::BB", "id": "1906291555025945295", "is_abstract": false, "is_nested": false, @@ -219,7 +219,7 @@ struct J { }, { "bases": [], - "display_name": "clanguml::t00043::dependants::C", + "display_name": "dependants::C", "id": "823759225351121534", "is_abstract": false, "is_nested": false, @@ -273,7 +273,7 @@ struct J { }, { "bases": [], - "display_name": "clanguml::t00043::dependants::D", + "display_name": "dependants::D", "id": "2277976215348279426", "is_abstract": false, "is_nested": false, @@ -358,7 +358,7 @@ struct J { }, { "bases": [], - "display_name": "clanguml::t00043::dependants::E", + "display_name": "dependants::E", "id": "1694685540293810116", "is_abstract": false, "is_nested": false, @@ -415,11 +415,11 @@ struct J { "type": "namespace" }, { - "display_name": "clanguml::t00043::dependencies", + "display_name": "dependencies", "elements": [ { "bases": [], - "display_name": "clanguml::t00043::dependencies::G", + "display_name": "dependencies::G", "id": "736400571183204899", "is_abstract": false, "is_nested": false, @@ -441,7 +441,7 @@ struct J { }, { "bases": [], - "display_name": "clanguml::t00043::dependencies::GG", + "display_name": "dependencies::GG", "id": "1522297681294871411", "is_abstract": false, "is_nested": false, @@ -463,7 +463,7 @@ struct J { }, { "bases": [], - "display_name": "clanguml::t00043::dependencies::H", + "display_name": "dependencies::H", "id": "1534191494825314170", "is_abstract": false, "is_nested": false, @@ -548,7 +548,7 @@ struct J { }, { "bases": [], - "display_name": "clanguml::t00043::dependencies::I", + "display_name": "dependencies::I", "id": "97422543769740359", "is_abstract": false, "is_nested": false, @@ -602,7 +602,7 @@ struct J { }, { "bases": [], - "display_name": "clanguml::t00043::dependencies::J", + "display_name": "dependencies::J", "id": "1498530043106438011", "is_abstract": false, "is_nested": false, @@ -660,6 +660,7 @@ struct J { } ], "name": "t00043_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00043_class.svg b/docs/test_cases/t00043_class.svg index 259b5c5e..3c82ea0e 100644 --- a/docs/test_cases/t00043_class.svg +++ b/docs/test_cases/t00043_class.svg @@ -1,237 +1,197 @@ - + + + + + + + - - - - dependants - - - - - dependencies - - - - - - - A - - - + + + dependants + + + dependencies + + + + + A + + - - - - - - B - - - - - - - b(A * a) : void - - - + + + + + B + - - - - - - BB - - - - - - - bb(A * a) : void - - - + + + - - - - - - C - - - - - - - c(B * b) : void - - - + + b(A * a) : void - - - - - - D - - - - - - - d(C * c) : void - - - - - - - dd(BB * bb) : void - - - + + + + + + BB + - - - - - - E - - - - - - - e(D * d) : void - - - + + + - - - - - - G - - - + + bb(A * a) : void - - - - - - GG - - - + + + + + + C + - - - - - - H - - - - - - - h(G * g) : void - - - - - - - hh(GG * gg) : void - - - + + + - - - - - - I - - - - - - - i(H * h) : void - - - + + c(B * b) : void - - - - - - J - - - - - - - i(I * i) : void - - - + + + + + + D + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + d(C * c) : void + + + + + + + dd(BB * bb) : void + + + + + + + E + + + + + + + + e(D * d) : void + + + + + + + G + + + + + + + + GG + + + + + + + + H + + + + + + + + h(G * g) : void + + + + + + + hh(GG * gg) : void + + + + + + + I + + + + + + + + i(H * h) : void + + + + + + + J + + + + + + + + i(I * i) : void + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/test_cases/t00043_class_mermaid.svg b/docs/test_cases/t00043_class_mermaid.svg index 7c66978f..3e6c6a45 100644 --- a/docs/test_cases/t00043_class_mermaid.svg +++ b/docs/test_cases/t00043_class_mermaid.svg @@ -1,70 +1,65 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - - - + + + + + + + + + + @@ -179,7 +174,7 @@ - + @@ -198,11 +193,11 @@ - + - - - + + +
@@ -214,15 +209,15 @@ dependants::B
- +
- +b(A * a) : : void + +b(A * a) : void
- + @@ -238,19 +233,19 @@ dependants::BB - +
- +bb(A * a) : : void + +bb(A * a) : void
- + - - - + + +
@@ -262,19 +257,19 @@ dependants::C
- +
- +c(B * b) : : void + +c(B * b) : void
- + - - - + + +
@@ -286,24 +281,24 @@ dependants::D
- +
- +d(C * c) : : void + +d(C * c) : void
- +
- +dd(BB * bb) : : void + +dd(BB * bb) : void
- + - - - + + +
@@ -315,15 +310,15 @@ dependants::E
- +
- +e(D * d) : : void + +e(D * d) : void
- + @@ -342,7 +337,7 @@ - + @@ -361,11 +356,11 @@ - + - - - + + +
@@ -377,20 +372,20 @@ dependencies::H
- +
- +h(G * g) : : void + +h(G * g) : void
- +
- +hh(GG * gg) : : void + +hh(GG * gg) : void
- + @@ -406,15 +401,15 @@ dependencies::I - +
- +i(H * h) : : void + +i(H * h) : void
- + @@ -430,9 +425,9 @@ dependencies::J - +
- +i(I * i) : : void + +i(I * i) : void
diff --git a/docs/test_cases/t00044.md b/docs/test_cases/t00044.md index 4cf62d1c..e11b072d 100644 --- a/docs/test_cases/t00044.md +++ b/docs/test_cases/t00044.md @@ -65,7 +65,7 @@ struct R { "elements": [ { "bases": [], - "display_name": "clanguml::t00044::signal_handler", + "display_name": "signal_handler", "id": "1591729735727316875", "is_abstract": false, "is_nested": false, @@ -112,7 +112,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00044::sink>", + "display_name": "sink>", "id": "559574389062594251", "is_abstract": false, "is_nested": false, @@ -231,7 +231,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00044::signal_handler", + "display_name": "signal_handler", "id": "103559998624864011", "is_abstract": false, "is_nested": false, @@ -278,7 +278,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00044::sink>", + "display_name": "sink>", "id": "1718007222067272862", "is_abstract": false, "is_nested": false, @@ -332,7 +332,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00044::R", + "display_name": "R", "id": "1644484569399365272", "is_abstract": false, "is_nested": false, @@ -367,7 +367,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00044::signal_handler", + "display_name": "signal_handler", "id": "276594465967577895", "is_abstract": false, "is_nested": false, @@ -402,7 +402,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00044::sink", + "display_name": "sink", "id": "1759724482769288325", "is_abstract": false, "is_nested": false, @@ -431,6 +431,7 @@ struct R { } ], "name": "t00044_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00044_class.svg b/docs/test_cases/t00044_class.svg index 169ae58c..c4273877 100644 --- a/docs/test_cases/t00044_class.svg +++ b/docs/test_cases/t00044_class.svg @@ -1,145 +1,123 @@ - + + + + + + + - - - - - - signal_handler - - Ret(Args...),A - - - + + + + + signal_handler + + Ret(Args...),A + + - - - - - - sink - - signal_handler<Ret(Args...),A> - - - - - - - sink(signal_t & sh) : void - - - - get_signal<CastTo>() : CastTo * - - - - - - - signal : signal_t * - - + + + + + sink + + signal_handler<Ret(Args...),A> + - - - - - - signal_handler - - void(int),bool - - - + + + - - - - - - sink - - signal_handler<void(int),bool> - - - + + sink(signal_t & sh) : void - - - - - - R - - - - - - - - sink1 : sink<signal_handler<void (int),bool>> - - + + + get_signal<CastTo>() : CastTo * + + + + - - - - - - signal_handler - - T,A - - - + + signal : signal_t * - - - - - - sink - - T - - - + + + + + signal_handler + + void(int),bool + + - - - - - - - - - signal - - - - - - - - - - - - - - - - - - - - - - sink1 - + + + + + sink + + signal_handler<void(int),bool> + + + + + + + + R + + + + + + + + + sink1 : sink<signal_handler<void (int),bool>> + + + + + + signal_handler + + T,A + + + + + + + + sink + + T + + + + + + + + + signal + + + + + + + + + + + + sink1 diff --git a/docs/test_cases/t00044_class_mermaid.svg b/docs/test_cases/t00044_class_mermaid.svg index 44861534..0edaa5eb 100644 --- a/docs/test_cases/t00044_class_mermaid.svg +++ b/docs/test_cases/t00044_class_mermaid.svg @@ -1,67 +1,62 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - + + + + + + + @@ -143,7 +138,7 @@ - + @@ -162,7 +157,7 @@ - + @@ -180,23 +175,23 @@
- -signal : signal_t + -signal : signal_t
- +
- +sink(signal_t & sh) : : void + +sink(signal_t & sh) : void
- +
- +get_signal() : : CastTo + +get_signal() : CastTo
- + @@ -215,7 +210,7 @@ - + @@ -234,7 +229,7 @@ - + @@ -258,7 +253,7 @@ - + @@ -277,7 +272,7 @@ - + diff --git a/docs/test_cases/t00045.md b/docs/test_cases/t00045.md index 0f47adf1..4659275c 100644 --- a/docs/test_cases/t00045.md +++ b/docs/test_cases/t00045.md @@ -462,6 +462,7 @@ public: } ], "name": "t00045_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00045_class.svg b/docs/test_cases/t00045_class.svg index 75abbfb1..5be5be00 100644 --- a/docs/test_cases/t00045_class.svg +++ b/docs/test_cases/t00045_class.svg @@ -1,220 +1,182 @@ - + + + + + + + - - - - - - A - - - + + + + + A + + - - - - - - AA - - - + + + + + AA + + - - - - - - AAA - - - + + + + + AAA + + - - - - - - AAAA - - T - - - - - - - - t : T - - + + + + + AAAA + + T + + - - - - - - ns1::A - - - + + + - - - - - - ns1::ns2::A - - - + + t : T - - - - - - ns1::ns2::B - - - + + + + + ns1::A + + - - - - - - ns1::ns2::C - - - + + + + + ns1::ns2::A + + - - - - - - ns1::ns2::D - - - + + + + + ns1::ns2::B + + - - - - - - ns1::ns2::E - - - + + + + + ns1::ns2::C + + - - - - - - ns1::ns2::AAA - - - + + + + + ns1::ns2::D + + - - - - - - ns1::ns2::R - - - - - - - foo(AA & aa) : void - - - - - - - - a : A * - - - - - - - ns1_a : ns1::A * - - - - - - - ns1_ns2_a : ns1::ns2::A * - - - - - - - root_a : ::A * - - + + + + + ns1::ns2::E + + - - - - - - - - - - - - - - - - - - - - - - - - +a - - - - - - ns1_ns2_a - - - - - - ns1_a - - - - - - root_a - - - - - - «friend» - + + + + + ns1::ns2::AAA + + + + + + + + ns1::ns2::R + + + + + + + + foo(AA & aa) : void + + + + + + + + a : A * + + + + + + + ns1_a : ns1::A * + + + + + + + ns1_ns2_a : ns1::ns2::A * + + + + + + + root_a : ::A * + + + + + + + + + + + + + + +a + + + + ns1_ns2_a + + + + ns1_a + + + + root_a + + + + «friend» diff --git a/docs/test_cases/t00045_class_mermaid.svg b/docs/test_cases/t00045_class_mermaid.svg index af6e347f..32b5fb6f 100644 --- a/docs/test_cases/t00045_class_mermaid.svg +++ b/docs/test_cases/t00045_class_mermaid.svg @@ -1,70 +1,65 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - - - + + + + + + + + + + @@ -171,7 +166,7 @@ - + @@ -190,7 +185,7 @@ - + @@ -209,7 +204,7 @@ - + @@ -228,7 +223,7 @@ - + @@ -252,7 +247,7 @@ - + @@ -271,7 +266,7 @@ - + @@ -290,7 +285,7 @@ - + @@ -309,7 +304,7 @@ - + @@ -328,7 +323,7 @@ - + @@ -347,7 +342,7 @@ - + @@ -366,7 +361,7 @@ - + @@ -385,7 +380,7 @@ - + @@ -403,27 +398,27 @@
- +a : A + +a : A
- +ns1_a : ns1::A + +ns1_a : ns1::A
- +ns1_ns2_a : ns1::ns2::A + +ns1_ns2_a : ns1::ns2::A
- +root_a : ::A + +root_a : ::A
- +
- +foo(AA & aa) : : void + +foo(AA & aa) : void
diff --git a/docs/test_cases/t00046.md b/docs/test_cases/t00046.md index 75993b5f..46bccef1 100644 --- a/docs/test_cases/t00046.md +++ b/docs/test_cases/t00046.md @@ -130,7 +130,7 @@ public: "type": "class" }, { - "display_name": "ns1::ns2", + "display_name": "ns2", "elements": [ { "bases": [], @@ -395,6 +395,7 @@ public: } ], "name": "t00046_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00046_class.svg b/docs/test_cases/t00046_class.svg index a3161785..22273711 100644 --- a/docs/test_cases/t00046_class.svg +++ b/docs/test_cases/t00046_class.svg @@ -1,192 +1,158 @@ - + + + + + + + - - - - ns1 - - - - - ns2 - - - - - - - A - - - + + + ns1 + + + ns2 + + + + + A + + - - - - - - A - - - + + + + + A + + - - - - - - B - - - + + + + + B + + - - - - - - C - - - + + + + + C + + - - - - - - D - - - + + + + + D + + - - - - - - E - - - + + + + + E + + - - - - - - R - - - - - - - foo(AA & aa) : void - - - - - - - - a : A * - - - - - - - i : std::vector<std::uint8_t> - - - - - - - ns1_a : ns1::A * - - - - - - - ns1_ns2_a : ns1::ns2::A * - - - - - - - root_a : ::A * - - + + + + + R + - - - - - - A - - - + + + - - - - - - AA - - - + + foo(AA & aa) : void - - - - - - - - - - - - - - - - - - - - - - - - +a - - - - - - ns1_ns2_a - - - - - - ns1_a - - - - - - root_a - + + + + + + + a : A * + + + + + + + i : std::vector<std::uint8_t> + + + + + + + ns1_a : ns1::A * + + + + + + + ns1_ns2_a : ns1::ns2::A * + + + + + + + root_a : ::A * + + + + + + A + + + + + + + + AA + + + + + + + + + + + + + + + + +a + + + + ns1_ns2_a + + + + ns1_a + + + + root_a diff --git a/docs/test_cases/t00046_class_mermaid.svg b/docs/test_cases/t00046_class_mermaid.svg index c3343e19..448fcbdf 100644 --- a/docs/test_cases/t00046_class_mermaid.svg +++ b/docs/test_cases/t00046_class_mermaid.svg @@ -1,69 +1,64 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - - + + + + + + + + + @@ -159,7 +154,7 @@ - + @@ -178,7 +173,7 @@ - + @@ -197,7 +192,7 @@ - + @@ -216,7 +211,7 @@ - + @@ -235,7 +230,7 @@ - + @@ -254,7 +249,7 @@ - + @@ -273,7 +268,7 @@ - + @@ -292,7 +287,7 @@ - + @@ -311,7 +306,7 @@ - + @@ -329,7 +324,7 @@
- +a : A + +a : A
@@ -339,22 +334,22 @@
- +ns1_a : ns1::A + +ns1_a : ns1::A
- +ns1_ns2_a : ns1::ns2::A + +ns1_ns2_a : ns1::ns2::A
- +root_a : ::A + +root_a : ::A
- +
- +foo(AA & aa) : : void + +foo(AA & aa) : void
diff --git a/docs/test_cases/t00047.md b/docs/test_cases/t00047.md index ebd9bebd..66b74dc5 100644 --- a/docs/test_cases/t00047.md +++ b/docs/test_cases/t00047.md @@ -52,7 +52,7 @@ using conditional = typename conditional_t::type; "elements": [ { "bases": [], - "display_name": "clanguml::t00047::conditional_t", + "display_name": "conditional_t", "id": "47394280824625133", "is_abstract": false, "is_nested": false, @@ -81,7 +81,7 @@ using conditional = typename conditional_t::type; }, { "bases": [], - "display_name": "clanguml::t00047::conditional_t", + "display_name": "conditional_t", "id": "599782159389775809", "is_abstract": false, "is_nested": false, @@ -122,7 +122,7 @@ using conditional = typename conditional_t::type; }, { "bases": [], - "display_name": "clanguml::t00047::conditional_t", + "display_name": "conditional_t", "id": "824938194184364511", "is_abstract": false, "is_nested": false, @@ -163,7 +163,7 @@ using conditional = typename conditional_t::type; }, { "bases": [], - "display_name": "clanguml::t00047::conditional_t", + "display_name": "conditional_t", "id": "1673692992642087414", "is_abstract": false, "is_nested": false, @@ -192,6 +192,7 @@ using conditional = typename conditional_t::type; } ], "name": "t00047_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00047_class.svg b/docs/test_cases/t00047_class.svg index 395a2e62..87c2d77e 100644 --- a/docs/test_cases/t00047_class.svg +++ b/docs/test_cases/t00047_class.svg @@ -1,67 +1,59 @@ - + + + + + + + - - - - - - conditional_t - - Else - - - + + + + + conditional_t + + Else + + - - - - - - conditional_t - - std::true_type,Result,Tail... - - - + + + + + conditional_t + + std::true_type,Result,Tail... + + - - - - - - conditional_t - - std::false_type,Result,Tail... - - - + + + + + conditional_t + + std::false_type,Result,Tail... + + - - - - - - conditional_t - - Ts... - - - + + + + + conditional_t + + Ts... + + - - - - - - - - - - - - + + + + + + diff --git a/docs/test_cases/t00047_class_mermaid.svg b/docs/test_cases/t00047_class_mermaid.svg index 7e1b9ee2..1207c7c4 100644 --- a/docs/test_cases/t00047_class_mermaid.svg +++ b/docs/test_cases/t00047_class_mermaid.svg @@ -1,63 +1,58 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - + + + @@ -95,7 +90,7 @@ - + @@ -114,7 +109,7 @@ - + @@ -133,7 +128,7 @@ - + @@ -152,7 +147,7 @@ - + diff --git a/docs/test_cases/t00048.md b/docs/test_cases/t00048.md index 272187f4..c42e151d 100644 --- a/docs/test_cases/t00048.md +++ b/docs/test_cases/t00048.md @@ -14,28 +14,6 @@ diagrams: - clanguml::t00048 ``` ## Source code -File `tests/t00048/t00048.h` -```cpp -#pragma once - -namespace clanguml { -namespace t00048 { - -struct Base { - int base; - - virtual void foo() = 0; -}; - -template struct BaseTemplate { - T base; - - virtual void foo() = 0; -}; - -} -} -``` File `tests/t00048/b_t00048.h` ```cpp #include "t00048.h" @@ -60,14 +38,14 @@ template struct BTemplate : public BaseTemplate { } } ``` -File `tests/t00048/a_t00048.cc` +File `tests/t00048/b_t00048.cc` ```cpp -#include "a_t00048.h" +#include "b_t00048.h" namespace clanguml { namespace t00048 { -void A::foo() { } +void B::foo() { } } } @@ -105,14 +83,36 @@ template struct ATemplate : public BaseTemplate { } } ``` -File `tests/t00048/b_t00048.cc` +File `tests/t00048/a_t00048.cc` ```cpp -#include "b_t00048.h" +#include "a_t00048.h" namespace clanguml { namespace t00048 { -void B::foo() { } +void A::foo() { } + +} +} +``` +File `tests/t00048/t00048.h` +```cpp +#pragma once + +namespace clanguml { +namespace t00048 { + +struct Base { + int base; + + virtual void foo() = 0; +}; + +template struct BaseTemplate { + T base; + + virtual void foo() = 0; +}; } } @@ -128,7 +128,7 @@ void B::foo() { } "elements": [ { "bases": [], - "display_name": "clanguml::t00048::Base", + "display_name": "Base", "id": "10200626899013233", "is_abstract": true, "is_nested": false, @@ -190,7 +190,7 @@ void B::foo() { } }, { "bases": [], - "display_name": "clanguml::t00048::BaseTemplate", + "display_name": "BaseTemplate", "id": "630197772543569536", "is_abstract": true, "is_nested": false, @@ -266,7 +266,7 @@ void B::foo() { } "name": "clanguml::t00048::Base" } ], - "display_name": "clanguml::t00048::B", + "display_name": "B", "id": "59336049758992190", "is_abstract": false, "is_nested": false, @@ -335,7 +335,7 @@ void B::foo() { } "name": "BaseTemplate" } ], - "display_name": "clanguml::t00048::BTemplate", + "display_name": "BTemplate", "id": "1635850649347735305", "is_abstract": false, "is_nested": false, @@ -411,7 +411,7 @@ void B::foo() { } "name": "clanguml::t00048::Base" } ], - "display_name": "clanguml::t00048::A", + "display_name": "A", "id": "199333691834211223", "is_abstract": false, "is_nested": false, @@ -480,7 +480,7 @@ void B::foo() { } "name": "BaseTemplate" } ], - "display_name": "clanguml::t00048::ATemplate", + "display_name": "ATemplate", "id": "1025697108404463905", "is_abstract": false, "is_nested": false, @@ -549,6 +549,7 @@ void B::foo() { } } ], "name": "t00048_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00048_class.svg b/docs/test_cases/t00048_class.svg index 92d66697..cde89a08 100644 --- a/docs/test_cases/t00048_class.svg +++ b/docs/test_cases/t00048_class.svg @@ -1,173 +1,159 @@ - + + + + + + + - - - - - - Base - - - - - - - foo() = 0 : void - - - - - - - - base : int - - + + + + + Base + - - - - - - BaseTemplate - - T - - - - - - - foo() = 0 : void - - - - - - - - base : T - - + + + - - - - - - B - - - - - - - foo() : void - - - - - - - - b : int - - + + foo() = 0 : void - - - - - - BTemplate - - T - - - - - - - foo() : void - - - - - - - - b : T - - + + + + - - - - - - A - - - - - - - foo() : void - - - - - - - - a : int - - + + base : int - - - - - - ATemplate - - T - - - - - - - foo() : void - - - - - - - - a : T - - + + + + + BaseTemplate + + T + - - - - - - - - - - - - - - - - + + + + + + foo() = 0 : void + + + + + + + + base : T + + + + + + B + + + + + + + + foo() : void + + + + + + + + b : int + + + + + + BTemplate + + T + + + + + + + + foo() : void + + + + + + + + b : T + + + + + + A + + + + + + + + foo() : void + + + + + + + + a : int + + + + + + ATemplate + + T + + + + + + + + foo() : void + + + + + + + + a : T + + + + + + + + + diff --git a/docs/test_cases/t00048_class_mermaid.svg b/docs/test_cases/t00048_class_mermaid.svg index d2a635cd..3a968ce3 100644 --- a/docs/test_cases/t00048_class_mermaid.svg +++ b/docs/test_cases/t00048_class_mermaid.svg @@ -1,64 +1,59 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - + + + + @@ -99,11 +94,11 @@ - + - - - + + +
@@ -115,20 +110,20 @@ Base
- +
+base : int
- +
- +foo() : : void + +foo() : void
- + @@ -149,19 +144,19 @@ +base : T - +
- +foo() : : void + +foo() : void
- + - - - + + +
@@ -173,20 +168,20 @@ B
- +
+b : int
- +
- +foo() : : void + +foo() : void
- + @@ -207,19 +202,19 @@ +b : T - +
- +foo() : : void + +foo() : void
- + - - - + + +
@@ -231,20 +226,20 @@ A
- +
+a : int
- +
- +foo() : : void + +foo() : void
- + @@ -265,9 +260,9 @@ +a : T - +
- +foo() : : void + +foo() : void
diff --git a/docs/test_cases/t00049.md b/docs/test_cases/t00049.md index 93725f55..e076aaab 100644 --- a/docs/test_cases/t00049.md +++ b/docs/test_cases/t00049.md @@ -55,7 +55,7 @@ struct R { "elements": [ { "bases": [], - "display_name": "clanguml::t00049::A", + "display_name": "A", "id": "372971769516871577", "is_abstract": false, "is_nested": false, @@ -124,7 +124,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00049::A", + "display_name": "A", "id": "654829353386288443", "is_abstract": false, "is_nested": false, @@ -153,7 +153,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00049::A", + "display_name": "A", "id": "973058255816844469", "is_abstract": false, "is_nested": false, @@ -182,7 +182,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00049::A", + "display_name": "A", "id": "562074851310302010", "is_abstract": false, "is_nested": false, @@ -211,7 +211,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00049::R", + "display_name": "R", "id": "2288024073053091226", "is_abstract": false, "is_nested": false, @@ -328,6 +328,7 @@ struct R { } ], "name": "t00049_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00049_class.svg b/docs/test_cases/t00049_class.svg index 087c5e76..bce17cf5 100644 --- a/docs/test_cases/t00049_class.svg +++ b/docs/test_cases/t00049_class.svg @@ -1,144 +1,128 @@ - + + + + + + + - - - - - - A - - T - - - - - - - get_a() : T & - - - - - - - - a : T - - + + + + + A + + T + - - - - - - A - - intmap - - - + + + - - - - - - A - - thestring - - - + + get_a() : T & - - - - - - A - - string_vector - - - + + + + - - - - - - R - - - - - - - get_int_map() : A<intmap> - - - - - - - set_int_map(A<intmap> && int_map) : void - - - - - - - - a_int_map : A<intmap> - - - - - - - a_string : A<thestring> - - - - - - - a_vector_string : A<string_vector> - - + + a : T - - - - - - - - - - - - - - - - - a_string - - - - - - a_vector_string - - - - - - a_int_map - + + + + + A + + intmap + + + + + + + + A + + thestring + + + + + + + + A + + string_vector + + + + + + + + R + + + + + + + + get_int_map() : A<intmap> + + + + + + + set_int_map(A<intmap> && int_map) : void + + + + + + + + a_int_map : A<intmap> + + + + + + + a_string : A<thestring> + + + + + + + a_vector_string : A<string_vector> + + + + + + + + + + + a_string + + + + a_vector_string + + + + a_int_map diff --git a/docs/test_cases/t00049_class_mermaid.svg b/docs/test_cases/t00049_class_mermaid.svg index e06fb016..4c8b4646 100644 --- a/docs/test_cases/t00049_class_mermaid.svg +++ b/docs/test_cases/t00049_class_mermaid.svg @@ -1,66 +1,61 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - + + + + + + @@ -131,11 +126,11 @@ - + - - - + + +
@@ -147,20 +142,20 @@ A<T>
- +
+a : T
- +
- +get_a() : : T & + +get_a() : T &
- + @@ -179,7 +174,7 @@ - + @@ -198,7 +193,7 @@ - + @@ -217,11 +212,11 @@ - + - - - + + +
@@ -233,29 +228,29 @@ R
- +
+a_int_map : A<intmap>
- +
+a_string : A<thestring>
- +
+a_vector_string : A<string_vector>
- +
- +get_int_map() : : A<intmap> + +get_int_map() : A<intmap>
- +
- +set_int_map(A && int_map) : : void + +set_int_map(A && int_map) : void
diff --git a/docs/test_cases/t00050.md b/docs/test_cases/t00050.md index c39aab55..2e847070 100644 --- a/docs/test_cases/t00050.md +++ b/docs/test_cases/t00050.md @@ -223,7 +223,7 @@ class NoComment { }; "raw": "/// Lorem ipsum dolor sit", "text": "\n Lorem ipsum dolor sit\n" }, - "display_name": "clanguml::t00050::A", + "display_name": "A", "id": "1885563213397742674", "is_abstract": false, "is_nested": false, @@ -263,7 +263,7 @@ class NoComment { }; " 3. Implement\n" ] }, - "display_name": "clanguml::t00050::B", + "display_name": "B", "id": "500262098409836244", "is_abstract": false, "is_nested": false, @@ -299,7 +299,7 @@ class NoComment { }; "raw": "/// \\brief Long comment example\n///\n/// Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis\n/// vehicula class ultricies mollis dictumst, aenean non a in donec nulla.\n/// Phasellus ante pellentesque erat cum risus consequat imperdiet aliquam,\n/// integer placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora\n/// tellus ligula porttitor metus.\n///\n/// Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,\n/// euismod libero facilisi aptent elementum felis blandit cursus gravida sociis\n/// erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est\n/// ad. Massa curae fringilla porttitor quam sollicitudin iaculis aptent leo\n/// ligula euismod dictumst, orci penatibus mauris eros etiam praesent erat\n/// volutpat posuere hac. Metus fringilla nec ullamcorper odio aliquam lacinia\n/// conubia mauris tempor, etiam ultricies proin quisque lectus sociis id\n/// tristique, integer phasellus taciti pretium adipiscing tortor sagittis\n/// ligula.\n///\n/// Mollis pretium lorem primis senectus habitasse lectus scelerisque\n/// donec, ultricies tortor suspendisse adipiscing fusce morbi volutpat\n/// pellentesque, consectetur mi risus molestie curae malesuada cum. Dignissim\n/// lacus convallis massa mauris enim ad mattis magnis senectus montes, mollis\n/// taciti phasellus accumsan bibendum semper blandit suspendisse faucibus nibh\n/// est, metus lobortis morbi cras magna vivamus per risus fermentum. Dapibus\n/// imperdiet praesent magnis ridiculus congue gravida curabitur dictum\n/// sagittis, enim et magna sit inceptos sodales parturient pharetra mollis,\n/// aenean vel nostra tellus commodo pretium sapien sociosqu.", "text": "\n \n\n Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis\n vehicula class ultricies mollis dictumst, aenean non a in donec nulla.\n Phasellus ante pellentesque erat cum risus consequat imperdiet aliquam,\n integer placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora\n tellus ligula porttitor metus.\n\n Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,\n euismod libero facilisi aptent elementum felis blandit cursus gravida sociis\n erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est\n ad. Massa curae fringilla porttitor quam sollicitudin iaculis aptent leo\n ligula euismod dictumst, orci penatibus mauris eros etiam praesent erat\n volutpat posuere hac. Metus fringilla nec ullamcorper odio aliquam lacinia\n conubia mauris tempor, etiam ultricies proin quisque lectus sociis id\n tristique, integer phasellus taciti pretium adipiscing tortor sagittis\n ligula.\n\n Mollis pretium lorem primis senectus habitasse lectus scelerisque\n donec, ultricies tortor suspendisse adipiscing fusce morbi volutpat\n pellentesque, consectetur mi risus molestie curae malesuada cum. Dignissim\n lacus convallis massa mauris enim ad mattis magnis senectus montes, mollis\n taciti phasellus accumsan bibendum semper blandit suspendisse faucibus nibh\n est, metus lobortis morbi cras magna vivamus per risus fermentum. Dapibus\n imperdiet praesent magnis ridiculus congue gravida curabitur dictum\n sagittis, enim et magna sit inceptos sodales parturient pharetra mollis,\n aenean vel nostra tellus commodo pretium sapien sociosqu.\n" }, - "display_name": "clanguml::t00050::C", + "display_name": "C", "id": "1663081653671078922", "is_abstract": false, "is_nested": false, @@ -333,7 +333,7 @@ class NoComment { }; " Implement...\n" ] }, - "display_name": "clanguml::t00050::utils::D", + "display_name": "utils::D", "id": "1492514566602019299", "is_abstract": false, "is_nested": false, @@ -367,7 +367,7 @@ class NoComment { }; "E2", "E3" ], - "display_name": "clanguml::t00050::E", + "display_name": "E", "id": "2027344031570117998", "is_nested": false, "name": "E", @@ -409,7 +409,7 @@ class NoComment { }; } ] }, - "display_name": "clanguml::t00050::F", + "display_name": "F", "id": "793698410848959592", "is_abstract": false, "is_nested": false, @@ -486,7 +486,7 @@ class NoComment { }; "raw": "/// This is a short description of class G.\n///\n/// This is an intermediate description of class G.\n///\n/// This is a long description of class G.", "text": "\n This is a short description of class G.\n\n This is an intermediate description of class G.\n\n This is a long description of class G.\n" }, - "display_name": "clanguml::t00050::G", + "display_name": "G", "id": "449485154531299941", "is_abstract": false, "is_nested": false, @@ -508,7 +508,7 @@ class NoComment { }; }, { "bases": [], - "display_name": "clanguml::t00050::NoComment", + "display_name": "NoComment", "id": "1832693799357996932", "is_abstract": false, "is_nested": false, @@ -530,6 +530,7 @@ class NoComment { }; } ], "name": "t00050_class", + "package_type": "namespace", "relationships": [], "using_namespace": "clanguml::t00050" } diff --git a/docs/test_cases/t00050_class.svg b/docs/test_cases/t00050_class.svg index 376bec07..8d2df7c4 100644 --- a/docs/test_cases/t00050_class.svg +++ b/docs/test_cases/t00050_class.svg @@ -1,226 +1,186 @@ - + + + + + + + - - - - - - A - - - + + + + + A + + - - - - - - B - - - + + + + + B + + - - - - - - C - - - + + + + + C + + - - - - - - utils::D - - - + + + + + utils::D + + - - - - - - E - - E1 - E2 - E3 - - + + + + + E + + E1 + E2 + E3 + - - - - - - F - - T,V,int N - - - - - - - - t : T[N] - - - - - - - v : V - - + + + + + F + + T,V,int N + + - - - - - - G - - - + + + - - - - - - NoComment - - - + + t : T[N] - - - - Lorem ipsum dolor sit - - - - - Lorem ipsum dolor sit - - - - - Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis - vehicula class ultricies mollis dictumst, aenean non a in donec nulla. - Phasellus ante pellentesque erat cum risus consequat imperdiet aliquam, - integer placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora - tellus ligula porttitor metus. -   - Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit, - euismod libero facilisi aptent elementum felis blandit cursus gravida sociis - erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est - ad. Massa curae fringilla porttitor quam sollicitudin iaculis aptent leo - ligula euismod dictumst, orci penatibus mauris eros etiam praesent erat - volutpat posuere hac. Metus fringilla nec ullamcorper odio aliquam lacinia - conubia mauris tempor, etiam ultricies proin quisque lectus sociis id - tristique, integer phasellus taciti pretium adipiscing tortor sagittis - ligula. -   - Mollis pretium lorem primis senectus habitasse lectus scelerisque - donec, ultricies tortor suspendisse adipiscing fusce morbi volutpat - pellentesque, consectetur mi risus molestie curae malesuada cum. Dignissim - lacus convallis massa mauris enim ad mattis magnis senectus montes, mollis - taciti phasellus accumsan bibendum semper blandit suspendisse faucibus nibh - est, metus lobortis morbi cras magna vivamus per risus fermentum. Dapibus - imperdiet praesent magnis ridiculus congue gravida curabitur dictum - sagittis, enim et magna sit inceptos sodales parturient pharetra mollis, - aenean vel nostra tellus commodo pretium sapien sociosqu. - - - - - This is a short description of class G. - - - - - This is an intermediate description of class G. - - - - - This is a long description of class G. - - - - - Lorem ipsum -   - - - - - TODO - 1. Write meaningful comment -   -   - - - - - TODO - 2. Write tests -   -   - - - - - TODO - 3. Implement -   - - - - - Long comment example -   - - - - - TODO - Implement... -   - - - - - Simple array wrapper. -   - - - - - Template parameters -   - T - Type of array elements. -   - V - Type of regular element. -   - N - Size of T array. -   - - - - + + + + + + v : V + + + + + + G + + + + + + + + NoComment + + + + + + Lorem ipsum dolor sit + + + Lorem ipsum dolor sit + + + Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis + vehicula class ultricies mollis dictumst, aenean non a in donec nulla. + Phasellus ante pellentesque erat cum risus consequat imperdiet aliquam, + integer placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora + tellus ligula porttitor metus. + + Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit, + euismod libero facilisi aptent elementum felis blandit cursus gravida sociis + erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est + ad. Massa curae fringilla porttitor quam sollicitudin iaculis aptent leo + ligula euismod dictumst, orci penatibus mauris eros etiam praesent erat + volutpat posuere hac. Metus fringilla nec ullamcorper odio aliquam lacinia + conubia mauris tempor, etiam ultricies proin quisque lectus sociis id + tristique, integer phasellus taciti pretium adipiscing tortor sagittis + ligula. + + Mollis pretium lorem primis senectus habitasse lectus scelerisque + donec, ultricies tortor suspendisse adipiscing fusce morbi volutpat + pellentesque, consectetur mi risus molestie curae malesuada cum. Dignissim + lacus convallis massa mauris enim ad mattis magnis senectus montes, mollis + taciti phasellus accumsan bibendum semper blandit suspendisse faucibus nibh + est, metus lobortis morbi cras magna vivamus per risus fermentum. Dapibus + imperdiet praesent magnis ridiculus congue gravida curabitur dictum + sagittis, enim et magna sit inceptos sodales parturient pharetra mollis, + aenean vel nostra tellus commodo pretium sapien sociosqu. + + + This is a short description of class G. + + + This is an intermediate description of class G. + + + This is a long description of class G. + + + Lorem ipsum + + + + TODO + 1. Write meaningful comment + + + + + TODO + 2. Write tests + + + + + TODO + 3. Implement + + + + Long comment example + + + + TODO + Implement... + + + + Simple array wrapper. + + + + Template parameters + + T + Type of array elements. + + V + Type of regular element. + + N + Size of T array. + + diff --git a/docs/test_cases/t00050_class_mermaid.svg b/docs/test_cases/t00050_class_mermaid.svg index 012e975f..f203bd3a 100644 --- a/docs/test_cases/t00050_class_mermaid.svg +++ b/docs/test_cases/t00050_class_mermaid.svg @@ -1,55 +1,50 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + @@ -189,7 +184,7 @@ - + @@ -208,7 +203,7 @@ - + @@ -227,7 +222,7 @@ - + @@ -246,7 +241,7 @@ - + @@ -265,7 +260,7 @@ - + @@ -299,7 +294,7 @@ - + @@ -328,7 +323,7 @@ - + @@ -347,7 +342,7 @@ - + diff --git a/docs/test_cases/t00051.md b/docs/test_cases/t00051.md index d7e54070..1f8cfe80 100644 --- a/docs/test_cases/t00051.md +++ b/docs/test_cases/t00051.md @@ -97,7 +97,7 @@ A::custom_thread2 A::start_thread2() "name": "std::thread" } ], - "display_name": "clanguml::t00051::B", + "display_name": "B", "id": "486675674447050206", "is_abstract": false, "is_nested": false, @@ -253,7 +253,7 @@ A::custom_thread2 A::start_thread2() "name": "std::thread" } ], - "display_name": "clanguml::t00051::B<(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)>", + "display_name": "B<(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)>", "id": "1969502737237579476", "is_abstract": false, "is_nested": false, @@ -401,7 +401,7 @@ A::custom_thread2 A::start_thread2() }, { "bases": [], - "display_name": "clanguml::t00051::A", + "display_name": "A", "id": "1064663612772326174", "is_abstract": false, "is_nested": false, @@ -535,7 +535,7 @@ A::custom_thread2 A::start_thread2() "name": "std::thread" } ], - "display_name": "clanguml::t00051::A::custom_thread1", + "display_name": "A::custom_thread1", "id": "267762118222214764", "is_abstract": false, "is_nested": true, @@ -594,7 +594,7 @@ A::custom_thread2 A::start_thread2() "name": "std::thread" } ], - "display_name": "clanguml::t00051::A::custom_thread2", + "display_name": "A::custom_thread2", "id": "728501319748477470", "is_abstract": false, "is_nested": true, @@ -648,6 +648,7 @@ A::custom_thread2 A::start_thread2() } ], "name": "t00051_class", + "package_type": "namespace", "relationships": [ { "access": "private", diff --git a/docs/test_cases/t00051_class.svg b/docs/test_cases/t00051_class.svg index 4b717169..f61cde19 100644 --- a/docs/test_cases/t00051_class.svg +++ b/docs/test_cases/t00051_class.svg @@ -1,190 +1,178 @@ - + + + + + + + - - - - - - B - - F,FF=F - - - - - - - B(F && f, FF && ff) : void - - - - - - - - f() : void - - - - - - - ff() : void - - - - - - - - f_ : F - - - - - - - ff_ : FF - - + + + + + B + + F,FF=F + - - - - - - B - - (lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27) - - - - - - - B((lambda at t00051.cc:43:18) && f, (lambda at t00051.cc:43:27) && ff) : void - - - - - - - - f() : void - - - - - - - ff() : void - - - - - - - - f_ : (lambda at t00051.cc:43:18) - - - - - - - ff_ : (lambda at t00051.cc:43:27) - - + + + - - - - - - A - - - - - - - get_function() : (lambda at t00051.cc:48:16) - - - - - - - start_thread1() : custom_thread1 - - - - - - - start_thread2() : custom_thread2 - - - - - - - start_thread3() : B<(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)> - - - + + B(F && f, FF && ff) : void - - - - - - A::custom_thread1 - - - custom_thread1<Function,Args...>(Function && f, Args &&... args) : void - - + + + + - - - - - - A::custom_thread2 - - - - - - - thread((lambda at t00051.cc:59:27) &&) : void - - - + + f() : void - - - - - - - - - - - - - - - - - - - - + + + + + + ff() : void + + + + + + + + f_ : F + + + + + + + ff_ : FF + + + + + + B + + (lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27) + + + + + + + + B((lambda at t00051.cc:43:18) && f, (lambda at t00051.cc:43:27) && ff) : void + + + + + + + + f() : void + + + + + + + ff() : void + + + + + + + + f_ : (lambda at t00051.cc:43:18) + + + + + + + ff_ : (lambda at t00051.cc:43:27) + + + + + + A + + + + + + + + get_function() : (lambda at t00051.cc:48:16) + + + + + + + start_thread1() : custom_thread1 + + + + + + + start_thread2() : custom_thread2 + + + + + + + start_thread3() : B<(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)> + + + + + + + A::custom_thread1 + + + custom_thread1<Function,Args...>(Function && f, Args &&... args) : void + + + + + + + A::custom_thread2 + + + + + + + + thread((lambda at t00051.cc:59:27) &&) : void + + + + + + + + + + + + + + diff --git a/docs/test_cases/t00051_class_mermaid.svg b/docs/test_cases/t00051_class_mermaid.svg index eb39389b..2c398be7 100644 --- a/docs/test_cases/t00051_class_mermaid.svg +++ b/docs/test_cases/t00051_class_mermaid.svg @@ -1,64 +1,59 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - + + + + @@ -107,11 +102,11 @@ - + - - - + + +
@@ -123,39 +118,39 @@ B<F,FF=F>
- +
+f_ : F
- +
+ff_ : FF
- +
- +B(F && f, FF && ff) : : void + +B(F && f, FF && ff) : void
- +
- +f() : : void + +f() : void
- +
- +ff() : : void + +ff() : void
- + - - - + + +
@@ -167,39 +162,39 @@ B<(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)>
- +
+f_ : (lambda at t00051.cc:43:18)
- +
+ff_ : (lambda at t00051.cc:43:27)
- +
- +B((lambda at t00051.cc:43:18) && f,(lambda at t00051.cc:43:27) && ff) : : void + +B((lambda at t00051.cc:43:18) && f, (lambda at t00051.cc:43:27) && ff) : void
- +
- +f() : : void + +f() : void
- +
- +ff() : : void + +ff() : void
- + - - - + + +
@@ -211,34 +206,34 @@ A
- +
- -get_function() : : (lambda at t00051.cc:48:16) + -get_function() : (lambda at t00051.cc:48:16)
- +
- -start_thread1() : : custom_thread1 + -start_thread1() : custom_thread1
- +
- -start_thread2() : : custom_thread2 + -start_thread2() : custom_thread2
- +
- -start_thread3() : : B<(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)> + -start_thread3() : B<(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)>
- + - - - + + +
@@ -250,15 +245,15 @@ A::custom_thread1
- +
- +custom_thread1(Function && f, Args &&... args) : : void + +custom_thread1(Function && f, Args &&... args) : void
- + @@ -276,7 +271,7 @@
- +thread((lambda at t00051.cc:59:27) &&) : : void + +thread((lambda at t00051.cc:59:27) : &&) : void
diff --git a/docs/test_cases/t00052.md b/docs/test_cases/t00052.md index a2c98c8c..8e841b26 100644 --- a/docs/test_cases/t00052.md +++ b/docs/test_cases/t00052.md @@ -61,7 +61,7 @@ struct R { "elements": [ { "bases": [], - "display_name": "clanguml::t00052::A", + "display_name": "A", "id": "2200853067459698271", "is_abstract": false, "is_nested": false, @@ -138,7 +138,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00052::B", + "display_name": "B", "id": "1737293776724790064", "is_abstract": false, "is_nested": false, @@ -228,7 +228,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00052::C", + "display_name": "C", "id": "687756639884832524", "is_abstract": false, "is_nested": false, @@ -283,7 +283,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00052::B", + "display_name": "B", "id": "1043027222809675776", "is_abstract": false, "is_nested": false, @@ -312,7 +312,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00052::C", + "display_name": "C", "id": "492968837554438176", "is_abstract": false, "is_nested": false, @@ -341,7 +341,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00052::R", + "display_name": "R", "id": "1157978668683299226", "is_abstract": false, "is_nested": false, @@ -400,6 +400,7 @@ struct R { } ], "name": "t00052_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00052_class.svg b/docs/test_cases/t00052_class.svg index 19d7e332..bd321064 100644 --- a/docs/test_cases/t00052_class.svg +++ b/docs/test_cases/t00052_class.svg @@ -1,134 +1,118 @@ - + + + + + + + - - - - - - A - - - a<T>(T p) : T - - aa<F,Q>(F && f, Q q) : void - - + + + + + A + + + a<T>(T p) : T + + aa<F,Q>(F && f, Q q) : void + - - - - - - B - - T - - - - - - - b(T t) : T - - - bb<F>(F && f, T t) : T - - + + + + + B + + T + - - - - - - C - - T - - - c<P>(P p) : T - - + + + - - - - - - B - - int - - - + + b(T t) : T - - - - - - C - - int - - - + + bb<F>(F && f, T t) : T + + + + + + C + + T + + + c<P>(P p) : T + - - - - - - R - - - - - - - - a : A - - - - - - - b : B<int> - - - - - - - c : C<int> - - + + + + + B + + int + + - - - - - - - - - - - - +a - - - - - +b - - - - - +c - + + + + + C + + int + + + + + + + + R + + + + + + + + + a : A + + + + + + + b : B<int> + + + + + + + c : C<int> + + + + + + + + +a + + + +b + + + +c diff --git a/docs/test_cases/t00052_class_mermaid.svg b/docs/test_cases/t00052_class_mermaid.svg index decea17d..aba3084e 100644 --- a/docs/test_cases/t00052_class_mermaid.svg +++ b/docs/test_cases/t00052_class_mermaid.svg @@ -1,65 +1,60 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - + + + + + @@ -84,7 +79,7 @@ - +
@@ -95,7 +90,7 @@ - +
@@ -106,7 +101,7 @@ - +
@@ -119,11 +114,11 @@ - + - - - + + +
@@ -135,24 +130,24 @@ A
- +
- +a(T p) : : T + +a(T p) : T
- +
- +aa(F && f, Q q) : : void + +aa(F && f, Q q) : void
- + - - - + + +
@@ -164,24 +159,24 @@ B<T>
- +
- +b(T t) : : T + +b(T t) : T
- +
- +bb(F && f, T t) : : T + +bb(F && f, T t) : T
- + - - - + + +
@@ -193,15 +188,15 @@ C<T>
- +
- -c<p>(P p) : : T</p> + -c<p>(P p) : T</p>
- + @@ -220,7 +215,7 @@ - + @@ -239,7 +234,7 @@ - + diff --git a/docs/test_cases/t00053.md b/docs/test_cases/t00053.md index c4234092..60c9735b 100644 --- a/docs/test_cases/t00053.md +++ b/docs/test_cases/t00053.md @@ -58,7 +58,7 @@ enum class j { jjj }; "elements": [ { "bases": [], - "display_name": "clanguml::t00053::a", + "display_name": "a", "id": "347629837292519144", "is_abstract": false, "is_nested": false, @@ -80,7 +80,7 @@ enum class j { jjj }; }, { "bases": [], - "display_name": "clanguml::t00053::b", + "display_name": "b", "id": "1376344645244260547", "is_abstract": false, "is_nested": false, @@ -102,7 +102,7 @@ enum class j { jjj }; }, { "bases": [], - "display_name": "clanguml::t00053::c", + "display_name": "c", "id": "504463801094568803", "is_abstract": false, "is_nested": false, @@ -124,7 +124,7 @@ enum class j { jjj }; }, { "bases": [], - "display_name": "clanguml::t00053::d", + "display_name": "d", "id": "1264455164862224089", "is_abstract": false, "is_nested": false, @@ -146,7 +146,7 @@ enum class j { jjj }; }, { "bases": [], - "display_name": "clanguml::t00053::e", + "display_name": "e", "id": "907921963776939609", "is_abstract": false, "is_nested": false, @@ -168,7 +168,7 @@ enum class j { jjj }; }, { "bases": [], - "display_name": "clanguml::t00053::f", + "display_name": "f", "id": "1421289128664274084", "is_abstract": false, "is_nested": false, @@ -190,7 +190,7 @@ enum class j { jjj }; }, { "bases": [], - "display_name": "clanguml::t00053::g", + "display_name": "g", "id": "200227126708762001", "is_abstract": false, "is_nested": false, @@ -212,7 +212,7 @@ enum class j { jjj }; }, { "bases": [], - "display_name": "clanguml::t00053::A", + "display_name": "A", "id": "322642841130459425", "is_abstract": false, "is_nested": false, @@ -234,7 +234,7 @@ enum class j { jjj }; }, { "bases": [], - "display_name": "clanguml::t00053::B", + "display_name": "B", "id": "876623970071162908", "is_abstract": false, "is_nested": false, @@ -256,7 +256,7 @@ enum class j { jjj }; }, { "bases": [], - "display_name": "clanguml::t00053::C", + "display_name": "C", "id": "1248473990784124468", "is_abstract": false, "is_nested": false, @@ -278,7 +278,7 @@ enum class j { jjj }; }, { "bases": [], - "display_name": "clanguml::t00053::D", + "display_name": "D", "id": "470228045297785394", "is_abstract": false, "is_nested": false, @@ -300,7 +300,7 @@ enum class j { jjj }; }, { "bases": [], - "display_name": "clanguml::t00053::E", + "display_name": "E", "id": "1038384764221361257", "is_abstract": false, "is_nested": false, @@ -322,7 +322,7 @@ enum class j { jjj }; }, { "bases": [], - "display_name": "clanguml::t00053::F", + "display_name": "F", "id": "530253748811039667", "is_abstract": false, "is_nested": false, @@ -344,7 +344,7 @@ enum class j { jjj }; }, { "bases": [], - "display_name": "clanguml::t00053::G", + "display_name": "G", "id": "1031614323468823578", "is_abstract": false, "is_nested": false, @@ -368,7 +368,7 @@ enum class j { jjj }; "constants": [ "hhh" ], - "display_name": "clanguml::t00053::h", + "display_name": "h", "id": "190978367074032185", "is_nested": false, "name": "h", @@ -385,7 +385,7 @@ enum class j { jjj }; "constants": [ "iii" ], - "display_name": "clanguml::t00053::i", + "display_name": "i", "id": "1473214620883985930", "is_nested": false, "name": "i", @@ -402,7 +402,7 @@ enum class j { jjj }; "constants": [ "jjj" ], - "display_name": "clanguml::t00053::j", + "display_name": "j", "id": "965083605473661435", "is_nested": false, "name": "j", @@ -417,6 +417,7 @@ enum class j { jjj }; } ], "name": "t00053_class", + "package_type": "namespace", "relationships": [], "using_namespace": "clanguml::t00053" } diff --git a/docs/test_cases/t00053_class.svg b/docs/test_cases/t00053_class.svg index 67b8c90f..273c8eb8 100644 --- a/docs/test_cases/t00053_class.svg +++ b/docs/test_cases/t00053_class.svg @@ -1,180 +1,152 @@ - + + + + + + + - - - - - - b - - - + + + + + A + + - - - - - - d - - - + + + + + C + + - - - - - - g - - - + + + + + E + + - - - - - - B - - - + + + + + F + + - - - - - - D - - - + + + + + a + + - - - - - - G - - - + + + + + c + + - - - - - - i - - iii - - + + + + + e + + - - - - - - A - - - + + + + + f + + - - - - - - C - - - + + + + + h + + hhh + - - - - - - E - - - + + + + + j + + jjj + - - - - - - F - - - + + + + + b + + - - - - - - a - - - + + + + + d + + - - - - - - c - - - + + + + + g + + - - - - - - e - - - + + + + + B + + - - - - - - f - - - + + + + + D + + - - - - - - h - - hhh - - + + + + + G + + - - - - - - j - - jjj - - + + + + + i + + iii + diff --git a/docs/test_cases/t00053_class_mermaid.svg b/docs/test_cases/t00053_class_mermaid.svg index 30027b4b..8f8a528e 100644 --- a/docs/test_cases/t00053_class_mermaid.svg +++ b/docs/test_cases/t00053_class_mermaid.svg @@ -1,55 +1,50 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + @@ -57,7 +52,7 @@ - + @@ -76,7 +71,7 @@ - + @@ -95,7 +90,7 @@ - + @@ -114,7 +109,7 @@ - + @@ -133,7 +128,7 @@ - + @@ -152,7 +147,7 @@ - + @@ -171,7 +166,7 @@ - + @@ -195,7 +190,7 @@ - + @@ -214,7 +209,7 @@ - + @@ -233,7 +228,7 @@ - + @@ -252,7 +247,7 @@ - + @@ -271,7 +266,7 @@ - + @@ -290,7 +285,7 @@ - + @@ -309,7 +304,7 @@ - + @@ -328,7 +323,7 @@ - + @@ -347,7 +342,7 @@ - + @@ -371,7 +366,7 @@ - + diff --git a/docs/test_cases/t00054.md b/docs/test_cases/t00054.md index b19c652b..735a6e90 100644 --- a/docs/test_cases/t00054.md +++ b/docs/test_cases/t00054.md @@ -72,7 +72,7 @@ enum class j { jjj }; "elements": [ { "bases": [], - "display_name": "clanguml::t00054::a", + "display_name": "a", "id": "1158868779503074564", "is_abstract": false, "is_nested": false, @@ -94,7 +94,7 @@ enum class j { jjj }; }, { "bases": [], - "display_name": "clanguml::t00054::b", + "display_name": "b", "id": "252416999805673718", "is_abstract": false, "is_nested": false, @@ -115,11 +115,11 @@ enum class j { jjj }; "type": "class" }, { - "display_name": "clanguml::t00054::detail", + "display_name": "detail", "elements": [ { "bases": [], - "display_name": "clanguml::t00054::detail::c", + "display_name": "detail::c", "id": "1168031834662719964", "is_abstract": false, "is_nested": false, @@ -141,7 +141,7 @@ enum class j { jjj }; }, { "bases": [], - "display_name": "clanguml::t00054::detail::d", + "display_name": "detail::d", "id": "1569559620782547158", "is_abstract": false, "is_nested": false, @@ -163,7 +163,7 @@ enum class j { jjj }; }, { "bases": [], - "display_name": "clanguml::t00054::detail::e", + "display_name": "detail::e", "id": "2037550833462858827", "is_abstract": false, "is_nested": false, @@ -189,7 +189,7 @@ enum class j { jjj }; }, { "bases": [], - "display_name": "clanguml::t00054::f", + "display_name": "f", "id": "2123626454198320938", "is_abstract": false, "is_nested": false, @@ -211,7 +211,7 @@ enum class j { jjj }; }, { "bases": [], - "display_name": "clanguml::t00054::g", + "display_name": "g", "id": "595494794840378320", "is_abstract": false, "is_nested": false, @@ -233,7 +233,7 @@ enum class j { jjj }; }, { "bases": [], - "display_name": "clanguml::t00054::A", + "display_name": "A", "id": "917656824503504804", "is_abstract": false, "is_nested": false, @@ -255,7 +255,7 @@ enum class j { jjj }; }, { "bases": [], - "display_name": "clanguml::t00054::B", + "display_name": "B", "id": "1235773045370563004", "is_abstract": false, "is_nested": false, @@ -276,11 +276,11 @@ enum class j { jjj }; "type": "class" }, { - "display_name": "clanguml::t00054::detail2", + "display_name": "detail2", "elements": [ { "bases": [], - "display_name": "clanguml::t00054::detail2::C", + "display_name": "detail2::C", "id": "540054955081677892", "is_abstract": false, "is_nested": false, @@ -301,11 +301,11 @@ enum class j { jjj }; "type": "class" }, { - "display_name": "clanguml::t00054::detail2::detail3", + "display_name": "detail3", "elements": [ { "bases": [], - "display_name": "clanguml::t00054::detail2::detail3::D", + "display_name": "detail2::detail3::D", "id": "1266390196945323478", "is_abstract": false, "is_nested": false, @@ -327,7 +327,7 @@ enum class j { jjj }; }, { "bases": [], - "display_name": "clanguml::t00054::detail2::detail3::E", + "display_name": "detail2::detail3::E", "id": "134928214982255105", "is_abstract": false, "is_nested": false, @@ -353,7 +353,7 @@ enum class j { jjj }; }, { "bases": [], - "display_name": "clanguml::t00054::detail2::F", + "display_name": "detail2::F", "id": "446694692150903211", "is_abstract": false, "is_nested": false, @@ -379,7 +379,7 @@ enum class j { jjj }; }, { "bases": [], - "display_name": "clanguml::t00054::G", + "display_name": "G", "id": "1365815261671395853", "is_abstract": false, "is_nested": false, @@ -400,13 +400,13 @@ enum class j { jjj }; "type": "class" }, { - "display_name": "clanguml::t00054::detail4", + "display_name": "detail4", "elements": [ { "constants": [ "hhh" ], - "display_name": "clanguml::t00054::detail4::h", + "display_name": "detail4::h", "id": "1592677999268391183", "is_nested": false, "name": "h", @@ -423,7 +423,7 @@ enum class j { jjj }; "constants": [ "iii" ], - "display_name": "clanguml::t00054::detail4::i", + "display_name": "detail4::i", "id": "441521323390223397", "is_nested": false, "name": "i", @@ -440,7 +440,7 @@ enum class j { jjj }; "constants": [ "jjj" ], - "display_name": "clanguml::t00054::detail4::j", + "display_name": "detail4::j", "id": "499334434426587347", "is_nested": false, "name": "j", @@ -459,6 +459,7 @@ enum class j { jjj }; } ], "name": "t00054_class", + "package_type": "namespace", "relationships": [], "using_namespace": "clanguml::t00054" } diff --git a/docs/test_cases/t00054_class.svg b/docs/test_cases/t00054_class.svg index 532dd26a..e78cf148 100644 --- a/docs/test_cases/t00054_class.svg +++ b/docs/test_cases/t00054_class.svg @@ -1,393 +1,183 @@ - + + + + + + + - - - - detail - - - - - detail2 - - - - - detail3 - - - - - detail4 - - - - - - - d - - - + + + detail + + + detail2 + + + detail3 + + + detail4 + + + + + d + + - - - - - - a - - - + + + + + a + + + + + - - - - - - c - - - + + + + + c + + + + + - - - - - - e - - - + + + + + e + + + + + - - - - - - C - - - + + + + + C + + - - - - - - F - - - + + + + + F + + - - - - - - A - - - + + + + + D + + - - - - - - B - - - + + + + + E + + - - - - - - a - - - + + + + + A + + + + - - - - - - f - - - + + + + + B + + + + - - - - - - c - - - + + + + + f + + + + - - - - - - e - - - + + + + + G + + + - - - - - - D - - - + + + + + h + + hhh + hhh + - - - - - - E - - - + + + + + i + + iii + iii + - - - - - - A - - - + + + + + j + + jjj + jjj + - - - - - - B - - - + + + + + b + + - - - - - - G - - - - - - - - - - a - - - - - - - - - - f - - - - - - - - - - h - - hhh - - - - - - - - - i - - iii - - - - - - - - - j - - jjj - - - - - - - - - c - - - - - - - - - - e - - - - - - - - - - b - - - - - - - - - - g - - - - - - - - - - A - - - - - - - - - - B - - - - - - - - - - G - - - - - - - - - - a - - - - - - - - - - f - - - - - - - - - - h - - hhh - - - - - - - - - i - - iii - - - - - - - - - j - - jjj - - - - - - - - - c - - - - - - - - - - e - - - + + + + + g + + diff --git a/docs/test_cases/t00054_class_mermaid.svg b/docs/test_cases/t00054_class_mermaid.svg index 3b24e55e..39b3433e 100644 --- a/docs/test_cases/t00054_class_mermaid.svg +++ b/docs/test_cases/t00054_class_mermaid.svg @@ -1,55 +1,50 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + @@ -57,7 +52,7 @@ - + @@ -76,7 +71,7 @@ - + @@ -95,7 +90,7 @@ - + @@ -114,7 +109,7 @@ - + @@ -133,7 +128,7 @@ - + @@ -152,7 +147,7 @@ - + @@ -171,7 +166,7 @@ - + @@ -190,7 +185,7 @@ - + @@ -209,7 +204,7 @@ - + @@ -228,7 +223,7 @@ - + @@ -247,7 +242,7 @@ - + @@ -266,7 +261,7 @@ - + @@ -285,7 +280,7 @@ - + @@ -309,7 +304,7 @@ - + @@ -333,7 +328,7 @@ - + @@ -357,7 +352,7 @@ - + @@ -376,7 +371,7 @@ - + diff --git a/docs/test_cases/t00055.md b/docs/test_cases/t00055.md index ddbafcb6..057a08ff 100644 --- a/docs/test_cases/t00055.md +++ b/docs/test_cases/t00055.md @@ -45,7 +45,7 @@ struct J { }; "elements": [ { "bases": [], - "display_name": "clanguml::t00055::A", + "display_name": "A", "id": "1697191682863715554", "is_abstract": false, "is_nested": false, @@ -67,7 +67,7 @@ struct J { }; }, { "bases": [], - "display_name": "clanguml::t00055::B", + "display_name": "B", "id": "188599859894721517", "is_abstract": false, "is_nested": false, @@ -89,7 +89,7 @@ struct J { }; }, { "bases": [], - "display_name": "clanguml::t00055::C", + "display_name": "C", "id": "625177137967392996", "is_abstract": false, "is_nested": false, @@ -111,7 +111,7 @@ struct J { }; }, { "bases": [], - "display_name": "clanguml::t00055::D", + "display_name": "D", "id": "1046415640323289221", "is_abstract": false, "is_nested": false, @@ -133,7 +133,7 @@ struct J { }; }, { "bases": [], - "display_name": "clanguml::t00055::E", + "display_name": "E", "id": "702117239243796422", "is_abstract": false, "is_nested": false, @@ -155,7 +155,7 @@ struct J { }; }, { "bases": [], - "display_name": "clanguml::t00055::F", + "display_name": "F", "id": "1511375015718046137", "is_abstract": false, "is_nested": false, @@ -177,7 +177,7 @@ struct J { }; }, { "bases": [], - "display_name": "clanguml::t00055::G", + "display_name": "G", "id": "651600874645139639", "is_abstract": false, "is_nested": false, @@ -199,7 +199,7 @@ struct J { }; }, { "bases": [], - "display_name": "clanguml::t00055::H", + "display_name": "H", "id": "374142601071476038", "is_abstract": false, "is_nested": false, @@ -221,7 +221,7 @@ struct J { }; }, { "bases": [], - "display_name": "clanguml::t00055::I", + "display_name": "I", "id": "295372236079742697", "is_abstract": false, "is_nested": false, @@ -243,7 +243,7 @@ struct J { }; }, { "bases": [], - "display_name": "clanguml::t00055::J", + "display_name": "J", "id": "769231292718551090", "is_abstract": false, "is_nested": false, @@ -265,6 +265,7 @@ struct J { }; } ], "name": "t00055_class", + "package_type": "namespace", "relationships": [], "using_namespace": "clanguml::t00055" } diff --git a/docs/test_cases/t00055_class.svg b/docs/test_cases/t00055_class.svg index b60989f3..9047fa90 100644 --- a/docs/test_cases/t00055_class.svg +++ b/docs/test_cases/t00055_class.svg @@ -1,107 +1,93 @@ - + + + + + + + - - - - - - A - - - + + + + + A + + - - - - - - B - - - + + + + + B + + - - - - - - C - - - + + + + + C + + - - - - - - D - - - + + + + + D + + - - - - - - E - - - + + + + + E + + - - - - - - F - - - + + + + + F + + - - - - - - G - - - + + + + + G + + - - - - - - H - - - + + + + + H + + - - - - - - I - - - + + + + + I + + - - - - - - J - - - + + + + + J + + diff --git a/docs/test_cases/t00055_class_mermaid.svg b/docs/test_cases/t00055_class_mermaid.svg index f1c70c9e..2549cb38 100644 --- a/docs/test_cases/t00055_class_mermaid.svg +++ b/docs/test_cases/t00055_class_mermaid.svg @@ -1,55 +1,50 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + @@ -57,7 +52,7 @@ - + @@ -76,7 +71,7 @@ - + @@ -95,7 +90,7 @@ - + @@ -114,7 +109,7 @@ - + @@ -133,7 +128,7 @@ - + @@ -152,7 +147,7 @@ - + @@ -171,7 +166,7 @@ - + @@ -190,7 +185,7 @@ - + @@ -209,7 +204,7 @@ - + @@ -228,7 +223,7 @@ - + diff --git a/docs/test_cases/t00056.md b/docs/test_cases/t00056.md index 277cdf12..8a1addbf 100644 --- a/docs/test_cases/t00056.md +++ b/docs/test_cases/t00056.md @@ -119,7 +119,7 @@ struct F { "diagram_type": "class", "elements": [ { - "display_name": "clanguml::t00056::greater_than_simple", + "display_name": "greater_than_simple", "id": "902541696362244204", "name": "greater_than_simple", "namespace": "clanguml::t00056", @@ -134,7 +134,7 @@ struct F { "type": "concept" }, { - "display_name": "clanguml::t00056::greater_than_with_requires", + "display_name": "greater_than_with_requires", "id": "1830716585637735576", "name": "greater_than_with_requires", "namespace": "clanguml::t00056", @@ -160,7 +160,7 @@ struct F { "type": "concept" }, { - "display_name": "clanguml::t00056::max_four_bytes", + "display_name": "max_four_bytes", "id": "385255522691733325", "name": "max_four_bytes", "namespace": "clanguml::t00056", @@ -175,7 +175,7 @@ struct F { "type": "concept" }, { - "display_name": "clanguml::t00056::iterable", + "display_name": "iterable", "id": "392540961352249242", "name": "iterable", "namespace": "clanguml::t00056", @@ -198,7 +198,7 @@ struct F { "type": "concept" }, { - "display_name": "clanguml::t00056::has_value_type", + "display_name": "has_value_type", "id": "1850394311226276678", "name": "has_value_type", "namespace": "clanguml::t00056", @@ -215,7 +215,7 @@ struct F { "type": "concept" }, { - "display_name": "clanguml::t00056::convertible_to_string", + "display_name": "convertible_to_string", "id": "137304962071054497", "name": "convertible_to_string", "namespace": "clanguml::t00056", @@ -239,7 +239,7 @@ struct F { "type": "concept" }, { - "display_name": "clanguml::t00056::iterable_with_value_type", + "display_name": "iterable_with_value_type", "id": "1043398062146751019", "name": "iterable_with_value_type", "namespace": "clanguml::t00056", @@ -254,7 +254,7 @@ struct F { "type": "concept" }, { - "display_name": "clanguml::t00056::iterable_or_small_value_type", + "display_name": "iterable_or_small_value_type", "id": "866345615551223718", "name": "iterable_or_small_value_type", "namespace": "clanguml::t00056", @@ -270,7 +270,7 @@ struct F { }, { "bases": [], - "display_name": "clanguml::t00056::A", + "display_name": "A", "id": "1418333499545421661", "is_abstract": false, "is_nested": false, @@ -312,7 +312,7 @@ struct F { }, { "bases": [], - "display_name": "clanguml::t00056::B", + "display_name": "B", "id": "1814355496814977880", "is_abstract": false, "is_nested": false, @@ -354,7 +354,7 @@ struct F { }, { "bases": [], - "display_name": "clanguml::t00056::C", + "display_name": "C", "id": "1512618198241549089", "is_abstract": false, "is_nested": false, @@ -396,7 +396,7 @@ struct F { }, { "bases": [], - "display_name": "clanguml::t00056::D", + "display_name": "D", "id": "1635109601630198093", "is_abstract": false, "is_nested": false, @@ -449,7 +449,7 @@ struct F { }, { "bases": [], - "display_name": "clanguml::t00056::E", + "display_name": "E", "id": "1429225801945621089", "is_abstract": false, "is_nested": false, @@ -527,7 +527,7 @@ struct F { }, { "bases": [], - "display_name": "clanguml::t00056::F", + "display_name": "F", "id": "856301122972546034", "is_abstract": false, "is_nested": false, @@ -605,6 +605,7 @@ struct F { } ], "name": "t00056_class", + "package_type": "namespace", "relationships": [ { "destination": "385255522691733325", diff --git a/docs/test_cases/t00056_class.svg b/docs/test_cases/t00056_class.svg index 27452232..ef095842 100644 --- a/docs/test_cases/t00056_class.svg +++ b/docs/test_cases/t00056_class.svg @@ -1,327 +1,277 @@ - + + + + + + + - - - - - - «concept» - greater_than_simple - - T,L - - - + + + + + «concept» + greater_than_simple + + T,L + + - - - - - - «concept» - greater_than_with_requires - - T,P - - (T l,P r) - - sizeof (l) > sizeof (r) - + + + + + «concept» + greater_than_with_requires + + T,P + + (T l,P r) + + sizeof (l) > sizeof (r) - - - - - - «concept» - max_four_bytes - - T - - - + + + + + «concept» + max_four_bytes + + T + + - - - - - - «concept» - iterable - - T - - (T container) - - container.begin() - container.end() - + + + + + «concept» + iterable + + T + + (T container) + + container.begin() + container.end() - - - - - - «concept» - has_value_type - - T - - () - - typename T::value_type - + + + + + «concept» + has_value_type + + T + + () + + typename T::value_type - - - - - - «concept» - convertible_to_string - - T - - (T s) - - std::string{s} - {std::to_string(s)} noexcept - {std::to_string(s)} -> std::same_as<std::string> - + + + + + «concept» + convertible_to_string + + T + + (T s) + + std::string{s} + {std::to_string(s)} noexcept + {std::to_string(s)} -> std::same_as<std::string> - - - - - - «concept» - iterable_with_value_type - - T - - - + + + + + «concept» + iterable_with_value_type + + T + + - - - - - - «concept» - iterable_or_small_value_type - - T - - - + + + + + «concept» + iterable_or_small_value_type + + T + + - - - - - - A - - max_four_bytes T - - - - - - - - a : T - - + + + + + A + + max_four_bytes T + + - - - - - - B - - T - - - - - - - - b : T - - + + + - - - - - - C - - convertible_to_string T - - - - - - - - c : T - - + + a : T - - - - - - D - - iterable T1,T2,iterable T3,T4,T5 - - - + + + + + B + + T + + - - - - - - E - - T1,T2,T3 - - - - - - - - e1 : T1 - - - - - - - e2 : T2 - - - - - - - e3 : T3 - - + + + - - - - - - F - - T1,T2,T3 - - - - - - - - f1 : T1 - - - - - - - f2 : T2 - - - - - - - f3 : T3 - - + + b : T - - - - T - - - - - T - - - - - T - - - - - T - - - - - T - - - - - T - - - - - T - - - - - T - - - - - T1 - - - - - T3 - - - - - T2 - - - - - T5 - - - - - T1,T3 - - - - - T1,T3 - + + + + + C + + convertible_to_string T + + + + + + + + + c : T + + + + + + D + + iterable T1,T2,iterable T3,T4,T5 + + + + + + + + E + + T1,T2,T3 + + + + + + + + + e1 : T1 + + + + + + + e2 : T2 + + + + + + + e3 : T3 + + + + + + F + + T1,T2,T3 + + + + + + + + + f1 : T1 + + + + + + + f2 : T2 + + + + + + + f3 : T3 + + + + T + + + T + + + T + + + T + + + T + + + T + + + T + + + T + + + T1 + + + T3 + + + T2 + + + T5 + + + T1,T3 + + + T1,T3 diff --git a/docs/test_cases/t00056_class_mermaid.svg b/docs/test_cases/t00056_class_mermaid.svg index 95752e94..8715edce 100644 --- a/docs/test_cases/t00056_class_mermaid.svg +++ b/docs/test_cases/t00056_class_mermaid.svg @@ -1,74 +1,69 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -227,7 +222,7 @@ - + @@ -246,7 +241,7 @@ - + @@ -267,15 +262,15 @@ "sizeof (l) > sizeof (r)"
- +
- "(T l,P r) : " + "(T l,P r)"
- + @@ -294,7 +289,7 @@ - + @@ -320,15 +315,15 @@ "container.end()"
- +
- "(T container) : " + "(T container)"
- + @@ -349,15 +344,15 @@ "typename T::value_type"
- +
- "() : " + "()"
- + @@ -388,15 +383,15 @@ "{std::to_string(s)} -> std::same_as<std::string>" - +
- "(T s) : " + "(T s)"
- + @@ -415,7 +410,7 @@ - + @@ -434,7 +429,7 @@ - + @@ -458,7 +453,7 @@ - + @@ -482,7 +477,7 @@ - + @@ -506,7 +501,7 @@ - + @@ -525,7 +520,7 @@ - + @@ -559,7 +554,7 @@ - + diff --git a/docs/test_cases/t00057.md b/docs/test_cases/t00057.md index e64ddb6d..61cdd8c9 100644 --- a/docs/test_cases/t00057.md +++ b/docs/test_cases/t00057.md @@ -564,6 +564,7 @@ struct t00057_F; } ], "name": "t00057_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00057_class.svg b/docs/test_cases/t00057_class.svg index 3df55a2f..449df1f4 100644 --- a/docs/test_cases/t00057_class.svg +++ b/docs/test_cases/t00057_class.svg @@ -1,303 +1,271 @@ - + + + + + + + - - - - - - t00057_A - - - - - - - - a1 : int - - + + + + + t00057_A + + - - - - - - t00057_B - - - - - - - - b1 : int - - + + + - - - - - - t00057_C - - - - - - - - c1 : int - - + + a1 : int - - - - - - «union» - t00057_D - - - - - - - - d1 : int - - - - - - - d2 : float - - + + + + + t00057_B + + - - - - - - t00057_E - - - - - - - - coordinates : t00057_E::(anonymous_739) - - - - - - - e : int - - - - - - - height : t00057_E::(anonymous_807) - - + + + - - - - - - t00057_E::(coordinates) - - - - - - - - x : int - - - - - - - y : int - - + + b1 : int - - - - - - «union» - t00057_E::(height) - - - - - - - - t : double - - - - - - - z : int - - + + + + + t00057_C + + - - - - - - t00057_G - - - - - - - - g1 : int - - + + + - - - - - - t00057_R - - - - - - - - a : struct t00057_A - - - - - - - b : t00057_B - - - - - - - c : struct t00057_C * - - - - - - - d : union t00057_D - - - - - - - e : struct t00057_E * - - - - - - - f : struct t00057_F * - - - - - - - g : struct t00057_G * - - + + c1 : int - - - - - - t00057_F - - - - - - - - f1 : int - - + + + + + «union» + t00057_D + + - - - - - coordinates - - - - - - height - - - - - +a - - - - - +b - - - - - +c - - - - - +d - - - - - +e - - - - - +f - - - - - +g - + + + + + + d1 : int + + + + + + + d2 : float + + + + + + t00057_E + + + + + + + + + coordinates : t00057_E::(anonymous_739) + + + + + + + e : int + + + + + + + height : t00057_E::(anonymous_807) + + + + + + t00057_E::(coordinates) + + + + + + + + + x : int + + + + + + + y : int + + + + + + «union» + t00057_E::(height) + + + + + + + + + t : double + + + + + + + z : int + + + + + + t00057_G + + + + + + + + + g1 : int + + + + + + t00057_R + + + + + + + + + a : struct t00057_A + + + + + + + b : t00057_B + + + + + + + c : struct t00057_C * + + + + + + + d : union t00057_D + + + + + + + e : struct t00057_E * + + + + + + + f : struct t00057_F * + + + + + + + g : struct t00057_G * + + + + + + t00057_F + + + + + + + + + f1 : int + + + + + coordinates + + + + height + + + +a + + + +b + + + +c + + + +d + + + +e + + + +f + + + +g diff --git a/docs/test_cases/t00057_class_mermaid.svg b/docs/test_cases/t00057_class_mermaid.svg index d8f08528..842a088d 100644 --- a/docs/test_cases/t00057_class_mermaid.svg +++ b/docs/test_cases/t00057_class_mermaid.svg @@ -1,69 +1,64 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - - + + + + + + + + + @@ -167,7 +162,7 @@ - + @@ -191,7 +186,7 @@ - + @@ -215,7 +210,7 @@ - + @@ -239,7 +234,7 @@ - + @@ -268,7 +263,7 @@ - + @@ -302,7 +297,7 @@ - + @@ -331,7 +326,7 @@ - + @@ -360,7 +355,7 @@ - + @@ -384,7 +379,7 @@ - + @@ -412,7 +407,7 @@
- +c : struct t00057_C + +c : struct t00057_C
@@ -422,23 +417,23 @@
- +e : struct t00057_E + +e : struct t00057_E
- +f : struct t00057_F + +f : struct t00057_F
- +g : struct t00057_G + +g : struct t00057_G
- + diff --git a/docs/test_cases/t00058.md b/docs/test_cases/t00058.md index 0bc20930..9b12c112 100644 --- a/docs/test_cases/t00058.md +++ b/docs/test_cases/t00058.md @@ -73,7 +73,7 @@ struct R { "elements": [ { "bases": [], - "display_name": "clanguml::t00058::first_type", + "display_name": "first_type", "id": "39461943261269692", "is_abstract": false, "is_nested": false, @@ -107,7 +107,7 @@ struct R { "type": "class" }, { - "display_name": "clanguml::t00058::same_as_first_type", + "display_name": "same_as_first_type", "id": "1725820236573641307", "name": "same_as_first_type", "namespace": "clanguml::t00058", @@ -123,7 +123,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00058::A", + "display_name": "A", "id": "798619347004821702", "is_abstract": false, "is_nested": false, @@ -171,7 +171,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00058::B", + "display_name": "B", "id": "420594889696591405", "is_abstract": false, "is_nested": false, @@ -237,7 +237,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00058::A", + "display_name": "A", "id": "1724002183455178980", "is_abstract": false, "is_nested": false, @@ -284,7 +284,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00058::A", + "display_name": "A", "id": "1372381231906520278", "is_abstract": false, "is_nested": false, @@ -319,7 +319,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00058::B>", + "display_name": "B>", "id": "290383080560130133", "is_abstract": false, "is_nested": false, @@ -385,7 +385,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00058::R", + "display_name": "R", "id": "1015108159699260009", "is_abstract": false, "is_nested": false, @@ -432,6 +432,7 @@ struct R { } ], "name": "t00058_class", + "package_type": "namespace", "relationships": [ { "destination": "1725820236573641307", diff --git a/docs/test_cases/t00058_class.svg b/docs/test_cases/t00058_class.svg index 41fc7335..c8ce71f4 100644 --- a/docs/test_cases/t00058_class.svg +++ b/docs/test_cases/t00058_class.svg @@ -1,179 +1,151 @@ - + + + + + + + - - - - - - first_type - - T,Args... - - - + + + + + first_type + + T,Args... + + - - - - - - «concept» - same_as_first_type - - T,Args... - - - + + + + + «concept» + same_as_first_type + + T,Args... + + - - - - - - A - - T,Args... - - - - - - - - a : std::vector<T> - - + + + + + A + + T,Args... + + - - - - - - B - - T,P,Args... - - - - - - - - b : std::vector<T> - - - - - - - bb : P - - + + + - - - - - - A - - int,int,double,std::string - - - + + a : std::vector<T> - - - - - - A - - int,int - - - + + + + + B + + T,P,Args... + + - - - - - - B - - int,std::string,int,double,A<int,int> - - - + + + - - - - - - R - - - - - - - - aa : A<int,int,double,std::string> - - - - - - - bb : B<int,std::string,int,double,A<int,int>> - - + + b : std::vector<T> - - - - T,Args... - - - - - T,Args... - - - - - - - - - - - - - - - - - - - - - - aa - - - - - - bb - - - - - + + + + + + bb : P + + + + + + A + + int,int,double,std::string + + + + + + + + A + + int,int + + + + + + + + B + + int,std::string,int,double,A<int,int> + + + + + + + + R + + + + + + + + + aa : A<int,int,double,std::string> + + + + + + + bb : B<int,std::string,int,double,A<int,int>> + + + + T,Args... + + + T,Args... + + + + + + + + + + + + aa + + + + bb + + diff --git a/docs/test_cases/t00058_class_mermaid.svg b/docs/test_cases/t00058_class_mermaid.svg index 345cd26e..16288621 100644 --- a/docs/test_cases/t00058_class_mermaid.svg +++ b/docs/test_cases/t00058_class_mermaid.svg @@ -1,68 +1,63 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - + + + + + + + + @@ -155,7 +150,7 @@ - + @@ -174,7 +169,7 @@ - + @@ -193,7 +188,7 @@ - + @@ -217,7 +212,7 @@ - + @@ -246,7 +241,7 @@ - + @@ -265,7 +260,7 @@ - + @@ -284,7 +279,7 @@ - + @@ -303,7 +298,7 @@ - + diff --git a/docs/test_cases/t00059.md b/docs/test_cases/t00059.md index ca9aa916..4170426e 100644 --- a/docs/test_cases/t00059.md +++ b/docs/test_cases/t00059.md @@ -81,7 +81,7 @@ struct R { "diagram_type": "class", "elements": [ { - "display_name": "clanguml::t00059::fruit_c", + "display_name": "fruit_c", "id": "1926201868069460340", "name": "fruit_c", "namespace": "clanguml::t00059", @@ -104,7 +104,7 @@ struct R { "type": "concept" }, { - "display_name": "clanguml::t00059::apple_c", + "display_name": "apple_c", "id": "1932582371736186409", "name": "apple_c", "namespace": "clanguml::t00059", @@ -126,7 +126,7 @@ struct R { "type": "concept" }, { - "display_name": "clanguml::t00059::orange_c", + "display_name": "orange_c", "id": "1483904441065806133", "name": "orange_c", "namespace": "clanguml::t00059", @@ -149,7 +149,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00059::gala_apple", + "display_name": "gala_apple", "id": "399997161214328320", "is_abstract": false, "is_nested": false, @@ -224,7 +224,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00059::empire_apple", + "display_name": "empire_apple", "id": "660406972347773654", "is_abstract": false, "is_nested": false, @@ -299,7 +299,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00059::lima_orange", + "display_name": "lima_orange", "id": "1649295452510454080", "is_abstract": false, "is_nested": false, @@ -374,7 +374,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00059::valencia_orange", + "display_name": "valencia_orange", "id": "802727760415733923", "is_abstract": false, "is_nested": false, @@ -449,7 +449,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00059::fruit_factory", + "display_name": "fruit_factory", "id": "2301786483822933456", "is_abstract": false, "is_nested": false, @@ -537,7 +537,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00059::fruit_factory", + "display_name": "fruit_factory", "id": "551278102444647278", "is_abstract": false, "is_nested": false, @@ -572,7 +572,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00059::fruit_factory", + "display_name": "fruit_factory", "id": "536390279563541226", "is_abstract": false, "is_nested": false, @@ -607,7 +607,7 @@ struct R { }, { "bases": [], - "display_name": "clanguml::t00059::R", + "display_name": "R", "id": "1128300671453354325", "is_abstract": false, "is_nested": false, @@ -654,6 +654,7 @@ struct R { } ], "name": "t00059_class", + "package_type": "namespace", "relationships": [ { "destination": "1926201868069460340", diff --git a/docs/test_cases/t00059_class.svg b/docs/test_cases/t00059_class.svg index 1b58e64d..adf14620 100644 --- a/docs/test_cases/t00059_class.svg +++ b/docs/test_cases/t00059_class.svg @@ -1,279 +1,239 @@ - + + + + + + + - - - - - - «concept» - fruit_c - - T - - (T t) - - T{} - t.get_name() - + + + + + «concept» + fruit_c + + T + + (T t) + + T{} + t.get_name() - - - - - - «concept» - apple_c - - T - - (T t) - - t.get_sweetness() - + + + + + «concept» + apple_c + + T + + (T t) + + t.get_sweetness() - - - - - - «concept» - orange_c - - T - - (T t) - - t.get_bitterness() - + + + + + «concept» + orange_c + + T + + (T t) + + t.get_bitterness() - - - - - - gala_apple - - - - - - - get_name() const : std::string - - - - - - - get_sweetness() const : float - - - + + + + + gala_apple + - - - - - - empire_apple - - - - - - - get_name() const : std::string - - - - - - - get_sweetness() const : float - - - + + + - - - - - - lima_orange - - - - - - - get_bitterness() const : float - - - - - - - get_name() const : std::string - - - + + get_name() const : std::string - - - - - - valencia_orange - - - - - - - get_bitterness() const : float - - - - - - - get_name() const : std::string - - - + + + - - - - - - fruit_factory - - apple_c TA,orange_c TO - - - - - - - create_apple() const : TA - - - - - - - create_orange() const : TO - - - + + get_sweetness() const : float - - - - - - fruit_factory - - gala_apple,valencia_orange - - - + + + + + + empire_apple + - - - - - - fruit_factory - - empire_apple,lima_orange - - - + + + - - - - - - R - - - - - - - - factory_1 : fruit_factory_1 - - - - - - - factory_2 : fruit_factory_2 - - + + get_name() const : std::string - - - - T - - - - - T - - - - - TA - - - - - TO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - factory_1 - - - - - - factory_2 - + + + + + + get_sweetness() const : float + + + + + + + lima_orange + + + + + + + + get_bitterness() const : float + + + + + + + get_name() const : std::string + + + + + + + valencia_orange + + + + + + + + get_bitterness() const : float + + + + + + + get_name() const : std::string + + + + + + + fruit_factory + + apple_c TA,orange_c TO + + + + + + + + create_apple() const : TA + + + + + + + create_orange() const : TO + + + + + + + fruit_factory + + gala_apple,valencia_orange + + + + + + + + fruit_factory + + empire_apple,lima_orange + + + + + + + + R + + + + + + + + + factory_1 : fruit_factory_1 + + + + + + + factory_2 : fruit_factory_2 + + + + T + + + T + + + TA + + + TO + + + + + + + + + + + + + + + + factory_1 + + + + factory_2 diff --git a/docs/test_cases/t00059_class_mermaid.svg b/docs/test_cases/t00059_class_mermaid.svg index 2579a153..2efef3a2 100644 --- a/docs/test_cases/t00059_class_mermaid.svg +++ b/docs/test_cases/t00059_class_mermaid.svg @@ -1,75 +1,70 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - - - - - + + + + + + + + + + + + - +
@@ -80,7 +75,7 @@ - +
@@ -91,7 +86,7 @@ - +
@@ -102,7 +97,7 @@ - + - +
- "(T t) : " + "(T t)"
- + - - - + + +
@@ -311,24 +306,24 @@ gala_apple
- +
- +get_name() : : [const] std::string + +get_name() : [const] std::string
- +
- +get_sweetness() : : [const] float + +get_sweetness() : [const] float
- + - - - + + +
@@ -340,24 +335,24 @@ empire_apple
- +
- +get_name() : : [const] std::string + +get_name() : [const] std::string
- +
- +get_sweetness() : : [const] float + +get_sweetness() : [const] float
- + - - - + + +
@@ -369,24 +364,24 @@ lima_orange
- +
- +get_bitterness() : : [const] float + +get_bitterness() : [const] float
- +
- +get_name() : : [const] std::string + +get_name() : [const] std::string
- + - - - + + +
@@ -398,20 +393,20 @@ valencia_orange
- +
- +get_bitterness() : : [const] float + +get_bitterness() : [const] float
- +
- +get_name() : : [const] std::string + +get_name() : [const] std::string
- + @@ -427,20 +422,20 @@ fruit_factory<apple_c TA,orange_c TO>
- +
- +create_apple() : : [const] TA + +create_apple() : [const] TA
- +
- +create_orange() : : [const] TO + +create_orange() : [const] TO
- + @@ -459,7 +454,7 @@ - + @@ -478,7 +473,7 @@ - + diff --git a/docs/test_cases/t00060.md b/docs/test_cases/t00060.md index a0fede27..bf33de7d 100644 --- a/docs/test_cases/t00060.md +++ b/docs/test_cases/t00060.md @@ -49,7 +49,7 @@ template struct H : public G { "elements": [ { "bases": [], - "display_name": "clanguml::t00060::A", + "display_name": "A", "id": "1373615549846303472", "is_abstract": false, "is_nested": false, @@ -78,7 +78,7 @@ template struct H : public G { "name": "clanguml::t00060::A" } ], - "display_name": "clanguml::t00060::B", + "display_name": "B", "id": "479650368930934571", "is_abstract": false, "is_nested": false, @@ -107,7 +107,7 @@ template struct H : public G { "name": "clanguml::t00060::A" } ], - "display_name": "clanguml::t00060::C", + "display_name": "C", "id": "1827660844127264787", "is_abstract": false, "is_nested": false, @@ -142,7 +142,7 @@ template struct H : public G { "name": "clanguml::t00060::C" } ], - "display_name": "clanguml::t00060::D", + "display_name": "D", "id": "1629687372290281981", "is_abstract": false, "is_nested": false, @@ -164,7 +164,7 @@ template struct H : public G { }, { "bases": [], - "display_name": "clanguml::t00060::G", + "display_name": "G", "id": "1877304825033069517", "is_abstract": false, "is_nested": false, @@ -213,7 +213,7 @@ template struct H : public G { "name": "G" } ], - "display_name": "clanguml::t00060::H", + "display_name": "H", "id": "1881610349123495638", "is_abstract": false, "is_nested": false, @@ -273,6 +273,7 @@ template struct H : public G { } ], "name": "t00060_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00060_class.svg b/docs/test_cases/t00060_class.svg index a0faba10..15110b0d 100644 --- a/docs/test_cases/t00060_class.svg +++ b/docs/test_cases/t00060_class.svg @@ -1,117 +1,99 @@ - + + + + + + + - - - - - - A - - - + + + + + A + + - - - - - - B - - - + + + + + B + + - - - - - - C - - - + + + + + C + + - - - - - - D - - - + + + + + D + + - - - - - - G - - T - - - - - - - - g : T - - + + + + + G + + T + + - - - - - - H - - T,P - - - - - - - - h : G<T> - - - - - - - hh : P - - + + + - - - - - - - - - - - - - - - - - - - - +h - - - - - + + g : T + + + + + + H + + T,P + + + + + + + + + h : G<T> + + + + + + + hh : P + + + + + + + + + + + + +h + + diff --git a/docs/test_cases/t00060_class_mermaid.svg b/docs/test_cases/t00060_class_mermaid.svg index 35f96a14..5fab1a5e 100644 --- a/docs/test_cases/t00060_class_mermaid.svg +++ b/docs/test_cases/t00060_class_mermaid.svg @@ -1,66 +1,61 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - + + + + + + @@ -121,7 +116,7 @@ - + @@ -140,7 +135,7 @@ - + @@ -159,7 +154,7 @@ - + @@ -178,7 +173,7 @@ - + @@ -197,7 +192,7 @@ - + @@ -221,7 +216,7 @@ - + diff --git a/docs/test_cases/t00061.md b/docs/test_cases/t00061.md index 4387656a..98a321e0 100644 --- a/docs/test_cases/t00061.md +++ b/docs/test_cases/t00061.md @@ -55,7 +55,7 @@ struct B { }; "elements": [ { "bases": [], - "display_name": "clanguml::t00061::A", + "display_name": "A", "id": "1010204727957329423", "is_abstract": false, "is_nested": false, @@ -77,6 +77,7 @@ struct B { }; } ], "name": "t00061_class", + "package_type": "namespace", "relationships": [], "using_namespace": "clanguml::t00061" } diff --git a/docs/test_cases/t00061_class.svg b/docs/test_cases/t00061_class.svg index 24140ee8..5ff2041e 100644 --- a/docs/test_cases/t00061_class.svg +++ b/docs/test_cases/t00061_class.svg @@ -1,17 +1,21 @@ - + + + + + + + - - - - - - A - - - + + + + + A + + diff --git a/docs/test_cases/t00061_class_mermaid.svg b/docs/test_cases/t00061_class_mermaid.svg index 8f75c358..5a7ce2b6 100644 --- a/docs/test_cases/t00061_class_mermaid.svg +++ b/docs/test_cases/t00061_class_mermaid.svg @@ -1,55 +1,50 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + @@ -57,7 +52,7 @@ - + diff --git a/docs/test_cases/t00062.md b/docs/test_cases/t00062.md index fbc7d99b..b2d50631 100644 --- a/docs/test_cases/t00062.md +++ b/docs/test_cases/t00062.md @@ -130,7 +130,7 @@ struct A> { "elements": [ { "bases": [], - "display_name": "clanguml::t00062::A", + "display_name": "A", "id": "1046827200300090710", "is_abstract": false, "is_nested": false, @@ -172,7 +172,7 @@ struct A> { }, { "bases": [], - "display_name": "clanguml::t00062::A &>", + "display_name": "A &>", "id": "1099548178945911245", "is_abstract": false, "is_nested": false, @@ -227,7 +227,7 @@ struct A> { }, { "bases": [], - "display_name": "clanguml::t00062::A> &>", + "display_name": "A> &>", "id": "1239388209995793547", "is_abstract": false, "is_nested": false, @@ -282,7 +282,7 @@ struct A> { }, { "bases": [], - "display_name": "clanguml::t00062::A", + "display_name": "A", "id": "45701897814162098", "is_abstract": false, "is_nested": false, @@ -324,7 +324,7 @@ struct A> { }, { "bases": [], - "display_name": "clanguml::t00062::A", + "display_name": "A", "id": "1379193770802992785", "is_abstract": false, "is_nested": false, @@ -366,7 +366,7 @@ struct A> { }, { "bases": [], - "display_name": "clanguml::t00062::A", + "display_name": "A", "id": "1407865337446777280", "is_abstract": false, "is_nested": false, @@ -408,7 +408,7 @@ struct A> { }, { "bases": [], - "display_name": "clanguml::t00062::A", + "display_name": "A", "id": "1034483227649400416", "is_abstract": false, "is_nested": false, @@ -450,7 +450,7 @@ struct A> { }, { "bases": [], - "display_name": "clanguml::t00062::A", + "display_name": "A", "id": "352457857519671117", "is_abstract": false, "is_nested": false, @@ -492,7 +492,7 @@ struct A> { }, { "bases": [], - "display_name": "clanguml::t00062::A", + "display_name": "A", "id": "314708288320430272", "is_abstract": false, "is_nested": false, @@ -558,7 +558,7 @@ struct A> { }, { "bases": [], - "display_name": "clanguml::t00062::A", + "display_name": "A", "id": "827753335392390402", "is_abstract": false, "is_nested": false, @@ -624,7 +624,7 @@ struct A> { }, { "bases": [], - "display_name": "clanguml::t00062::A", + "display_name": "A", "id": "395583480407686249", "is_abstract": false, "is_nested": false, @@ -696,7 +696,7 @@ struct A> { }, { "bases": [], - "display_name": "clanguml::t00062::A", + "display_name": "A", "id": "476497055497873078", "is_abstract": false, "is_nested": false, @@ -756,7 +756,7 @@ struct A> { }, { "bases": [], - "display_name": "clanguml::t00062::A", + "display_name": "A", "id": "1619634759668095904", "is_abstract": false, "is_nested": false, @@ -828,7 +828,7 @@ struct A> { }, { "bases": [], - "display_name": "clanguml::t00062::A", + "display_name": "A", "id": "1357746808315142717", "is_abstract": false, "is_nested": false, @@ -900,7 +900,7 @@ struct A> { }, { "bases": [], - "display_name": "clanguml::t00062::A", + "display_name": "A", "id": "544335779197078982", "is_abstract": false, "is_nested": false, @@ -984,7 +984,7 @@ struct A> { }, { "bases": [], - "display_name": "clanguml::t00062::A", + "display_name": "A", "id": "602066980416477930", "is_abstract": false, "is_nested": false, @@ -1038,7 +1038,7 @@ struct A> { }, { "bases": [], - "display_name": "clanguml::t00062::A", + "display_name": "A", "id": "1318419672443856415", "is_abstract": false, "is_nested": false, @@ -1092,7 +1092,7 @@ struct A> { }, { "bases": [], - "display_name": "clanguml::t00062::A", + "display_name": "A", "id": "599593856979463652", "is_abstract": false, "is_nested": false, @@ -1170,7 +1170,7 @@ struct A> { }, { "bases": [], - "display_name": "clanguml::t00062::A", + "display_name": "A", "id": "15395295268000991", "is_abstract": false, "is_nested": false, @@ -1224,7 +1224,7 @@ struct A> { }, { "bases": [], - "display_name": "clanguml::t00062::A>", + "display_name": "A>", "id": "1603321863498552207", "is_abstract": false, "is_nested": false, @@ -1273,7 +1273,7 @@ struct A> { }, { "bases": [], - "display_name": "clanguml::t00062::A>", + "display_name": "A>", "id": "232518961342221670", "is_abstract": false, "is_nested": false, @@ -1340,7 +1340,7 @@ struct A> { }, { "bases": [], - "display_name": "clanguml::t00062::A", + "display_name": "A", "id": "121103565834936476", "is_abstract": false, "is_nested": false, @@ -1369,6 +1369,7 @@ struct A> { } ], "name": "t00062_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00062_class.svg b/docs/test_cases/t00062_class.svg index aeb547a8..f14cca97 100644 --- a/docs/test_cases/t00062_class.svg +++ b/docs/test_cases/t00062_class.svg @@ -1,544 +1,464 @@ - + + + + + + + - - - - - - A - - U & - - - - - - - - u : U & - - + + + + + A + + U & + + - - - - - - A - - std::map<std::string,U> & - - - - - - - - u : U & - - + + + - - - - - - A - - std::map<std::string,std::map<std::string,std::string>> & - - - + + u : U & - - - - - - A - - U * * - - - - - - - - u : U ** - - + + + + + A + + std::map<std::string,U> & + + - - - - - - A - - U * * const* - - - - - - - - u : U *** - - + + + - - - - - - A - - U const volatile* const volatile - - - - - - - - u : U *** - - + + u : U & - - - - - - A - - U && - - - - - - - - u : U && - - + + + + + A + + std::map<std::string,std::map<std::string,std::string>> & + + - - - - - - A - - U const& - - - - - - - - u : const U & - - + + + + + A + + U * * + + - - - - - - A - - M C::* - - - - - - - - c : C & - - - - - - - m : M C::* - - + + + - - - - - - A - - M C::* && - - - - - - - - c : C && - - - - - - - m : M C::* - - + + u : U ** - - - - - - A - - M (C::*)(Arg) - - - - - - - - c : C & - - - - - - - m : M C::* - - + + + + + A + + U * * const* + + - - - - - - A - - int (C::*)(bool) - - - - - - - - c : C & - - + + + - - - - - - A - - M (C::*)(Arg) && - - - - - - - - c : C && - - - - - - - m : M C::* - - + + u : U *** - - - - - - A - - float (C::*)(int) && - - - - - - - - c : C && - - - - - - - mf : float C::* - - + + + + + A + + U const volatile* const volatile + + - - - - - - A - - M (C::*)(Arg1,Arg2,Arg3) - - - - - - - - c : C & - - - - - - - m : M C::* - - + + + - - - - - - A - - char[N] - - - - - - - - n : char[N] - - + + u : U *** - - - - - - A - - char[1000] - - - - - - - - n : std::vector<char> - - + + + + + A + + U && + + - - - - - - A - - char[M][L][K] - - - - - - - - klm : char[K][L][M] - - + + + - - - - - - A - - U(...) - - - - - - - - u : bool - - + + u : U && - - - - - - A - - C<T> - - - - - - - - c : C<T> - - + + + + + A + + U const& + + - - - - - - A - - C<T,Args...> - - - - - - - - args : std::tuple<Args...> - - - - - - - c : C<T> - - + + + - - - - - - A - - T - - - + + u : const U & - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + A + + M C::* + + + + + + + + + c : C & + + + + + + + m : M C::* + + + + + + A + + M C::* && + + + + + + + + + c : C && + + + + + + + m : M C::* + + + + + + A + + M (C::*)(Arg) + + + + + + + + + c : C & + + + + + + + m : M C::* + + + + + + A + + int (C::*)(bool) + + + + + + + + + c : C & + + + + + + A + + M (C::*)(Arg) && + + + + + + + + + c : C && + + + + + + + m : M C::* + + + + + + A + + float (C::*)(int) && + + + + + + + + + c : C && + + + + + + + mf : float C::* + + + + + + A + + M (C::*)(Arg1,Arg2,Arg3) + + + + + + + + + c : C & + + + + + + + m : M C::* + + + + + + A + + char[N] + + + + + + + + + n : char[N] + + + + + + A + + char[1000] + + + + + + + + + n : std::vector<char> + + + + + + A + + char[M][L][K] + + + + + + + + + klm : char[K][L][M] + + + + + + A + + U(...) + + + + + + + + + u : bool + + + + + + A + + C<T> + + + + + + + + + c : C<T> + + + + + + A + + C<T,Args...> + + + + + + + + + args : std::tuple<Args...> + + + + + + + c : C<T> + + + + + + A + + T + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/test_cases/t00062_class_mermaid.svg b/docs/test_cases/t00062_class_mermaid.svg index d1152ef4..21833aad 100644 --- a/docs/test_cases/t00062_class_mermaid.svg +++ b/docs/test_cases/t00062_class_mermaid.svg @@ -1,81 +1,76 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -311,7 +306,7 @@ - + @@ -335,7 +330,7 @@ - + @@ -359,7 +354,7 @@ - + @@ -378,7 +373,7 @@ - + @@ -402,7 +397,7 @@ - + @@ -426,7 +421,7 @@ - + @@ -450,7 +445,7 @@ - + @@ -474,7 +469,7 @@ - + @@ -498,7 +493,7 @@ - + @@ -527,7 +522,7 @@ - + @@ -556,7 +551,7 @@ - + @@ -585,7 +580,7 @@ - + @@ -609,7 +604,7 @@ - + @@ -638,7 +633,7 @@ - + @@ -667,7 +662,7 @@ - + @@ -696,7 +691,7 @@ - + @@ -720,7 +715,7 @@ - + @@ -744,7 +739,7 @@ - + @@ -768,7 +763,7 @@ - + @@ -792,7 +787,7 @@ - + @@ -816,7 +811,7 @@ - + @@ -845,7 +840,7 @@ - + diff --git a/docs/test_cases/t00063.md b/docs/test_cases/t00063.md index 78b52ef0..df61e8f6 100644 --- a/docs/test_cases/t00063.md +++ b/docs/test_cases/t00063.md @@ -38,7 +38,7 @@ enum class C { c1, c2, c3 }; "elements": [ { "bases": [], - "display_name": "clanguml::t00063::A", + "display_name": "A", "id": "1518171774798799557", "is_abstract": false, "is_nested": false, @@ -60,6 +60,7 @@ enum class C { c1, c2, c3 }; } ], "name": "t00063_class", + "package_type": "namespace", "relationships": [], "using_namespace": "clanguml::t00063" } diff --git a/docs/test_cases/t00063_class.svg b/docs/test_cases/t00063_class.svg index c1590e8f..2ecd60b4 100644 --- a/docs/test_cases/t00063_class.svg +++ b/docs/test_cases/t00063_class.svg @@ -1,17 +1,21 @@ - + + + + + + + - - - - - - A - - - + + + + + A + + diff --git a/docs/test_cases/t00063_class_mermaid.svg b/docs/test_cases/t00063_class_mermaid.svg index 5dc436a4..a01d07bf 100644 --- a/docs/test_cases/t00063_class_mermaid.svg +++ b/docs/test_cases/t00063_class_mermaid.svg @@ -1,55 +1,50 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + @@ -57,7 +52,7 @@ - + diff --git a/docs/test_cases/t00064.md b/docs/test_cases/t00064.md index a3f2b94d..a40bde1c 100644 --- a/docs/test_cases/t00064.md +++ b/docs/test_cases/t00064.md @@ -90,7 +90,7 @@ public: "elements": [ { "bases": [], - "display_name": "clanguml::t00064::type_list", + "display_name": "type_list", "id": "2055044356505752139", "is_abstract": false, "is_nested": false, @@ -119,7 +119,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00064::type_list", + "display_name": "type_list", "id": "1536403088019105838", "is_abstract": false, "is_nested": false, @@ -166,7 +166,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00064::type_list", + "display_name": "type_list", "id": "1613293628874851145", "is_abstract": false, "is_nested": false, @@ -201,7 +201,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00064::type_list", + "display_name": "type_list", "id": "96201031647373215", "is_abstract": false, "is_nested": false, @@ -236,7 +236,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00064::head>", + "display_name": "head>", "id": "1342666740698875376", "is_abstract": false, "is_nested": false, @@ -278,7 +278,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00064::type_list", + "display_name": "type_list", "id": "74655005329778311", "is_abstract": false, "is_nested": false, @@ -307,7 +307,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00064::type_list", + "display_name": "type_list", "id": "1877705309010128195", "is_abstract": false, "is_nested": false, @@ -336,7 +336,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00064::type_list", + "display_name": "type_list", "id": "1737554639587928188", "is_abstract": false, "is_nested": false, @@ -365,7 +365,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00064::type_group_pair,clanguml::t00064::type_list>", + "display_name": "type_group_pair,type_list>", "id": "1313421318785708660", "is_abstract": false, "is_nested": false, @@ -427,7 +427,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00064::optional_ref", + "display_name": "optional_ref", "id": "2110316024454672764", "is_abstract": false, "is_nested": false, @@ -456,7 +456,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00064::optional_ref,clanguml::t00064::type_list>::value_type>", + "display_name": "optional_ref,type_list>::value_type>", "id": "476531044436856932", "is_abstract": false, "is_nested": false, @@ -485,7 +485,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00064::type_group_pair_it,clanguml::t00064::type_list>", + "display_name": "type_group_pair_it,type_list>", "id": "1024383802991748694", "is_abstract": false, "is_nested": false, @@ -634,7 +634,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00064::A", + "display_name": "A", "id": "586286676481245707", "is_abstract": false, "is_nested": false, @@ -656,7 +656,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00064::B", + "display_name": "B", "id": "1353306307770366167", "is_abstract": false, "is_nested": false, @@ -678,7 +678,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00064::C", + "display_name": "C", "id": "598044391549147725", "is_abstract": false, "is_nested": false, @@ -700,7 +700,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00064::type_list", + "display_name": "type_list", "id": "425551452299939770", "is_abstract": false, "is_nested": false, @@ -741,7 +741,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00064::type_list", + "display_name": "type_list", "id": "179850898515269194", "is_abstract": false, "is_nested": false, @@ -776,7 +776,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00064::type_list", + "display_name": "type_list", "id": "1070380438303872295", "is_abstract": false, "is_nested": false, @@ -817,7 +817,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00064::type_group_pair,clanguml::t00064::type_list>", + "display_name": "type_group_pair,type_list>", "id": "1854055939974723413", "is_abstract": false, "is_nested": false, @@ -884,7 +884,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00064::R", + "display_name": "R", "id": "2161425587790795236", "is_abstract": false, "is_nested": false, @@ -931,7 +931,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00064::type_group_pair", + "display_name": "type_group_pair", "id": "271990753639572557", "is_abstract": false, "is_nested": false, @@ -966,7 +966,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00064::type_group_pair_it", + "display_name": "type_group_pair_it", "id": "1057906395469156958", "is_abstract": false, "is_nested": false, @@ -1007,7 +1007,7 @@ public: }, { "bases": [], - "display_name": "clanguml::t00064::head", + "display_name": "head", "id": "1317314479884183399", "is_abstract": false, "is_nested": false, @@ -1036,6 +1036,7 @@ public: } ], "name": "t00064_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00064_class.svg b/docs/test_cases/t00064_class.svg index 437cbcc5..43088e2e 100644 --- a/docs/test_cases/t00064_class.svg +++ b/docs/test_cases/t00064_class.svg @@ -1,433 +1,337 @@ - + + + + + + + - - - - - - type_list - - Ts... - - - + + + + + type_list + + Ts... + + - - - - - - type_list - - Ret(Arg &&),Ts... - - - + + + + + type_list + + Ret(Arg &&),Ts... + + - - - - - - type_list - - T const,Ts... - - - + + + + + type_list + + T const,Ts... + + - - - - - - type_list - - Head,Tail... - - - + + + + + type_list + + Head,Tail... + + - - - - - - head - - type_list<Head,Tail...> - - - + + + + + head + + type_list<Head,Tail...> + + - - - - - - type_list - - Type... - - - + + + + + type_list + + Type... + + - - - - - - type_list - - First... - - - + + + + + type_list + + First... + + - - - - - - type_list - - Second... - - - + + + + + type_list + + Second... + + - - - - - - type_group_pair - - type_list<First...>,type_list<Second...> - - - - - - - - size : const size_t - - + + + + + type_group_pair + + type_list<First...>,type_list<Second...> + + - - - - - - optional_ref - - T - - - + + + - - - - - - optional_ref - - type_group_pair_it<It,type_list<First...>,type_list<Second...>>::value_type - - - + + size : const size_t - - - - - - type_group_pair_it - - It,type_list<First...>,type_list<Second...> - - - - - - - find(const value_type & v) constexpr : unsigned int - - - - - - - get(unsigned int i) : ref_t - - - - - - - getp(unsigned int i) : const value_type * - - - + + + + + optional_ref + + T + + - - - - - - A - - - + + + + + optional_ref + + type_group_pair_it<It,type_list<First...>,type_list<Second...>>::value_type + + - - - - - - B - - - + + + + + type_group_pair_it + + It,type_list<First...>,type_list<Second...> + - - - - - - C - - - + + + - - - - - - type_list - - A,bool,int - - - + + find(const value_type & v) constexpr : unsigned int - - - - - - type_list - - float,double - - - + + + - - - - - - type_list - - A,B,C - - - + + get(unsigned int i) : ref_t - - - - - - type_group_pair - - type_list<float,double>,type_list<A,B,C> - - - + + + - - - - - - R - - - - - - - - abc : type_group_pair<type_list<float,double>,type_list<A,B,C>> - - - - - - - aboolint : type_list<A,bool,int> - - + + getp(unsigned int i) : const value_type * - - - - - - type_group_pair - - typename,typename - - - + + + + + + A + + - - - - - - type_group_pair_it - - typename,typename,typename - - - + + + + + B + + - - - - - - head - - typename - - - + + + + + C + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - aboolint - - - - - - abc - + + + + + type_list + + A,bool,int + + + + + + + + type_list + + float,double + + + + + + + + type_list + + A,B,C + + + + + + + + type_group_pair + + type_list<float,double>,type_list<A,B,C> + + + + + + + + R + + + + + + + + + abc : type_group_pair<type_list<float,double>,type_list<A,B,C>> + + + + + + + aboolint : type_list<A,bool,int> + + + + + + type_group_pair + + typename,typename + + + + + + + + type_group_pair_it + + typename,typename,typename + + + + + + + + head + + typename + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + aboolint + + + + abc diff --git a/docs/test_cases/t00064_class_mermaid.svg b/docs/test_cases/t00064_class_mermaid.svg index 1a2e75a2..9b87d280 100644 --- a/docs/test_cases/t00064_class_mermaid.svg +++ b/docs/test_cases/t00064_class_mermaid.svg @@ -1,88 +1,83 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -395,7 +390,7 @@ - + @@ -414,7 +409,7 @@ - + @@ -433,7 +428,7 @@ - + @@ -452,7 +447,7 @@ - + @@ -471,7 +466,7 @@ - + @@ -490,7 +485,7 @@ - + @@ -509,7 +504,7 @@ - + @@ -528,7 +523,7 @@ - + @@ -547,7 +542,7 @@ - + @@ -571,7 +566,7 @@ - + @@ -590,7 +585,7 @@ - + @@ -609,7 +604,7 @@ - + @@ -625,25 +620,25 @@ type_group_pair_it<It,type_list<First...>,type_list<Second...>>
- +
- +find(const value_type & v) : : [constexpr] unsigned int + +find(const value_type & v) : [constexpr] unsigned int
- +
- +get(unsigned int i) : : ref_t + +get(unsigned int i) : ref_t
- +
- +getp(unsigned int i) : : const value_type + +getp(unsigned int i) : const value_type
- + @@ -662,7 +657,7 @@ - + @@ -681,7 +676,7 @@ - + @@ -700,7 +695,7 @@ - + @@ -719,7 +714,7 @@ - + @@ -738,7 +733,7 @@ - + @@ -757,7 +752,7 @@ - + @@ -776,7 +771,7 @@ - + @@ -805,7 +800,7 @@ - + @@ -824,7 +819,7 @@ - + @@ -843,7 +838,7 @@ - + diff --git a/docs/test_cases/t00065.md b/docs/test_cases/t00065.md index 1765ece3..4001872e 100644 --- a/docs/test_cases/t00065.md +++ b/docs/test_cases/t00065.md @@ -29,39 +29,6 @@ struct R { } } ``` -File `tests/t00065/module1/module1.h` -```cpp -#include "submodule1a/submodule1a.h" - -#pragma once - -namespace clanguml { -namespace t00065 { - -enum class ABC { a, b, c }; - -enum XYZ { x, y, z }; - -struct A { - ABC abc; - XYZ xyz; - detail::AImpl *pimpl; -}; -} -} -``` -File `tests/t00065/module1/submodule1a/submodule1a.h` -```cpp -#pragma once - -namespace clanguml { -namespace t00065 { -namespace detail { -struct AImpl { }; -} -} -} -``` File `tests/t00065/module2/module2.h` ```cpp #pragma once @@ -100,6 +67,39 @@ concept bconcept = requires(T t) { t.b(); }; +} +} +``` +File `tests/t00065/module1/module1.h` +```cpp +#include "submodule1a/submodule1a.h" + +#pragma once + +namespace clanguml { +namespace t00065 { + +enum class ABC { a, b, c }; + +enum XYZ { x, y, z }; + +struct A { + ABC abc; + XYZ xyz; + detail::AImpl *pimpl; +}; +} +} +``` +File `tests/t00065/module1/submodule1a/submodule1a.h` +```cpp +#pragma once + +namespace clanguml { +namespace t00065 { +namespace detail { +struct AImpl { }; +} } } ``` @@ -116,11 +116,11 @@ concept bconcept = requires(T t) { "display_name": "module1", "elements": [ { - "display_name": "module1::submodule1a", + "display_name": "submodule1a", "elements": [ { "bases": [], - "display_name": "clanguml::t00065::detail::AImpl", + "display_name": "detail::AImpl", "id": "674757414308736755", "is_abstract": false, "is_nested": false, @@ -150,7 +150,7 @@ concept bconcept = requires(T t) { "b", "c" ], - "display_name": "clanguml::t00065::ABC", + "display_name": "ABC", "id": "2145362985538918973", "is_nested": false, "name": "ABC", @@ -169,7 +169,7 @@ concept bconcept = requires(T t) { "y", "z" ], - "display_name": "clanguml::t00065::XYZ", + "display_name": "XYZ", "id": "1435940218810141944", "is_nested": false, "name": "XYZ", @@ -184,7 +184,7 @@ concept bconcept = requires(T t) { }, { "bases": [], - "display_name": "clanguml::t00065::A", + "display_name": "A", "id": "1178194542408300737", "is_abstract": false, "is_nested": false, @@ -249,10 +249,10 @@ concept bconcept = requires(T t) { "display_name": "module2", "elements": [ { - "display_name": "module2::concepts", + "display_name": "concepts", "elements": [ { - "display_name": "clanguml::t00065::bconcept", + "display_name": "bconcept", "id": "1325475407133721370", "name": "bconcept", "namespace": "clanguml::t00065", @@ -280,7 +280,7 @@ concept bconcept = requires(T t) { }, { "bases": [], - "display_name": "clanguml::t00065::B", + "display_name": "B", "id": "1651810571114530033", "is_abstract": false, "is_nested": false, @@ -355,7 +355,7 @@ concept bconcept = requires(T t) { }, { "bases": [], - "display_name": "clanguml::t00065::C", + "display_name": "C", "id": "1157378014768957235", "is_abstract": false, "is_nested": false, @@ -397,7 +397,7 @@ concept bconcept = requires(T t) { }, { "bases": [], - "display_name": "clanguml::t00065::C", + "display_name": "C", "id": "580575003920044707", "is_abstract": false, "is_nested": false, @@ -426,7 +426,7 @@ concept bconcept = requires(T t) { }, { "bases": [], - "display_name": "clanguml::t00065::D", + "display_name": "D", "id": "1719752929087851944", "is_abstract": false, "is_nested": false, @@ -480,7 +480,7 @@ concept bconcept = requires(T t) { }, { "bases": [], - "display_name": "clanguml::t00065::C", + "display_name": "C", "id": "1373403346245688670", "is_abstract": false, "is_nested": false, @@ -509,7 +509,7 @@ concept bconcept = requires(T t) { }, { "bases": [], - "display_name": "clanguml::t00065::D", + "display_name": "D", "id": "2024276012622729482", "is_abstract": false, "is_nested": false, @@ -542,7 +542,7 @@ concept bconcept = requires(T t) { }, { "bases": [], - "display_name": "clanguml::t00065::R", + "display_name": "R", "id": "1082111961413727438", "is_abstract": false, "is_nested": false, @@ -601,6 +601,7 @@ concept bconcept = requires(T t) { } ], "name": "t00065_class", + "package_type": "directory", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00065_class.svg b/docs/test_cases/t00065_class.svg index d49d88f9..803fdd91 100644 --- a/docs/test_cases/t00065_class.svg +++ b/docs/test_cases/t00065_class.svg @@ -1,310 +1,258 @@ - + + + + + + + - - - - module1 - - - - - submodule1a - - - - - module2 - - - - - concepts - - - - - - - ABC - - a - b - c - - + + + module1 + + + submodule1a + + + module2 + + + concepts + + + + + ABC + + a + b + c + - - - - - - XYZ - - x - y - z - - + + + + + XYZ + + x + y + z + - - - - - - A - - - - - - - - abc : ABC - - - - - - - pimpl : detail::AImpl * - - - - - - - xyz : XYZ - - + + + + + A + + - - - - - - detail::AImpl - - - + + + - - - - - - B - - - - - - - B() = default : void - - - - - - - - b() : void - - - + + abc : ABC - - - - - - C - - T - - - - - - - - t : T * - - + + + - - - - - - C - - int - - - + + pimpl : detail::AImpl * - - - - - - D - - bconcept T - - - - - - - - c : C<int> - - - - - - - t : T - - + + + - - - - - - C - - B - - - + + xyz : XYZ - - - - - - D - - B - - - + + + + + detail::AImpl + + - - - - - - «concept» - bconcept - - T - - (T t) - - T{} - t.b() - + + + + + B + - - - - - - R - - - - - - - - a : A * - - - - - - - c : C<B> - - - - - - - d : D<B> - - + + + - - - - - abc - - - - - - xyz - - - - - - pimpl - - - - - - - - - T - - - - - +c - - - - - - - - - - - - - - - - - - - - - +a - - - - - +c - - - - - +d - + + B() = default : void + + + + + + + + b() : void + + + + + + + C + + T + + + + + + + + + t : T * + + + + + + C + + int + + + + + + + + D + + bconcept T + + + + + + + + + c : C<int> + + + + + + + t : T + + + + + + C + + B + + + + + + + + D + + B + + + + + + + + «concept» + bconcept + + T + + (T t) + + T{} + t.b() + + + + + + R + + + + + + + + + a : A * + + + + + + + c : C<B> + + + + + + + d : D<B> + + + + + abc + + + + xyz + + + + pimpl + + + + + T + + + +c + + + + + + + + + + + +a + + + +c + + + +d diff --git a/docs/test_cases/t00065_class_mermaid.svg b/docs/test_cases/t00065_class_mermaid.svg index 98fe284a..610f20b7 100644 --- a/docs/test_cases/t00065_class_mermaid.svg +++ b/docs/test_cases/t00065_class_mermaid.svg @@ -1,73 +1,68 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -114,7 +109,7 @@ - +
@@ -125,7 +120,7 @@ - +
@@ -191,7 +186,7 @@ - +
@@ -202,7 +197,7 @@ - + - +
- "(T t) : " + "(T t)"
- + - - - + + +
@@ -386,20 +381,20 @@ B
- +
- +B() : : [default] void + +B() : [default] void
- +
- +b() : : void + +b() : void
- + @@ -417,13 +412,13 @@
- +t : T + +t : T
- + @@ -442,7 +437,7 @@ - + @@ -471,7 +466,7 @@ - + @@ -490,7 +485,7 @@ - + @@ -509,7 +504,7 @@ - + @@ -527,7 +522,7 @@
- +a : A + +a : A
diff --git a/docs/test_cases/t00066.md b/docs/test_cases/t00066.md index fab6b6ee..b0335cc5 100644 --- a/docs/test_cases/t00066.md +++ b/docs/test_cases/t00066.md @@ -97,7 +97,7 @@ int A::static_int = 1; "elements": [ { "bases": [], - "display_name": "clanguml::t00066::A", + "display_name": "A", "id": "1899957281758233935", "is_abstract": false, "is_nested": false, @@ -821,6 +821,7 @@ int A::static_int = 1; } ], "name": "t00066_class", + "package_type": "namespace", "relationships": [], "using_namespace": "clanguml::t00066" } diff --git a/docs/test_cases/t00066_class.svg b/docs/test_cases/t00066_class.svg index ed29597e..6322e651 100644 --- a/docs/test_cases/t00066_class.svg +++ b/docs/test_cases/t00066_class.svg @@ -1,227 +1,231 @@ - + + + + + + + - - - - - - A - - - - - - - public_member : int - - - - - - - protected_member : int - - - - - - - private_member : int - - - - - - - a_ : int - - - - - - - b_ : int - - - - - - - c_ : int - - - - - - - static_int : int - - - - - - - static_const_int : const int - - - - - - - auto_member : const unsigned long - - - - - - - - A() = default : void - - - - - - - A(int i) : void - - - - - - - A(A &&) = default : void - - - - - - - A(const A &) = deleted : void - - - - - - - ~A() = default : void - - - - - - - basic_method() : void - - - - - - - static_method() : int - - - - - - - const_method() const : void - - - - - - - auto_method() : int - - - - - - - operator++() : A & - - - - - - - operator=(A && other) noexcept : A & - - - - - - - operator=(A & other) noexcept : A & - - - - - - - size() const : std::size_t - - - - - - - double_int(const int i) : int - - - - - - - sum(const double a, const double b) : int - - - - - - - default_int(int i = 12) : int - - - - - - - default_string(int i, std::string s = "abc") : std::string - - - - - - - create_from_int(int i) : A - - - - - - - protected_method() : void - - - - - - - private_method() : void - - - - - - - compare : std::function<bool (const int)> - - + + + + + A + + + + + + + + public_member : int + + + + + + + protected_member : int + + + + + + + private_member : int + + + + + + + a_ : int + + + + + + + b_ : int + + + + + + + c_ : int + + + + + + + static_int : int + + + + + + + static_const_int : const int + + + + + + + auto_member : const unsigned long + + + + + + + + A() = default : void + + + + + + + A(int i) : void + + + + + + + A(A &&) = default : void + + + + + + + A(const A &) = deleted : void + + + + + + + ~A() = default : void + + + + + + + basic_method() : void + + + + + + + static_method() : int + + + + + + + const_method() const : void + + + + + + + auto_method() : int + + + + + + + operator++() : A & + + + + + + + operator=(A && other) noexcept : A & + + + + + + + operator=(A & other) noexcept : A & + + + + + + + size() const : std::size_t + + + + + + + double_int(const int i) : int + + + + + + + sum(const double a, const double b) : int + + + + + + + default_int(int i = 12) : int + + + + + + + default_string(int i, std::string s = "abc") : std::string + + + + + + + create_from_int(int i) : A + + + + + + + protected_method() : void + + + + + + + private_method() : void + + + + + + + compare : std::function<bool (const int)> diff --git a/docs/test_cases/t00066_class_mermaid.svg b/docs/test_cases/t00066_class_mermaid.svg index 368a6ff6..40546ea7 100644 --- a/docs/test_cases/t00066_class_mermaid.svg +++ b/docs/test_cases/t00066_class_mermaid.svg @@ -1,55 +1,50 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + @@ -57,11 +52,11 @@ - + - - - + + +
@@ -73,154 +68,154 @@ A
- +
+public_member : int
- +
#protected_member : int
- +
#compare : std::function<bool (const int)>
- +
-private_member : int
- +
-a_ : int
- +
-b_ : int
- +
-c_ : int
- +
+static_int : int
- +
+static_const_int : const int
- +
+auto_member : const unsigned long
- +
- +A() : : [default] void + +A() : [default] void
- +
- +A(int i) : : void + +A(int i) : void
- +
- +A(A &&) : : [default] void + +A(A &&) : [default] void
- +
- +A(const A &) : : void + +A(const A &) : void
- +
- +~A() : : [default] void + +~A() : [default] void
- +
- +basic_method() : : void + +basic_method() : void
- +
- +static_method() : : int + +static_method() : int
- +
- +const_method() : : [const] void + +const_method() : [const] void
- +
- +auto_method() : : int + +auto_method() : int
- +
- +operator++() : : A & + +operator++() : A &
- +
- +operator=(A && other) : : A & + +operator=(A && other) : A &
- +
- +operator=(A & other) : : A & + +operator=(A & other) : A &
- +
- +size() : : [const] std::size_t + +size() : [const] std::size_t
- +
- +double_int(const int i) : : int + +double_int(const int i) : int
- +
- +sum(const double a, const double b) : : int + +sum(const double a, const double b) : int
- +
- +default_int(int i = 12) : : int + +default_int(int i = 12) : int
- +
- +default_string(int i, std::string s = "abc") : : std::string + +default_string(int i, std::string s = "abc") : std::string
- +
- +create_from_int(int i) : : A + +create_from_int(int i) : A
- +
- #protected_method() : : void + #protected_method() : void
- +
- -private_method() : : void + -private_method() : void
diff --git a/docs/test_cases/t00067.md b/docs/test_cases/t00067.md index 17eba7dc..caf5131f 100644 --- a/docs/test_cases/t00067.md +++ b/docs/test_cases/t00067.md @@ -100,7 +100,7 @@ int A::static_int = 1; "elements": [ { "bases": [], - "display_name": "clanguml::t00067::A", + "display_name": "A", "id": "541140581420098839", "is_abstract": false, "is_nested": false, @@ -534,6 +534,7 @@ int A::static_int = 1; } ], "name": "t00067_class", + "package_type": "namespace", "relationships": [], "using_namespace": "clanguml::t00067" } diff --git a/docs/test_cases/t00067_class.svg b/docs/test_cases/t00067_class.svg index 80ae2940..61c4fbbd 100644 --- a/docs/test_cases/t00067_class.svg +++ b/docs/test_cases/t00067_class.svg @@ -1,157 +1,161 @@ - + + + + + + + - - - - - - A - - - - - - - auto_method() : int - - - - - - - basic_method() : void - - - - - - - const_method() const : void - - - - - - - default_int(int i = 12) : int - - - - - - - default_string(int i, std::string s = "abc") : std::string - - - - - - - double_int(const int i) : int - - - - - - - private_method() : void - - - - - - - protected_method() : void - - - - - - - size() const : std::size_t - - - - - - - sum(const double a, const double b) : int - - - - - - - - a_ : int - - - - - - - auto_member : const unsigned long - - - - - - - b_ : int - - - - - - - c_ : int - - - - - - - compare : std::function<bool (const int)> - - - - - - - private_member : int - - - - - - - protected_member : int - - - - - - - public_member : int - - - - - - - static_const_int : const int - - - - - - - static_int : int - - + + + + + A + + + + + + + + auto_method() : int + + + + + + + basic_method() : void + + + + + + + const_method() const : void + + + + + + + default_int(int i = 12) : int + + + + + + + default_string(int i, std::string s = "abc") : std::string + + + + + + + double_int(const int i) : int + + + + + + + private_method() : void + + + + + + + protected_method() : void + + + + + + + size() const : std::size_t + + + + + + + sum(const double a, const double b) : int + + + + + + + + a_ : int + + + + + + + auto_member : const unsigned long + + + + + + + b_ : int + + + + + + + c_ : int + + + + + + + compare : std::function<bool (const int)> + + + + + + + private_member : int + + + + + + + protected_member : int + + + + + + + public_member : int + + + + + + + static_const_int : const int + + + + + + + static_int : int diff --git a/docs/test_cases/t00067_class_mermaid.svg b/docs/test_cases/t00067_class_mermaid.svg index 00b6e59f..0c352cce 100644 --- a/docs/test_cases/t00067_class_mermaid.svg +++ b/docs/test_cases/t00067_class_mermaid.svg @@ -1,55 +1,50 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + @@ -57,11 +52,11 @@ - + - - - + + +
@@ -73,104 +68,104 @@ A
- +
-a_ : int
- +
+auto_member : const unsigned long
- +
-b_ : int
- +
-c_ : int
- +
#compare : std::function<bool (const int)>
- +
-private_member : int
- +
#protected_member : int
- +
+public_member : int
- +
+static_const_int : const int
- +
+static_int : int
- +
- +auto_method() : : int + +auto_method() : int
- +
- +basic_method() : : void + +basic_method() : void
- +
- +const_method() : : [const] void + +const_method() : [const] void
- +
- +default_int(int i = 12) : : int + +default_int(int i = 12) : int
- +
- +default_string(int i, std::string s = "abc") : : std::string + +default_string(int i, std::string s = "abc") : std::string
- +
- +double_int(const int i) : : int + +double_int(const int i) : int
- +
- -private_method() : : void + -private_method() : void
- +
- #protected_method() : : void + #protected_method() : void
- +
- +size() : : [const] std::size_t + +size() : [const] std::size_t
- +
- +sum(const double a, const double b) : : int + +sum(const double a, const double b) : int
diff --git a/docs/test_cases/t00068.md b/docs/test_cases/t00068.md index 2c9e55a5..f4939ccb 100644 --- a/docs/test_cases/t00068.md +++ b/docs/test_cases/t00068.md @@ -100,7 +100,7 @@ struct RR { "name": "clanguml::t00068::AA" } ], - "display_name": "clanguml::t00068::AAA", + "display_name": "AAA", "id": "1484819281509619918", "is_abstract": false, "is_nested": false, @@ -147,6 +147,7 @@ struct RR { } ], "name": "t00068_r0_class", + "package_type": "namespace", "relationships": [ { "access": "public", @@ -179,7 +180,7 @@ struct RR { "elements": [ { "bases": [], - "display_name": "clanguml::t00068::BB", + "display_name": "BB", "id": "1427649116338755656", "is_abstract": false, "is_nested": false, @@ -218,7 +219,7 @@ struct RR { "TwoA", "ThreeA" ], - "display_name": "clanguml::t00068::AKind", + "display_name": "AKind", "id": "1888428536574868284", "is_nested": false, "name": "AKind", @@ -240,7 +241,7 @@ struct RR { "name": "clanguml::t00068::A" } ], - "display_name": "clanguml::t00068::AA", + "display_name": "AA", "id": "577981285610429577", "is_abstract": false, "is_nested": false, @@ -269,7 +270,7 @@ struct RR { "name": "clanguml::t00068::AA" } ], - "display_name": "clanguml::t00068::AAA", + "display_name": "AAA", "id": "1484819281509619918", "is_abstract": false, "is_nested": false, @@ -316,7 +317,7 @@ struct RR { }, { "bases": [], - "display_name": "clanguml::t00068::R", + "display_name": "R", "id": "999621481464424961", "is_abstract": false, "is_nested": false, @@ -351,6 +352,7 @@ struct RR { } ], "name": "t00068_r1_class", + "package_type": "namespace", "relationships": [ { "access": "public", @@ -403,7 +405,7 @@ struct RR { "elements": [ { "bases": [], - "display_name": "clanguml::t00068::B", + "display_name": "B", "id": "359183874441719256", "is_abstract": false, "is_nested": false, @@ -425,7 +427,7 @@ struct RR { }, { "bases": [], - "display_name": "clanguml::t00068::BB", + "display_name": "BB", "id": "1427649116338755656", "is_abstract": false, "is_nested": false, @@ -464,7 +466,7 @@ struct RR { "TwoA", "ThreeA" ], - "display_name": "clanguml::t00068::AKind", + "display_name": "AKind", "id": "1888428536574868284", "is_nested": false, "name": "AKind", @@ -479,7 +481,7 @@ struct RR { }, { "bases": [], - "display_name": "clanguml::t00068::A", + "display_name": "A", "id": "1297439817144700057", "is_abstract": false, "is_nested": false, @@ -508,7 +510,7 @@ struct RR { "name": "clanguml::t00068::A" } ], - "display_name": "clanguml::t00068::AA", + "display_name": "AA", "id": "577981285610429577", "is_abstract": false, "is_nested": false, @@ -537,7 +539,7 @@ struct RR { "name": "clanguml::t00068::AA" } ], - "display_name": "clanguml::t00068::AAA", + "display_name": "AAA", "id": "1484819281509619918", "is_abstract": false, "is_nested": false, @@ -584,7 +586,7 @@ struct RR { }, { "bases": [], - "display_name": "clanguml::t00068::R", + "display_name": "R", "id": "999621481464424961", "is_abstract": false, "is_nested": false, @@ -619,7 +621,7 @@ struct RR { }, { "bases": [], - "display_name": "clanguml::t00068::RR", + "display_name": "RR", "id": "1168375787542426694", "is_abstract": false, "is_nested": false, @@ -654,6 +656,7 @@ struct RR { } ], "name": "t00068_r2_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00068_r0_class.svg b/docs/test_cases/t00068_r0_class.svg index 79fb3dbc..1b511858 100644 --- a/docs/test_cases/t00068_r0_class.svg +++ b/docs/test_cases/t00068_r0_class.svg @@ -1,32 +1,36 @@ - + + + + + + + - AAA context of radius 0 - - - - - - AAA - - - - - - - - akind : AKind - - - - - - - bb : BB * - - + AAA context of radius 0 + + + + + AAA + + + + + + + + + akind : AKind + + + + + + + bb : BB * diff --git a/docs/test_cases/t00068_r0_class_mermaid.svg b/docs/test_cases/t00068_r0_class_mermaid.svg index 5fc69921..504d9966 100644 --- a/docs/test_cases/t00068_r0_class_mermaid.svg +++ b/docs/test_cases/t00068_r0_class_mermaid.svg @@ -1,55 +1,51 @@ - - + + AAA context of radius 0 + - + - + - + - + - + - + - + - + - - - - - - - + + @@ -57,7 +53,7 @@ - + @@ -80,7 +76,7 @@
- +bb : BB + +bb : BB
diff --git a/docs/test_cases/t00068_r1_class.svg b/docs/test_cases/t00068_r1_class.svg index 1461974d..433e4630 100644 --- a/docs/test_cases/t00068_r1_class.svg +++ b/docs/test_cases/t00068_r1_class.svg @@ -1,111 +1,99 @@ - + + + + + + + - AAA context of radius 1 - - - - - - BB - - - - - - - - b : std::vector<B> - - + AAA context of radius 1 + + + + + BB + + - - - - - - AKind - - OneA - TwoA - ThreeA - - + + + - - - - - - AA - - - + + b : std::vector<B> - - - - - - AAA - - - - - - - - akind : AKind - - - - - - - bb : BB * - - + + + + + AKind + + OneA + TwoA + ThreeA + - - - - - - R - - - - - - - - aaa : AAA * - - + + + + + AA + + - - - - - bb - - - - - - akind - - - - - - - - - - aaa - + + + + + AAA + + + + + + + + + akind : AKind + + + + + + + bb : BB * + + + + + + R + + + + + + + + + aaa : AAA * + + + + + bb + + + + akind + + + + + + aaa diff --git a/docs/test_cases/t00068_r1_class_mermaid.svg b/docs/test_cases/t00068_r1_class_mermaid.svg index b28fe765..8018a8ad 100644 --- a/docs/test_cases/t00068_r1_class_mermaid.svg +++ b/docs/test_cases/t00068_r1_class_mermaid.svg @@ -1,64 +1,60 @@ - - + + AAA context of radius 1 + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - + + + + @@ -105,7 +101,7 @@ - + @@ -129,7 +125,7 @@ - + @@ -163,7 +159,7 @@ - + @@ -182,7 +178,7 @@ - + @@ -205,13 +201,13 @@
- +bb : BB + +bb : BB
- + @@ -229,7 +225,7 @@
- +aaa : AAA + +aaa : AAA
diff --git a/docs/test_cases/t00068_r2_class.svg b/docs/test_cases/t00068_r2_class.svg index a6a545b5..5ca2ba3c 100644 --- a/docs/test_cases/t00068_r2_class.svg +++ b/docs/test_cases/t00068_r2_class.svg @@ -1,162 +1,138 @@ - + + + + + + + - AAA context of radius 2 - - - - - - B - - - + AAA context of radius 2 + + + + + B + + - - - - - - BB - - - - - - - - b : std::vector<B> - - + + + + + BB + + - - - - - - AKind - - OneA - TwoA - ThreeA - - + + + - - - - - - A - - - + + b : std::vector<B> - - - - - - AA - - - + + + + + AKind + + OneA + TwoA + ThreeA + - - - - - - AAA - - - - - - - - akind : AKind - - - - - - - bb : BB * - - + + + + + A + + - - - - - - R - - - - - - - - aaa : AAA * - - + + + + + AA + + - - - - - - RR - - - - - - - - r : std::shared_ptr<R> - - + + + + + AAA + + - - - - +b - - - - - - - - - - bb - - - - - - akind - - - - - - - - - - aaa - - - - - +r - + + + + + + akind : AKind + + + + + + + bb : BB * + + + + + + R + + + + + + + + + aaa : AAA * + + + + + + RR + + + + + + + + + r : std::shared_ptr<R> + + + + +b + + + + + + bb + + + + akind + + + + + + aaa + + + +r diff --git a/docs/test_cases/t00068_r2_class_mermaid.svg b/docs/test_cases/t00068_r2_class_mermaid.svg index 18a1239c..ec5f8eb8 100644 --- a/docs/test_cases/t00068_r2_class_mermaid.svg +++ b/docs/test_cases/t00068_r2_class_mermaid.svg @@ -1,67 +1,63 @@ - - + + AAA context of radius 2 + - + - + - + - + - + - + - + - + - - - - - - - + + - - - - - - - + + + + + + + @@ -139,7 +135,7 @@ - + @@ -158,7 +154,7 @@ - + @@ -182,7 +178,7 @@ - + @@ -216,7 +212,7 @@ - + @@ -235,7 +231,7 @@ - + @@ -254,7 +250,7 @@ - + @@ -277,13 +273,13 @@
- +bb : BB + +bb : BB
- + @@ -301,13 +297,13 @@
- +aaa : AAA + +aaa : AAA
- + diff --git a/docs/test_cases/t00069.md b/docs/test_cases/t00069.md index 69fa153d..e544d504 100644 --- a/docs/test_cases/t00069.md +++ b/docs/test_cases/t00069.md @@ -90,7 +90,7 @@ private: "elements": [ { "bases": [], - "display_name": "clanguml::t00069::generator", + "display_name": "generator", "id": "2142496233889685657", "is_abstract": false, "is_nested": false, @@ -202,7 +202,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00069::generator::promise_type", + "display_name": "generator::promise_type", "id": "721812727497968117", "is_abstract": false, "is_nested": true, @@ -405,7 +405,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00069::generator", + "display_name": "generator", "id": "1604358347140526608", "is_abstract": false, "is_nested": false, @@ -434,7 +434,7 @@ private: }, { "bases": [], - "display_name": "clanguml::t00069::A", + "display_name": "A", "id": "2160142503252767290", "is_abstract": false, "is_nested": false, @@ -522,6 +522,7 @@ private: } ], "name": "t00069_class", + "package_type": "namespace", "relationships": [ { "access": "public", diff --git a/docs/test_cases/t00069_class.svg b/docs/test_cases/t00069_class.svg index 13da91c0..c5fbb07a 100644 --- a/docs/test_cases/t00069_class.svg +++ b/docs/test_cases/t00069_class.svg @@ -1,165 +1,157 @@ - + + + + + + + - - - - - - generator - - T - - - - - - - generator(handle_type h) : void - - - - - - - ~generator() : void - - - - - - - - full_ : bool - - - - - - - h_ : handle_type - - + + + + + generator + + T + - - - - - - generator::promise_type - - - - - - - final_suspend() noexcept : std::suspend_always - - - - - - - get_return_object() : generator<T> - - - - - - - initial_suspend() : std::suspend_always - - - - - - - return_void() : void - - - - - - - unhandled_exception() : void - - - yield_value<std::convertible_to From>(From && from) : std::suspend_always - - - - - - - exception_ : std::exception_ptr - - - - - - - value_ : T - - + + + - - - - - - generator - - unsigned long - - - + + generator(handle_type h) : void - - - - - - A - - - - - - - iota() [coroutine] : generator<unsigned long> - - - - - - - seed() [coroutine] : generator<unsigned long> - - - - - - - - counter_ : unsigned long - - + + + - - - - - - - - - - - - - - + + ~generator() : void + + + + + + + + full_ : bool + + + + + + + h_ : handle_type + + + + + + generator::promise_type + + + + + + + + final_suspend() noexcept : std::suspend_always + + + + + + + get_return_object() : generator<T> + + + + + + + initial_suspend() : std::suspend_always + + + + + + + return_void() : void + + + + + + + unhandled_exception() : void + + + yield_value<std::convertible_to From>(From && from) : std::suspend_always + + + + + + + exception_ : std::exception_ptr + + + + + + + value_ : T + + + + + + generator + + unsigned long + + + + + + + + A + + + + + + + + iota() [coroutine] : generator<unsigned long> + + + + + + + seed() [coroutine] : generator<unsigned long> + + + + + + + + counter_ : unsigned long + + + + + + + + + diff --git a/docs/test_cases/t00069_class_mermaid.svg b/docs/test_cases/t00069_class_mermaid.svg index 53a99bab..adf70563 100644 --- a/docs/test_cases/t00069_class_mermaid.svg +++ b/docs/test_cases/t00069_class_mermaid.svg @@ -1,63 +1,58 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + - - - + + + @@ -95,11 +90,11 @@ - + - - - + + +
@@ -111,34 +106,34 @@ generator<T>
- +
-full_ : bool
- +
+h_ : handle_type
- +
- +generator(handle_type h) : : void + +generator(handle_type h) : void
- +
- +~generator() : : void + +~generator() : void
- + - - - + + +
@@ -150,50 +145,50 @@ generator::promise_type
- +
+exception_ : std::exception_ptr
- +
+value_ : T
- +
- +final_suspend() : : std::suspend_always + +final_suspend() : std::suspend_always
- +
- +get_return_object() : : generator<T> + +get_return_object() : generator<T>
- +
- +initial_suspend() : : std::suspend_always + +initial_suspend() : std::suspend_always
- +
- +return_void() : : void + +return_void() : void
- +
- +unhandled_exception() : : void + +unhandled_exception() : void
- +
- +yield_value(From && from) : : std::suspend_always + +yield_value(From && from) : std::suspend_always
- + @@ -212,11 +207,11 @@ - + - - - + + +
@@ -228,19 +223,19 @@ A
- +
-counter_ : unsigned long
- +
- +iota() : : [coroutine] generator<unsigned long> + +iota() : [coroutine] generator<unsigned long>
- +
- +seed() : : [coroutine] generator<unsigned long> + +seed() : [coroutine] generator<unsigned long>
diff --git a/docs/test_cases/t00070.md b/docs/test_cases/t00070.md index 4d317017..047fa287 100644 --- a/docs/test_cases/t00070.md +++ b/docs/test_cases/t00070.md @@ -35,6 +35,34 @@ int tmain() } } ``` +File `tests/t00070/src/common.cppm` +```cpp +export module t00070; +export import t00070.lib1; +export import t00070.lib2; + +export namespace clanguml::t00070 { +class A { + int get() { return a; } + + int a; +}; +} +``` +File `tests/t00070/src/lib2.cppm` +```cpp +export module t00070.lib2; + +export namespace clanguml::t00070 { +class C { }; + +template class CC { + T t; +}; + +enum class CCC { ccc1, ccc2 }; +} +``` File `tests/t00070/src/lib1.cppm` ```cpp export module t00070.lib1; @@ -54,34 +82,6 @@ namespace clanguml::t00070 { class BBBB { }; } ``` -File `tests/t00070/src/lib2.cppm` -```cpp -export module t00070.lib2; - -export namespace clanguml::t00070 { -class C { }; - -template class CC { - T t; -}; - -enum class CCC { ccc1, ccc2 }; -} -``` -File `tests/t00070/src/common.cppm` -```cpp -export module t00070; -export import t00070.lib1; -export import t00070.lib2; - -export namespace clanguml::t00070 { -class A { - int get() { return a; } - - int a; -}; -} -``` ## Generated PlantUML diagrams ![t00070_class](./t00070_class.svg "Diagram filter based on C++20 modules") ## Generated Mermaid diagrams @@ -93,7 +93,7 @@ class A { "elements": [ { "bases": [], - "display_name": "clanguml::t00070::B", + "display_name": "B", "id": "1364261599035905834", "is_abstract": false, "is_nested": false, @@ -119,7 +119,7 @@ class A { }, { "bases": [], - "display_name": "clanguml::t00070::BB", + "display_name": "BB", "id": "1485755083045282660", "is_abstract": false, "is_nested": false, @@ -168,7 +168,7 @@ class A { "bbb1", "bbb2" ], - "display_name": "clanguml::t00070::BBB", + "display_name": "BBB", "id": "1734694076622541097", "is_nested": false, "module": { @@ -187,7 +187,7 @@ class A { }, { "bases": [], - "display_name": "clanguml::t00070::A", + "display_name": "A", "id": "668221430913861424", "is_abstract": false, "is_nested": false, @@ -253,6 +253,7 @@ class A { } ], "name": "t00070_class", + "package_type": "namespace", "relationships": [], "using_namespace": "clanguml::t00070" } diff --git a/docs/test_cases/t00070_class.svg b/docs/test_cases/t00070_class.svg index ba83c587..e565509b 100644 --- a/docs/test_cases/t00070_class.svg +++ b/docs/test_cases/t00070_class.svg @@ -1,72 +1,70 @@ - + + + + + + + - - - - - - B - - - + + + + + B + + - - - - - - BB - - T - - - - - - - - t : T - - + + + + + BB + + T + + - - - - - - BBB - - bbb1 - bbb2 - - + + + - - - - - - A - - - - - - - get() : int - - - - - - - - a : int - - + + t : T + + + + + + BBB + + bbb1 + bbb2 + + + + + + + A + + + + + + + + get() : int + + + + + + + + a : int diff --git a/docs/test_cases/t00070_class_mermaid.svg b/docs/test_cases/t00070_class_mermaid.svg index f611352c..93b009ed 100644 --- a/docs/test_cases/t00070_class_mermaid.svg +++ b/docs/test_cases/t00070_class_mermaid.svg @@ -1,55 +1,50 @@ - - + + - + - + - + - + - + - + - + - + - - - - - - - + + @@ -57,7 +52,7 @@ - + @@ -76,7 +71,7 @@ - + @@ -100,7 +95,7 @@ - + @@ -129,11 +124,11 @@ - + - - - + + +
@@ -145,14 +140,14 @@ A
- +
-a : int
- +
- -get() : : int + -get() : int
diff --git a/docs/test_cases/t00071.md b/docs/test_cases/t00071.md index 279feac0..abf6dfcd 100644 --- a/docs/test_cases/t00071.md +++ b/docs/test_cases/t00071.md @@ -33,20 +33,26 @@ class R { } } ``` -File `tests/t00071/src/lib1.cppm` +File `tests/t00071/src/lib1mod2.cppm` ```cpp -export module t00071.app.lib1; +export module t00071.app.lib1.mod2; export namespace clanguml::t00071 { -class B { }; +class E { }; +} +``` +File `tests/t00071/src/t00071_mod.cppm` +```cpp +export module t00071.app; +export import t00071.app.lib1; +export import t00071.app.lib2; -template class BB { - T t; +export namespace clanguml::t00071 { +class A { + int get() { return a; } + + int a; }; - -namespace detail { -enum class BBB { bbb1, bbb2 }; -} // namespace detail } ``` File `tests/t00071/src/lib2.cppm` @@ -65,6 +71,22 @@ enum class CCC { ccc1, ccc2 }; } } ``` +File `tests/t00071/src/lib1.cppm` +```cpp +export module t00071.app.lib1; + +export namespace clanguml::t00071 { +class B { }; + +template class BB { + T t; +}; + +namespace detail { +enum class BBB { bbb1, bbb2 }; +} // namespace detail +} +``` File `tests/t00071/src/lib1mod1.cppm` ```cpp export module t00071.app.lib1.mod1; @@ -73,28 +95,6 @@ export namespace clanguml::t00071 { class D { }; } ``` -File `tests/t00071/src/t00071_mod.cppm` -```cpp -export module t00071.app; -export import t00071.app.lib1; -export import t00071.app.lib2; - -export namespace clanguml::t00071 { -class A { - int get() { return a; } - - int a; -}; -} -``` -File `tests/t00071/src/lib1mod2.cppm` -```cpp -export module t00071.app.lib1.mod2; - -export namespace clanguml::t00071 { -class E { }; -} -``` ## Generated PlantUML diagrams ![t00071_class](./t00071_class.svg "Class diagram with C++20 modules generated as packages") ## Generated Mermaid diagrams @@ -108,11 +108,11 @@ class E { }; "display_name": "app", "elements": [ { - "display_name": "app::lib1", + "display_name": "lib1", "elements": [ { "bases": [], - "display_name": "clanguml::t00071::B", + "display_name": "B", "id": "1319862510251967999", "is_abstract": false, "is_nested": false, @@ -138,7 +138,7 @@ class E { }; }, { "bases": [], - "display_name": "clanguml::t00071::BB", + "display_name": "BB", "id": "569632796637866961", "is_abstract": false, "is_nested": false, @@ -187,7 +187,7 @@ class E { }; "bbb1", "bbb2" ], - "display_name": "clanguml::t00071::detail::BBB", + "display_name": "detail::BBB", "id": "1625078061541942293", "is_nested": false, "module": { @@ -205,11 +205,11 @@ class E { }; "type": "enum" }, { - "display_name": "app::lib1::mod1", + "display_name": "mod1", "elements": [ { "bases": [], - "display_name": "clanguml::t00071::D", + "display_name": "D", "id": "1168777064323042894", "is_abstract": false, "is_nested": false, @@ -238,11 +238,11 @@ class E { }; "type": "module" }, { - "display_name": "app::lib1::mod2", + "display_name": "mod2", "elements": [ { "bases": [], - "display_name": "clanguml::t00071::E", + "display_name": "E", "id": "1302694761523535504", "is_abstract": false, "is_nested": false, @@ -275,11 +275,11 @@ class E { }; "type": "module" }, { - "display_name": "app::lib2", + "display_name": "lib2", "elements": [ { "bases": [], - "display_name": "clanguml::t00071::C", + "display_name": "C", "id": "1697463991772603674", "is_abstract": false, "is_nested": false, @@ -305,7 +305,7 @@ class E { }; }, { "bases": [], - "display_name": "clanguml::t00071::CC", + "display_name": "CC", "id": "1911193033649971391", "is_abstract": false, "is_nested": false, @@ -354,7 +354,7 @@ class E { }; "ccc1", "ccc2" ], - "display_name": "clanguml::t00071::detail::CCC", + "display_name": "detail::CCC", "id": "931278702894205804", "is_nested": false, "module": { @@ -377,7 +377,7 @@ class E { }; }, { "bases": [], - "display_name": "clanguml::t00071::A", + "display_name": "A", "id": "2210005074053139118", "is_abstract": false, "is_nested": false, @@ -447,7 +447,7 @@ class E { }; }, { "bases": [], - "display_name": "clanguml::t00071::R", + "display_name": "R", "id": "1629943620359873327", "is_abstract": false, "is_nested": false, @@ -506,6 +506,7 @@ class E { }; } ], "name": "t00071_class", + "package_type": "module", "relationships": [ { "access": "private", @@ -529,6 +530,7 @@ class E { }; "type": "association" } ], + "using_module": "t00071", "using_namespace": "clanguml::t00071" } ``` diff --git a/docs/test_cases/t00071_class.svg b/docs/test_cases/t00071_class.svg index e6978d13..9437afb6 100644 --- a/docs/test_cases/t00071_class.svg +++ b/docs/test_cases/t00071_class.svg @@ -1,204 +1,174 @@ - + + + + + + + - - - - app - - - - - lib1 - - - - - mod1 - - - - - mod2 - - - - - lib2 - - - - - - - A - - - - - - - get() : int - - - - - - - - a : int - - + + + app + + + lib1 + + + mod1 + + + mod2 + + + lib2 + + + + + A + - - - - - - B - - - + + + - - - - - - BB - - T - - - - - - - - t : T - - + + get() : int - - - - - - detail::BBB - - bbb1 - bbb2 - - + + + + - - - - - - D - - - + + a : int - - - - - - E - - - + + + + + B + + - - - - - - C - - - + + + + + BB + + T + + - - - - - - CC - - T - - - - - - - - t : T - - + + + - - - - - - detail::CCC - - ccc1 - ccc2 - - + + t : T - - - - - - R - - - - - - - - a : A * - - - - - - - b : B * - - - - - - - c : C * - - + + + + + detail::BBB + + bbb1 + bbb2 + - - - - -a - - - - - -b - - - - - -c - + + + + + D + + + + + + + + E + + + + + + + + C + + + + + + + + CC + + T + + + + + + + + + t : T + + + + + + detail::CCC + + ccc1 + ccc2 + + + + + + + R + + + + + + + + + a : A * + + + + + + + b : B * + + + + + + + c : C * + + + + -a + + + -b + + + -c diff --git a/docs/test_cases/t00071_class_mermaid.svg b/docs/test_cases/t00071_class_mermaid.svg index 1197683a..b93a0674 100644 --- a/docs/test_cases/t00071_class_mermaid.svg +++ b/docs/test_cases/t00071_class_mermaid.svg @@ -1,66 +1,61 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - - - + + + - +
@@ -95,7 +90,7 @@ - + @@ -114,7 +109,7 @@ - + @@ -138,7 +133,7 @@ - + @@ -167,7 +162,7 @@ - + @@ -186,7 +181,7 @@ - + @@ -205,7 +200,7 @@ - + @@ -224,7 +219,7 @@ - + @@ -248,7 +243,7 @@ - + @@ -277,11 +272,11 @@ - + - - - + + +
@@ -293,20 +288,20 @@ A
- +
-a : int
- +
- -get() : : int + -get() : int
- + @@ -324,17 +319,17 @@
- -a : A + -a : A
- -b : B + -b : B
- -c : C + -c : C
diff --git a/docs/test_cases/t00072.md b/docs/test_cases/t00072.md new file mode 100644 index 00000000..1e0137d5 --- /dev/null +++ b/docs/test_cases/t00072.md @@ -0,0 +1,448 @@ +# t00072 - Class diagram with C++20 module partitions generated as packages +## Config +```yaml +diagrams: + t00072_class: + type: class + glob: + - t00072.cc + generate_packages: true + package_type: module + include: + modules: + - t00072 + using_module: t00072 + using_namespace: clanguml::t00072 +``` +## Source code +File `tests/t00072/t00072.cc` +```cpp +import t00072.app; + +namespace clanguml { +namespace t00072 { +} +} +``` +File `tests/t00072/src/lib1mod2.cppm` +```cpp +export module t00072.app:lib1.mod2; + +export namespace clanguml::t00072 { +class E { }; +} +``` +File `tests/t00072/src/t00072_mod.cppm` +```cpp +export module t00072.app; +export import :lib1; +export import :lib1.mod1; +export import :lib1.mod2; +export import :lib2; + +export namespace clanguml::t00072 { +class A { + int get() { return a; } + + int a; +}; +} +``` +File `tests/t00072/src/lib2.cppm` +```cpp +export module t00072.app:lib2; + +export namespace clanguml::t00072 { +class C { }; + +template class CC { + T t; +}; + +namespace detail { +enum class CCC { ccc1, ccc2 }; +} +} +``` +File `tests/t00072/src/lib1.cppm` +```cpp +export module t00072.app:lib1; + +export namespace clanguml::t00072 { +class B { }; + +template class BB { + T t; +}; + +namespace detail { +enum class BBB { bbb1, bbb2 }; +} // namespace detail +} +``` +File `tests/t00072/src/lib1mod1.cppm` +```cpp +export module t00072.app:lib1.mod1; + +export namespace clanguml::t00072 { +class D { }; +} +``` +## Generated PlantUML diagrams +![t00072_class](./t00072_class.svg "Class diagram with C++20 module partitions generated as packages") +## Generated Mermaid diagrams +![t00072_class](./t00072_class_mermaid.svg "Class diagram with C++20 module partitions generated as packages") +## Generated JSON models +```json +{ + "diagram_type": "class", + "elements": [ + { + "display_name": "app", + "elements": [ + { + "display_name": ":lib1", + "elements": [ + { + "bases": [], + "display_name": "B", + "id": "1450150421445257774", + "is_abstract": false, + "is_nested": false, + "is_struct": false, + "is_template": false, + "is_union": false, + "members": [], + "methods": [], + "module": { + "is_private": false, + "name": "t00072.app:lib1" + }, + "name": "B", + "namespace": "clanguml::t00072", + "source_location": { + "column": 7, + "file": "src/lib1.cppm", + "line": 4, + "translation_unit": "t00072.cc" + }, + "template_parameters": [], + "type": "class" + }, + { + "bases": [], + "display_name": "BB", + "id": "744925471008373109", + "is_abstract": false, + "is_nested": false, + "is_struct": false, + "is_template": true, + "is_union": false, + "members": [ + { + "access": "private", + "is_static": false, + "name": "t", + "source_location": { + "column": 7, + "file": "src/lib1.cppm", + "line": 7, + "translation_unit": "t00072.cc" + }, + "type": "T" + } + ], + "methods": [], + "module": { + "is_private": false, + "name": "t00072.app:lib1" + }, + "name": "BB", + "namespace": "clanguml::t00072", + "source_location": { + "column": 29, + "file": "src/lib1.cppm", + "line": 6, + "translation_unit": "t00072.cc" + }, + "template_parameters": [ + { + "is_variadic": false, + "kind": "template_type", + "name": "T", + "template_parameters": [] + } + ], + "type": "class" + }, + { + "constants": [ + "bbb1", + "bbb2" + ], + "display_name": "detail::BBB", + "id": "610293402618118513", + "is_nested": false, + "module": { + "is_private": false, + "name": "t00072.app:lib1" + }, + "name": "BBB", + "namespace": "clanguml::t00072::detail", + "source_location": { + "column": 12, + "file": "src/lib1.cppm", + "line": 11, + "translation_unit": "t00072.cc" + }, + "type": "enum" + }, + { + "display_name": "mod1", + "elements": [ + { + "bases": [], + "display_name": "D", + "id": "516204432765266678", + "is_abstract": false, + "is_nested": false, + "is_struct": false, + "is_template": false, + "is_union": false, + "members": [], + "methods": [], + "module": { + "is_private": false, + "name": "t00072.app:lib1.mod1" + }, + "name": "D", + "namespace": "clanguml::t00072", + "source_location": { + "column": 7, + "file": "src/lib1mod1.cppm", + "line": 4, + "translation_unit": "t00072.cc" + }, + "template_parameters": [], + "type": "class" + } + ], + "name": "mod1", + "type": "module" + }, + { + "display_name": "mod2", + "elements": [ + { + "bases": [], + "display_name": "E", + "id": "347204883768272660", + "is_abstract": false, + "is_nested": false, + "is_struct": false, + "is_template": false, + "is_union": false, + "members": [], + "methods": [], + "module": { + "is_private": false, + "name": "t00072.app:lib1.mod2" + }, + "name": "E", + "namespace": "clanguml::t00072", + "source_location": { + "column": 7, + "file": "src/lib1mod2.cppm", + "line": 4, + "translation_unit": "t00072.cc" + }, + "template_parameters": [], + "type": "class" + } + ], + "name": "mod2", + "type": "module" + } + ], + "name": ":lib1", + "type": "module" + }, + { + "display_name": ":lib2", + "elements": [ + { + "bases": [], + "display_name": "C", + "id": "1144612141363797057", + "is_abstract": false, + "is_nested": false, + "is_struct": false, + "is_template": false, + "is_union": false, + "members": [], + "methods": [], + "module": { + "is_private": false, + "name": "t00072.app:lib2" + }, + "name": "C", + "namespace": "clanguml::t00072", + "source_location": { + "column": 7, + "file": "src/lib2.cppm", + "line": 4, + "translation_unit": "t00072.cc" + }, + "template_parameters": [], + "type": "class" + }, + { + "bases": [], + "display_name": "CC", + "id": "1472938318775327089", + "is_abstract": false, + "is_nested": false, + "is_struct": false, + "is_template": true, + "is_union": false, + "members": [ + { + "access": "private", + "is_static": false, + "name": "t", + "source_location": { + "column": 7, + "file": "src/lib2.cppm", + "line": 7, + "translation_unit": "t00072.cc" + }, + "type": "T" + } + ], + "methods": [], + "module": { + "is_private": false, + "name": "t00072.app:lib2" + }, + "name": "CC", + "namespace": "clanguml::t00072", + "source_location": { + "column": 29, + "file": "src/lib2.cppm", + "line": 6, + "translation_unit": "t00072.cc" + }, + "template_parameters": [ + { + "is_variadic": false, + "kind": "template_type", + "name": "T", + "template_parameters": [] + } + ], + "type": "class" + }, + { + "constants": [ + "ccc1", + "ccc2" + ], + "display_name": "detail::CCC", + "id": "448885573685763285", + "is_nested": false, + "module": { + "is_private": false, + "name": "t00072.app:lib2" + }, + "name": "CCC", + "namespace": "clanguml::t00072::detail", + "source_location": { + "column": 12, + "file": "src/lib2.cppm", + "line": 11, + "translation_unit": "t00072.cc" + }, + "type": "enum" + } + ], + "name": ":lib2", + "type": "module" + }, + { + "bases": [], + "display_name": "A", + "id": "1552096180171121044", + "is_abstract": false, + "is_nested": false, + "is_struct": false, + "is_template": false, + "is_union": false, + "members": [ + { + "access": "private", + "is_static": false, + "name": "a", + "source_location": { + "column": 9, + "file": "src/t00072_mod.cppm", + "line": 11, + "translation_unit": "t00072.cc" + }, + "type": "int" + } + ], + "methods": [ + { + "access": "private", + "is_const": false, + "is_consteval": false, + "is_constexpr": false, + "is_constructor": false, + "is_copy_assignment": false, + "is_coroutine": false, + "is_defaulted": false, + "is_deleted": false, + "is_move_assignment": false, + "is_noexcept": false, + "is_operator": false, + "is_pure_virtual": false, + "is_static": false, + "is_virtual": false, + "name": "get", + "parameters": [], + "source_location": { + "column": 9, + "file": "src/t00072_mod.cppm", + "line": 9, + "translation_unit": "t00072.cc" + }, + "type": "int" + } + ], + "module": { + "is_private": false, + "name": "t00072.app" + }, + "name": "A", + "namespace": "clanguml::t00072", + "source_location": { + "column": 7, + "file": "src/t00072_mod.cppm", + "line": 8, + "translation_unit": "t00072.cc" + }, + "template_parameters": [], + "type": "class" + } + ], + "name": "app", + "type": "module" + } + ], + "name": "t00072_class", + "package_type": "module", + "relationships": [], + "using_module": "t00072", + "using_namespace": "clanguml::t00072" +} +``` diff --git a/docs/test_cases/t00072_class.svg b/docs/test_cases/t00072_class.svg new file mode 100644 index 00000000..40154dc9 --- /dev/null +++ b/docs/test_cases/t00072_class.svg @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + app + + + :lib1 + + + mod1 + + + mod2 + + + :lib2 + + + + + A + + + + + + + + get() : int + + + + + + + + a : int + + + + + + B + + + + + + + + BB + + T + + + + + + + + + t : T + + + + + + detail::BBB + + bbb1 + bbb2 + + + + + + + D + + + + + + + + E + + + + + + + + C + + + + + + + + CC + + T + + + + + + + + + t : T + + + + + + detail::CCC + + ccc1 + ccc2 + + + + diff --git a/docs/test_cases/t00072_class_mermaid.svg b/docs/test_cases/t00072_class_mermaid.svg new file mode 100644 index 00000000..bf3d312e --- /dev/null +++ b/docs/test_cases/t00072_class_mermaid.svg @@ -0,0 +1,269 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + +
+ B +
+ + + + + + + + + + + +
+ +
+ + +
+ BB<T> +
+ + +
+ -t : T +
+ + + + + + + + + + + +
+ «enumeration» +
+ + +
+ detail::BBB +
+ + +
+ bbb1 +
+ + +
+ bbb2 +
+ + + + + + + + + + + +
+ +
+ + +
+ D +
+ + + + + + + + + + + +
+ +
+ + +
+ E +
+ + + + + + + + + + + +
+ +
+ + +
+ C +
+ + + + + + + + + + + +
+ +
+ + +
+ CC<T> +
+ + +
+ -t : T +
+ + + + + + + + + + + +
+ «enumeration» +
+ + +
+ detail::CCC +
+ + +
+ ccc1 +
+ + +
+ ccc2 +
+ + + + + + + + + + + +
+ +
+ + +
+ A +
+ + +
+ -a : int +
+ + +
+ -get() : int +
+ + + + + + + + diff --git a/docs/test_cases/t20001.md b/docs/test_cases/t20001.md index c6b2fc47..94e14048 100644 --- a/docs/test_cases/t20001.md +++ b/docs/test_cases/t20001.md @@ -119,8 +119,10 @@ int tmain() "name": "t20001_sequence", "participants": [ { + "display_name": "tmain()", "id": "622672604730036140", - "name": "clanguml::t20001::tmain()", + "name": "tmain", + "namespace": "clanguml::t20001", "source_location": { "column": 5, "file": "t20001.cc", @@ -130,8 +132,64 @@ int tmain() "type": "function" }, { + "activities": [ + { + "display_name": "A()", + "id": "275353461034438145", + "name": "A", + "namespace": "", + "source_location": { + "column": 5, + "file": "t20001.cc", + "line": 15, + "translation_unit": "t20001.cc" + }, + "type": "method" + }, + { + "display_name": "add(int,int)", + "id": "1131549932713395402", + "name": "add", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20001.cc", + "line": 17, + "translation_unit": "t20001.cc" + }, + "type": "method" + }, + { + "display_name": "add3(int,int,int)", + "id": "2090436635449419593", + "name": "add3", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20001.cc", + "line": 19, + "translation_unit": "t20001.cc" + }, + "type": "method" + }, + { + "display_name": "log_result(int)", + "id": "1205947631808952097", + "name": "log_result", + "namespace": "", + "source_location": { + "column": 17, + "file": "t20001.cc", + "line": 30, + "translation_unit": "t20001.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "1771943546649183134", - "name": "clanguml::t20001::A", + "name": "A", + "namespace": "clanguml::t20001", "source_location": { "column": 7, "file": "t20001.cc", @@ -141,8 +199,38 @@ int tmain() "type": "class" }, { + "activities": [ + { + "display_name": "B(A &)", + "id": "2235477658795500000", + "name": "B", + "namespace": "", + "source_location": { + "column": 5, + "file": "t20001.cc", + "line": 38, + "translation_unit": "t20001.cc" + }, + "type": "method" + }, + { + "display_name": "wrap_add3(int,int,int)", + "id": "642550151323208936", + "name": "wrap_add3", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20001.cc", + "line": 50, + "translation_unit": "t20001.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "272433898507800600", - "name": "clanguml::t20001::B", + "name": "B", + "namespace": "clanguml::t20001", "source_location": { "column": 7, "file": "t20001.cc", @@ -158,9 +246,7 @@ int tmain() { "from": { "activity_id": "622672604730036140", - "activity_name": "clanguml::t20001::tmain()", - "participant_id": "622672604730036140", - "participant_name": "clanguml::t20001::tmain()" + "participant_id": "622672604730036140" }, "name": "A()", "return_type": "void", @@ -173,7 +259,6 @@ int tmain() }, "to": { "activity_id": "275353461034438145", - "activity_name": "clanguml::t20001::A::A()", "participant_id": "1771943546649183134" }, "type": "message" @@ -181,9 +266,7 @@ int tmain() { "from": { "activity_id": "622672604730036140", - "activity_name": "clanguml::t20001::tmain()", - "participant_id": "622672604730036140", - "participant_name": "clanguml::t20001::tmain()" + "participant_id": "622672604730036140" }, "name": "B(A &)", "return_type": "void", @@ -196,7 +279,6 @@ int tmain() }, "to": { "activity_id": "2235477658795500000", - "activity_name": "clanguml::t20001::B::B(A &)", "participant_id": "272433898507800600" }, "type": "message" @@ -205,9 +287,7 @@ int tmain() "comment": "\\uml{note Just add 2 numbers}", "from": { "activity_id": "622672604730036140", - "activity_name": "clanguml::t20001::tmain()", - "participant_id": "622672604730036140", - "participant_name": "clanguml::t20001::tmain()" + "participant_id": "622672604730036140" }, "name": "add(int,int)", "return_type": "int", @@ -220,7 +300,6 @@ int tmain() }, "to": { "activity_id": "1131549932713395402", - "activity_name": "clanguml::t20001::A::add(int,int)", "participant_id": "1771943546649183134" }, "type": "message" @@ -229,9 +308,7 @@ int tmain() "comment": "\\uml{note[] And now add another 2}", "from": { "activity_id": "622672604730036140", - "activity_name": "clanguml::t20001::tmain()", - "participant_id": "622672604730036140", - "participant_name": "clanguml::t20001::tmain()" + "participant_id": "622672604730036140" }, "name": "wrap_add3(int,int,int)", "return_type": "int", @@ -244,7 +321,6 @@ int tmain() }, "to": { "activity_id": "642550151323208936", - "activity_name": "clanguml::t20001::B::wrap_add3(int,int,int)", "participant_id": "272433898507800600" }, "type": "message" @@ -252,7 +328,6 @@ int tmain() { "from": { "activity_id": "642550151323208936", - "activity_name": "clanguml::t20001::B::wrap_add3(int,int,int)", "participant_id": "272433898507800600" }, "name": "add3(int,int,int)", @@ -266,7 +341,6 @@ int tmain() }, "to": { "activity_id": "2090436635449419593", - "activity_name": "clanguml::t20001::A::add3(int,int,int)", "participant_id": "1771943546649183134" }, "type": "message" @@ -274,7 +348,6 @@ int tmain() { "from": { "activity_id": "2090436635449419593", - "activity_name": "clanguml::t20001::A::add3(int,int,int)", "participant_id": "1771943546649183134" }, "name": "add(int,int)", @@ -288,7 +361,6 @@ int tmain() }, "to": { "activity_id": "1131549932713395402", - "activity_name": "clanguml::t20001::A::add(int,int)", "participant_id": "1771943546649183134" }, "type": "message" @@ -296,7 +368,6 @@ int tmain() { "from": { "activity_id": "2090436635449419593", - "activity_name": "clanguml::t20001::A::add3(int,int,int)", "participant_id": "1771943546649183134" }, "name": "log_result(int)", @@ -310,7 +381,6 @@ int tmain() }, "to": { "activity_id": "1205947631808952097", - "activity_name": "clanguml::t20001::A::log_result(int)", "participant_id": "1771943546649183134" }, "type": "message" @@ -318,7 +388,6 @@ int tmain() { "from": { "activity_id": "642550151323208936", - "activity_name": "clanguml::t20001::B::wrap_add3(int,int,int)", "participant_id": "272433898507800600" }, "name": "log_result(int)", @@ -332,7 +401,6 @@ int tmain() }, "to": { "activity_id": "1205947631808952097", - "activity_name": "clanguml::t20001::A::log_result(int)", "participant_id": "1771943546649183134" }, "type": "message" diff --git a/docs/test_cases/t20001_sequence.svg b/docs/test_cases/t20001_sequence.svg index 3537b01e..2afc4173 100644 --- a/docs/test_cases/t20001_sequence.svg +++ b/docs/test_cases/t20001_sequence.svg @@ -1,110 +1,116 @@ - + + + + + + + - Basic sequence diagram example - - - - - - - - - - - - - - - tmain() - - tmain() + Basic sequence diagram example + + + + + + + + + + + + + + + tmain() + + tmain() - - - A - - A + + + A + + A - - - B - - B + + + B + + B - - - - - - - - - - - - - A() + + + + + + + + + + + + + A() - - - - B(A &) + + + + B(A &) - - - Just add 2 numbers - - - - add(int,int) + + + Just add 2 numbers + + + + add(int,int) - - - - - And now add another 2 - - - - wrap_add3(int,int,int) + + + + + And now add another 2 + + + + wrap_add3(int,int,int) - - - - add3(int,int,int) + + + + add3(int,int,int) - - - - - - add(int,int) + + + + + + add(int,int) - - - - - - - - - - log_result(int) + + + + + + + + + + log_result(int) - - - - - - log_result(int) + + + + + + log_result(int) - - - - - Main test function + + + + + Main test function diff --git a/docs/test_cases/t20001_sequence_mermaid.svg b/docs/test_cases/t20001_sequence_mermaid.svg index ef11462d..51e39579 100644 --- a/docs/test_cases/t20001_sequence_mermaid.svg +++ b/docs/test_cases/t20001_sequence_mermaid.svg @@ -1,4 +1,5 @@ - + + Basic sequence diagram example @@ -63,17 +64,17 @@ - + - + - + @@ -127,29 +128,29 @@ Main test function - A() - - B(A &) - - add(int,int) - - ​ - - wrap_add3(int,int,int) - - add3(int,int,int) - + A() + + B(A &) + + add(int,int) + + ​ + + wrap_add3(int,int,int) + + add3(int,int,int) + add(int,int) ​ log_result(int) - ​ - - log_result(int) - - ​ - + ​ + + log_result(int) + + ​ + Basic sequence diagram example diff --git a/docs/test_cases/t20002.md b/docs/test_cases/t20002.md index c4176911..1c2908c0 100644 --- a/docs/test_cases/t20002.md +++ b/docs/test_cases/t20002.md @@ -46,8 +46,10 @@ void m1() { m2(); } "name": "t20002_sequence", "participants": [ { + "display_name": "m1()", "id": "1619421429271064154", - "name": "clanguml::t20002::m1()", + "name": "m1", + "namespace": "clanguml::t20002", "source_location": { "column": 6, "file": "t20002.cc", @@ -57,8 +59,10 @@ void m1() { m2(); } "type": "function" }, { + "display_name": "m2()", "id": "1575240232156112674", - "name": "clanguml::t20002::m2()", + "name": "m2", + "namespace": "clanguml::t20002", "source_location": { "column": 6, "file": "t20002.cc", @@ -68,8 +72,10 @@ void m1() { m2(); } "type": "function" }, { + "display_name": "m3()", "id": "1838809176089209580", - "name": "clanguml::t20002::m3()", + "name": "m3", + "namespace": "clanguml::t20002", "source_location": { "column": 6, "file": "t20002.cc", @@ -79,8 +85,10 @@ void m1() { m2(); } "type": "function" }, { + "display_name": "m4()", "id": "63715062711218534", - "name": "clanguml::t20002::m4()", + "name": "m4", + "namespace": "clanguml::t20002", "source_location": { "column": 6, "file": "t20002.cc", @@ -96,9 +104,7 @@ void m1() { m2(); } { "from": { "activity_id": "1619421429271064154", - "activity_name": "clanguml::t20002::m1()", - "participant_id": "1619421429271064154", - "participant_name": "clanguml::t20002::m1()" + "participant_id": "1619421429271064154" }, "name": "", "return_type": "void", @@ -111,7 +117,6 @@ void m1() { m2(); } }, "to": { "activity_id": "1575240232156112674", - "activity_name": "clanguml::t20002::m2()", "participant_id": "1575240232156112674" }, "type": "message" @@ -119,9 +124,7 @@ void m1() { m2(); } { "from": { "activity_id": "1575240232156112674", - "activity_name": "clanguml::t20002::m2()", - "participant_id": "1575240232156112674", - "participant_name": "clanguml::t20002::m2()" + "participant_id": "1575240232156112674" }, "name": "", "return_type": "void", @@ -134,7 +137,6 @@ void m1() { m2(); } }, "to": { "activity_id": "1838809176089209580", - "activity_name": "clanguml::t20002::m3()", "participant_id": "1838809176089209580" }, "type": "message" @@ -142,9 +144,7 @@ void m1() { m2(); } { "from": { "activity_id": "1838809176089209580", - "activity_name": "clanguml::t20002::m3()", - "participant_id": "1838809176089209580", - "participant_name": "clanguml::t20002::m3()" + "participant_id": "1838809176089209580" }, "name": "", "return_type": "void", @@ -157,7 +157,6 @@ void m1() { m2(); } }, "to": { "activity_id": "63715062711218534", - "activity_name": "clanguml::t20002::m4()", "participant_id": "63715062711218534" }, "type": "message" diff --git a/docs/test_cases/t20002_sequence.svg b/docs/test_cases/t20002_sequence.svg index 4ce8e8c6..8d8ea9ab 100644 --- a/docs/test_cases/t20002_sequence.svg +++ b/docs/test_cases/t20002_sequence.svg @@ -1,55 +1,61 @@ - + + + + + + + - - - - - - - - - - - m1() - - m1() + + + + + + + + + + + m1() + + m1() - - - m2() - - m2() + + + m2() + + m2() - - - m3() - - m3() + + + m3() + + m3() - - - m4() - - m4() + + + m4() + + m4() - - - - - - - + + + + + + + - - - + + + - - - + + + diff --git a/docs/test_cases/t20002_sequence_mermaid.svg b/docs/test_cases/t20002_sequence_mermaid.svg index 53f2199c..856d0a45 100644 --- a/docs/test_cases/t20002_sequence_mermaid.svg +++ b/docs/test_cases/t20002_sequence_mermaid.svg @@ -78,17 +78,17 @@ - + - + - + @@ -109,10 +109,10 @@ - ​ - - ​ - - ​ - + ​ + + ​ + + ​ + diff --git a/docs/test_cases/t20003.md b/docs/test_cases/t20003.md index 92d17d1c..a8383069 100644 --- a/docs/test_cases/t20003.md +++ b/docs/test_cases/t20003.md @@ -42,8 +42,10 @@ template void m1(T p) { m2(p); } "name": "t20003_sequence", "participants": [ { + "display_name": "m1(T)", "id": "469205740799240869", - "name": "clanguml::t20003::m1(T)", + "name": "m1", + "namespace": "clanguml::t20003", "source_location": { "column": 28, "file": "t20003.cc", @@ -53,8 +55,10 @@ template void m1(T p) { m2(p); } "type": "function_template" }, { + "display_name": "m2(T)", "id": "1502957449367040488", - "name": "clanguml::t20003::m2(T)", + "name": "m2", + "namespace": "clanguml::t20003", "source_location": { "column": 28, "file": "t20003.cc", @@ -64,8 +68,10 @@ template void m1(T p) { m2(p); } "type": "function_template" }, { + "display_name": "m3(T)", "id": "613477682313507585", - "name": "clanguml::t20003::m3(T)", + "name": "m3", + "namespace": "clanguml::t20003", "source_location": { "column": 28, "file": "t20003.cc", @@ -75,8 +81,10 @@ template void m1(T p) { m2(p); } "type": "function_template" }, { + "display_name": "m4(T)", "id": "619960023608507925", - "name": "clanguml::t20003::m4(T)", + "name": "m4", + "namespace": "clanguml::t20003", "source_location": { "column": 28, "file": "t20003.cc", @@ -92,9 +100,7 @@ template void m1(T p) { m2(p); } { "from": { "activity_id": "469205740799240869", - "activity_name": "clanguml::t20003::m1(T)", - "participant_id": "469205740799240869", - "participant_name": "clanguml::t20003::m1(T)" + "participant_id": "469205740799240869" }, "name": "", "return_type": "void", @@ -107,7 +113,6 @@ template void m1(T p) { m2(p); } }, "to": { "activity_id": "1502957449367040488", - "activity_name": "clanguml::t20003::m2(T)", "participant_id": "1502957449367040488" }, "type": "message" @@ -115,9 +120,7 @@ template void m1(T p) { m2(p); } { "from": { "activity_id": "1502957449367040488", - "activity_name": "clanguml::t20003::m2(T)", - "participant_id": "1502957449367040488", - "participant_name": "clanguml::t20003::m2(T)" + "participant_id": "1502957449367040488" }, "name": "", "return_type": "void", @@ -130,7 +133,6 @@ template void m1(T p) { m2(p); } }, "to": { "activity_id": "613477682313507585", - "activity_name": "clanguml::t20003::m3(T)", "participant_id": "613477682313507585" }, "type": "message" @@ -138,9 +140,7 @@ template void m1(T p) { m2(p); } { "from": { "activity_id": "613477682313507585", - "activity_name": "clanguml::t20003::m3(T)", - "participant_id": "613477682313507585", - "participant_name": "clanguml::t20003::m3(T)" + "participant_id": "613477682313507585" }, "name": "", "return_type": "void", @@ -153,7 +153,6 @@ template void m1(T p) { m2(p); } }, "to": { "activity_id": "619960023608507925", - "activity_name": "clanguml::t20003::m4(T)", "participant_id": "619960023608507925" }, "type": "message" diff --git a/docs/test_cases/t20003_sequence.svg b/docs/test_cases/t20003_sequence.svg index 302a670e..0ac9f853 100644 --- a/docs/test_cases/t20003_sequence.svg +++ b/docs/test_cases/t20003_sequence.svg @@ -1,55 +1,61 @@ - + + + + + + + - - - - - - - - - - - m1<T>(T) - - m1<T>(T) + + + + + + + + + + + m1<T>(T) + + m1<T>(T) - - - m2<T>(T) - - m2<T>(T) + + + m2<T>(T) + + m2<T>(T) - - - m3<T>(T) - - m3<T>(T) + + + m3<T>(T) + + m3<T>(T) - - - m4<T>(T) - - m4<T>(T) + + + m4<T>(T) + + m4<T>(T) - - - - - - - + + + + + + + - - - + + + - - - + + + diff --git a/docs/test_cases/t20003_sequence_mermaid.svg b/docs/test_cases/t20003_sequence_mermaid.svg index 1da4bead..6541cbff 100644 --- a/docs/test_cases/t20003_sequence_mermaid.svg +++ b/docs/test_cases/t20003_sequence_mermaid.svg @@ -78,17 +78,17 @@ - + - + - + @@ -109,10 +109,10 @@ - ​ - - ​ - - ​ - + ​ + + ​ + + ​ + diff --git a/docs/test_cases/t20004.md b/docs/test_cases/t20004.md index d688fe04..a8c5edd5 100644 --- a/docs/test_cases/t20004.md +++ b/docs/test_cases/t20004.md @@ -78,8 +78,10 @@ int main() "name": "t20004_sequence", "participants": [ { + "display_name": "main()", "id": "2299662004367884401", - "name": "clanguml::t20004::main()", + "name": "main", + "namespace": "clanguml::t20004", "source_location": { "column": 5, "file": "t20004.cc", @@ -89,8 +91,10 @@ int main() "type": "function" }, { + "display_name": "m1(float)", "id": "138925040763435897", - "name": "clanguml::t20004::m1(float)", + "name": "m1", + "namespace": "clanguml::t20004", "source_location": { "column": 36, "file": "t20004.cc", @@ -100,8 +104,10 @@ int main() "type": "function_template" }, { + "display_name": "m1(unsigned long)", "id": "1239083518717603720", - "name": "clanguml::t20004::m1(unsigned long)", + "name": "m1", + "namespace": "clanguml::t20004", "source_location": { "column": 44, "file": "t20004.cc", @@ -111,8 +117,10 @@ int main() "type": "function_template" }, { + "display_name": "m4(unsigned long)", "id": "376599675205498367", - "name": "clanguml::t20004::m4(unsigned long)", + "name": "m4", + "namespace": "clanguml::t20004", "source_location": { "column": 44, "file": "t20004.cc", @@ -122,8 +130,10 @@ int main() "type": "function_template" }, { + "display_name": "m1(std::string)", "id": "1845817984839618223", - "name": "clanguml::t20004::m1(std::string)", + "name": "m1", + "namespace": "clanguml::t20004", "source_location": { "column": 42, "file": "t20004.cc", @@ -133,8 +143,10 @@ int main() "type": "function_template" }, { + "display_name": "m2(std::string)", "id": "1735054254122948614", - "name": "clanguml::t20004::m2(std::string)", + "name": "m2", + "namespace": "clanguml::t20004", "source_location": { "column": 42, "file": "t20004.cc", @@ -144,8 +156,10 @@ int main() "type": "function_template" }, { + "display_name": "m1(int)", "id": "121663532044911922", - "name": "clanguml::t20004::m1(int)", + "name": "m1", + "namespace": "clanguml::t20004", "source_location": { "column": 25, "file": "t20004.cc", @@ -155,8 +169,10 @@ int main() "type": "function_template" }, { + "display_name": "m2(int)", "id": "1475362124497386656", - "name": "clanguml::t20004::m2(int)", + "name": "m2", + "namespace": "clanguml::t20004", "source_location": { "column": 25, "file": "t20004.cc", @@ -166,8 +182,10 @@ int main() "type": "function_template" }, { + "display_name": "m3(int)", "id": "734999226157549914", - "name": "clanguml::t20004::m3(int)", + "name": "m3", + "namespace": "clanguml::t20004", "source_location": { "column": 25, "file": "t20004.cc", @@ -177,8 +195,10 @@ int main() "type": "function_template" }, { + "display_name": "m4(int)", "id": "1006390865908497562", - "name": "clanguml::t20004::m4(int)", + "name": "m4", + "namespace": "clanguml::t20004", "source_location": { "column": 34, "file": "t20004.cc", @@ -194,9 +214,7 @@ int main() { "from": { "activity_id": "2299662004367884401", - "activity_name": "clanguml::t20004::main()", - "participant_id": "2299662004367884401", - "participant_name": "clanguml::t20004::main()" + "participant_id": "2299662004367884401" }, "name": "", "return_type": "", @@ -209,7 +227,6 @@ int main() }, "to": { "activity_id": "138925040763435897", - "activity_name": "clanguml::t20004::m1(float)", "participant_id": "138925040763435897" }, "type": "message" @@ -217,9 +234,7 @@ int main() { "from": { "activity_id": "2299662004367884401", - "activity_name": "clanguml::t20004::main()", - "participant_id": "2299662004367884401", - "participant_name": "clanguml::t20004::main()" + "participant_id": "2299662004367884401" }, "name": "", "return_type": "", @@ -232,7 +247,6 @@ int main() }, "to": { "activity_id": "1239083518717603720", - "activity_name": "clanguml::t20004::m1(unsigned long)", "participant_id": "1239083518717603720" }, "type": "message" @@ -240,9 +254,7 @@ int main() { "from": { "activity_id": "1239083518717603720", - "activity_name": "clanguml::t20004::m1(unsigned long)", - "participant_id": "1239083518717603720", - "participant_name": "clanguml::t20004::m1(unsigned long)" + "participant_id": "1239083518717603720" }, "name": "", "return_type": "", @@ -255,7 +267,6 @@ int main() }, "to": { "activity_id": "376599675205498367", - "activity_name": "clanguml::t20004::m4(unsigned long)", "participant_id": "376599675205498367" }, "type": "message" @@ -263,9 +274,7 @@ int main() { "from": { "activity_id": "2299662004367884401", - "activity_name": "clanguml::t20004::main()", - "participant_id": "2299662004367884401", - "participant_name": "clanguml::t20004::main()" + "participant_id": "2299662004367884401" }, "name": "", "return_type": "", @@ -278,7 +287,6 @@ int main() }, "to": { "activity_id": "1845817984839618223", - "activity_name": "clanguml::t20004::m1(std::string)", "participant_id": "1845817984839618223" }, "type": "message" @@ -286,9 +294,7 @@ int main() { "from": { "activity_id": "1845817984839618223", - "activity_name": "clanguml::t20004::m1(std::string)", - "participant_id": "1845817984839618223", - "participant_name": "clanguml::t20004::m1(std::string)" + "participant_id": "1845817984839618223" }, "name": "", "return_type": "", @@ -301,7 +307,6 @@ int main() }, "to": { "activity_id": "1735054254122948614", - "activity_name": "clanguml::t20004::m2(std::string)", "participant_id": "1735054254122948614" }, "type": "message" @@ -309,9 +314,7 @@ int main() { "from": { "activity_id": "2299662004367884401", - "activity_name": "clanguml::t20004::main()", - "participant_id": "2299662004367884401", - "participant_name": "clanguml::t20004::main()" + "participant_id": "2299662004367884401" }, "name": "", "return_type": "", @@ -324,7 +327,6 @@ int main() }, "to": { "activity_id": "121663532044911922", - "activity_name": "clanguml::t20004::m1(int)", "participant_id": "121663532044911922" }, "type": "message" @@ -332,9 +334,7 @@ int main() { "from": { "activity_id": "121663532044911922", - "activity_name": "clanguml::t20004::m1(int)", - "participant_id": "121663532044911922", - "participant_name": "clanguml::t20004::m1(int)" + "participant_id": "121663532044911922" }, "name": "", "return_type": "", @@ -347,7 +347,6 @@ int main() }, "to": { "activity_id": "1475362124497386656", - "activity_name": "clanguml::t20004::m2(int)", "participant_id": "1475362124497386656" }, "type": "message" @@ -355,9 +354,7 @@ int main() { "from": { "activity_id": "1475362124497386656", - "activity_name": "clanguml::t20004::m2(int)", - "participant_id": "1475362124497386656", - "participant_name": "clanguml::t20004::m2(int)" + "participant_id": "1475362124497386656" }, "name": "", "return_type": "", @@ -370,7 +367,6 @@ int main() }, "to": { "activity_id": "734999226157549914", - "activity_name": "clanguml::t20004::m3(int)", "participant_id": "734999226157549914" }, "type": "message" @@ -378,9 +374,7 @@ int main() { "from": { "activity_id": "734999226157549914", - "activity_name": "clanguml::t20004::m3(int)", - "participant_id": "734999226157549914", - "participant_name": "clanguml::t20004::m3(int)" + "participant_id": "734999226157549914" }, "name": "", "return_type": "", @@ -393,7 +387,6 @@ int main() }, "to": { "activity_id": "1006390865908497562", - "activity_name": "clanguml::t20004::m4(int)", "participant_id": "1006390865908497562" }, "type": "message" diff --git a/docs/test_cases/t20004_sequence.svg b/docs/test_cases/t20004_sequence.svg index e412a4a4..f43c2ef4 100644 --- a/docs/test_cases/t20004_sequence.svg +++ b/docs/test_cases/t20004_sequence.svg @@ -1,151 +1,157 @@ - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - main() - - main() + + + + + + + + + + + + + + + + + + + + + + + main() + + main() - - - m1<float>(float) - - m1<float>(float) + + + m1<float>(float) + + m1<float>(float) - - - m1<unsigned long>(unsigned long) - - m1<unsigned long>(unsigned long) + + + m1<unsigned long>(unsigned long) + + m1<unsigned long>(unsigned long) - - - m4<unsigned long>(unsigned long) - - m4<unsigned long>(unsigned long) + + + m4<unsigned long>(unsigned long) + + m4<unsigned long>(unsigned long) - - - m1<std::string>(std::string) - - m1<std::string>(std::string) + + + m1<std::string>(std::string) + + m1<std::string>(std::string) - - - m2<std::string>(std::string) - - m2<std::string>(std::string) + + + m2<std::string>(std::string) + + m2<std::string>(std::string) - - - m1<int>(int) - - m1<int>(int) + + + m1<int>(int) + + m1<int>(int) - - - m2<int>(int) - - m2<int>(int) + + + m2<int>(int) + + m2<int>(int) - - - m3<int>(int) - - m3<int>(int) + + + m3<int>(int) + + m3<int>(int) - - - m4<int>(int) - - m4<int>(int) + + + m4<int>(int) + + m4<int>(int) - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - + + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + diff --git a/docs/test_cases/t20004_sequence_mermaid.svg b/docs/test_cases/t20004_sequence_mermaid.svg index 65a0309a..20b66b63 100644 --- a/docs/test_cases/t20004_sequence_mermaid.svg +++ b/docs/test_cases/t20004_sequence_mermaid.svg @@ -168,17 +168,17 @@ - + - + - + @@ -217,40 +217,40 @@ - ​ - - ​ - - ​ - - ​ - - ​ - - ​ - - ​ - - ​ - - ​ - - ​ - - ​ - - ​ - - ​ - - ​ - - ​ - - ​ - - ​ - - ​ - + ​ + + ​ + + ​ + + ​ + + ​ + + ​ + + ​ + + ​ + + ​ + + ​ + + ​ + + ​ + + ​ + + ​ + + ​ + + ​ + + ​ + + ​ + diff --git a/docs/test_cases/t20005.md b/docs/test_cases/t20005.md index 28f8a757..daa14c5a 100644 --- a/docs/test_cases/t20005.md +++ b/docs/test_cases/t20005.md @@ -49,8 +49,25 @@ template struct C { "name": "t20005_sequence", "participants": [ { + "activities": [ + { + "display_name": "c(T)", + "id": "578718872965404973", + "name": "c", + "namespace": "", + "source_location": { + "column": 7, + "file": "t20005.cc", + "line": 15, + "translation_unit": "t20005.cc" + }, + "type": "method" + } + ], + "display_name": "C", "id": "365569130532127604", - "name": "clanguml::t20005::C", + "name": "C", + "namespace": "clanguml::t20005", "source_location": { "column": 30, "file": "t20005.cc", @@ -60,8 +77,25 @@ template struct C { "type": "class" }, { + "activities": [ + { + "display_name": "b(T)", + "id": "870466496899932117", + "name": "b", + "namespace": "", + "source_location": { + "column": 7, + "file": "t20005.cc", + "line": 9, + "translation_unit": "t20005.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "666000829532846850", - "name": "clanguml::t20005::B", + "name": "B", + "namespace": "clanguml::t20005", "source_location": { "column": 30, "file": "t20005.cc", @@ -71,8 +105,25 @@ template struct C { "type": "class" }, { + "activities": [ + { + "display_name": "a(T)", + "id": "124853455814403745", + "name": "a", + "namespace": "", + "source_location": { + "column": 7, + "file": "t20005.cc", + "line": 5, + "translation_unit": "t20005.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "1278330455625941185", - "name": "clanguml::t20005::A", + "name": "A", + "namespace": "clanguml::t20005", "source_location": { "column": 30, "file": "t20005.cc", @@ -88,7 +139,6 @@ template struct C { { "from": { "activity_id": "578718872965404973", - "activity_name": "clanguml::t20005::C::c(T)", "participant_id": "365569130532127604" }, "name": "b(T)", @@ -102,7 +152,6 @@ template struct C { }, "to": { "activity_id": "870466496899932117", - "activity_name": "clanguml::t20005::B::b(T)", "participant_id": "666000829532846850" }, "type": "message" @@ -110,7 +159,6 @@ template struct C { { "from": { "activity_id": "870466496899932117", - "activity_name": "clanguml::t20005::B::b(T)", "participant_id": "666000829532846850" }, "name": "a(T)", @@ -124,7 +172,6 @@ template struct C { }, "to": { "activity_id": "124853455814403745", - "activity_name": "clanguml::t20005::A::a(T)", "participant_id": "1278330455625941185" }, "type": "message" diff --git a/docs/test_cases/t20005_sequence.svg b/docs/test_cases/t20005_sequence.svg index b9afa284..89a435f3 100644 --- a/docs/test_cases/t20005_sequence.svg +++ b/docs/test_cases/t20005_sequence.svg @@ -1,53 +1,59 @@ - + + + + + + + - - - - - - - - - C<T> - - C<T> + + + + + + + + + C<T> + + C<T> - - - B<T> - - B<T> + + + B<T> + + B<T> - - - A<T> - - A<T> + + + A<T> + + A<T> - - - - - - c(T) - - - - b(T) + + + + + + c(T) + + + + b(T) - - - - a(T) + + + + a(T) - - - - - - + + + + + + diff --git a/docs/test_cases/t20005_sequence_mermaid.svg b/docs/test_cases/t20005_sequence_mermaid.svg index d0bced3a..63cb6780 100644 --- a/docs/test_cases/t20005_sequence_mermaid.svg +++ b/docs/test_cases/t20005_sequence_mermaid.svg @@ -78,17 +78,17 @@ - + - + - + @@ -106,16 +106,16 @@ - c(T) - - b(T) - - a(T) - - ​ - - ​ - - ​ - + c(T) + + b(T) + + a(T) + + ​ + + ​ + + ​ + diff --git a/docs/test_cases/t20006.md b/docs/test_cases/t20006.md index c3f22f38..afb11868 100644 --- a/docs/test_cases/t20006.md +++ b/docs/test_cases/t20006.md @@ -107,8 +107,10 @@ void tmain() "name": "t20006_sequence", "participants": [ { + "display_name": "tmain()", "id": "363965584448680958", - "name": "clanguml::t20006::tmain()", + "name": "tmain", + "namespace": "clanguml::t20006", "source_location": { "column": 6, "file": "t20006.cc", @@ -118,8 +120,25 @@ void tmain() "type": "function" }, { + "activities": [ + { + "display_name": "b(int)", + "id": "250247217888843587", + "name": "b", + "namespace": "", + "source_location": { + "column": 7, + "file": "t20006.cc", + "line": 12, + "translation_unit": "t20006.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "2197760498261923035", - "name": "clanguml::t20006::B", + "name": "B", + "namespace": "clanguml::t20006", "source_location": { "column": 30, "file": "t20006.cc", @@ -129,8 +148,25 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "a1(int)", + "id": "196390487987395669", + "name": "a1", + "namespace": "", + "source_location": { + "column": 7, + "file": "t20006.cc", + "line": 7, + "translation_unit": "t20006.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "596484796124829039", - "name": "clanguml::t20006::A", + "name": "A", + "namespace": "clanguml::t20006", "source_location": { "column": 30, "file": "t20006.cc", @@ -140,8 +176,25 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "b(std::string)", + "id": "13049632552871157", + "name": "b", + "namespace": "", + "source_location": { + "column": 17, + "file": "t20006.cc", + "line": 17, + "translation_unit": "t20006.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "2102622661983365981", - "name": "clanguml::t20006::B", + "name": "B", + "namespace": "clanguml::t20006", "source_location": { "column": 20, "file": "t20006.cc", @@ -151,8 +204,25 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "a2(std::string)", + "id": "11762588624112907", + "name": "a2", + "namespace": "", + "source_location": { + "column": 7, + "file": "t20006.cc", + "line": 8, + "translation_unit": "t20006.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "413459875415381273", - "name": "clanguml::t20006::A", + "name": "A", + "namespace": "clanguml::t20006", "source_location": { "column": 30, "file": "t20006.cc", @@ -162,8 +232,51 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "BB(AA *)", + "id": "381732876807761480", + "name": "BB", + "namespace": "", + "source_location": { + "column": 5, + "file": "t20006.cc", + "line": 37, + "translation_unit": "t20006.cc" + }, + "type": "method" + }, + { + "display_name": "bb1(int,std::string)", + "id": "1062874005712014125", + "name": "bb1", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20006.cc", + "line": 34, + "translation_unit": "t20006.cc" + }, + "type": "method" + }, + { + "display_name": "bb2(int,std::string)", + "id": "787705189994778234", + "name": "bb2", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20006.cc", + "line": 35, + "translation_unit": "t20006.cc" + }, + "type": "method" + } + ], + "display_name": "BB", "id": "2269742833301555472", - "name": "clanguml::t20006::BB", + "name": "BB", + "namespace": "clanguml::t20006", "source_location": { "column": 30, "file": "t20006.cc", @@ -173,8 +286,51 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "BB(AA &)", + "id": "1051013203072323842", + "name": "BB", + "namespace": "", + "source_location": { + "column": 5, + "file": "t20006.cc", + "line": 49, + "translation_unit": "t20006.cc" + }, + "type": "method" + }, + { + "display_name": "bb1(int,float)", + "id": "1463188845572485713", + "name": "bb1", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20006.cc", + "line": 46, + "translation_unit": "t20006.cc" + }, + "type": "method" + }, + { + "display_name": "bb2(int,float)", + "id": "732362671329401903", + "name": "bb2", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20006.cc", + "line": 47, + "translation_unit": "t20006.cc" + }, + "type": "method" + } + ], + "display_name": "BB", "id": "1743503037360505162", - "name": "clanguml::t20006::BB", + "name": "BB", + "namespace": "clanguml::t20006", "source_location": { "column": 30, "file": "t20006.cc", @@ -184,8 +340,38 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "bb1(int,int)", + "id": "1213865121829347654", + "name": "bb1", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20006.cc", + "line": 27, + "translation_unit": "t20006.cc" + }, + "type": "method" + }, + { + "display_name": "bb2(int,int)", + "id": "361650123916792854", + "name": "bb2", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20006.cc", + "line": 28, + "translation_unit": "t20006.cc" + }, + "type": "method" + } + ], + "display_name": "BB", "id": "264392653889863384", - "name": "clanguml::t20006::BB", + "name": "BB", + "namespace": "clanguml::t20006", "source_location": { "column": 42, "file": "t20006.cc", @@ -195,8 +381,38 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "aa1(int)", + "id": "1235428163990670191", + "name": "aa1", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20006.cc", + "line": 22, + "translation_unit": "t20006.cc" + }, + "type": "method" + }, + { + "display_name": "aa2(int)", + "id": "582097827335267290", + "name": "aa2", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20006.cc", + "line": 23, + "translation_unit": "t20006.cc" + }, + "type": "method" + } + ], + "display_name": "AA", "id": "1903567228894636312", - "name": "clanguml::t20006::AA", + "name": "AA", + "namespace": "clanguml::t20006", "source_location": { "column": 30, "file": "t20006.cc", @@ -212,9 +428,7 @@ void tmain() { "from": { "activity_id": "363965584448680958", - "activity_name": "clanguml::t20006::tmain()", - "participant_id": "363965584448680958", - "participant_name": "clanguml::t20006::tmain()" + "participant_id": "363965584448680958" }, "name": "b(int)", "return_type": "int", @@ -227,7 +441,6 @@ void tmain() }, "to": { "activity_id": "250247217888843587", - "activity_name": "clanguml::t20006::B::b(int)", "participant_id": "2197760498261923035" }, "type": "message" @@ -235,7 +448,6 @@ void tmain() { "from": { "activity_id": "250247217888843587", - "activity_name": "clanguml::t20006::B::b(int)", "participant_id": "2197760498261923035" }, "name": "a1(int)", @@ -249,7 +461,6 @@ void tmain() }, "to": { "activity_id": "196390487987395669", - "activity_name": "clanguml::t20006::A::a1(int)", "participant_id": "596484796124829039" }, "type": "message" @@ -257,9 +468,7 @@ void tmain() { "from": { "activity_id": "363965584448680958", - "activity_name": "clanguml::t20006::tmain()", - "participant_id": "363965584448680958", - "participant_name": "clanguml::t20006::tmain()" + "participant_id": "363965584448680958" }, "name": "b(std::string)", "return_type": "std::string", @@ -272,7 +481,6 @@ void tmain() }, "to": { "activity_id": "13049632552871157", - "activity_name": "clanguml::t20006::B::b(std::string)", "participant_id": "2102622661983365981" }, "type": "message" @@ -280,7 +488,6 @@ void tmain() { "from": { "activity_id": "13049632552871157", - "activity_name": "clanguml::t20006::B::b(std::string)", "participant_id": "2102622661983365981" }, "name": "a2(std::string)", @@ -294,7 +501,6 @@ void tmain() }, "to": { "activity_id": "11762588624112907", - "activity_name": "clanguml::t20006::A::a2(std::string)", "participant_id": "413459875415381273" }, "type": "message" @@ -302,9 +508,7 @@ void tmain() { "from": { "activity_id": "363965584448680958", - "activity_name": "clanguml::t20006::tmain()", - "participant_id": "363965584448680958", - "participant_name": "clanguml::t20006::tmain()" + "participant_id": "363965584448680958" }, "name": "BB(AA *)", "return_type": "void", @@ -317,7 +521,6 @@ void tmain() }, "to": { "activity_id": "381732876807761480", - "activity_name": "clanguml::t20006::BB::BB(AA *)", "participant_id": "2269742833301555472" }, "type": "message" @@ -325,9 +528,7 @@ void tmain() { "from": { "activity_id": "363965584448680958", - "activity_name": "clanguml::t20006::tmain()", - "participant_id": "363965584448680958", - "participant_name": "clanguml::t20006::tmain()" + "participant_id": "363965584448680958" }, "name": "BB(AA &)", "return_type": "void", @@ -340,7 +541,6 @@ void tmain() }, "to": { "activity_id": "1051013203072323842", - "activity_name": "clanguml::t20006::BB::BB(AA &)", "participant_id": "1743503037360505162" }, "type": "message" @@ -348,9 +548,7 @@ void tmain() { "from": { "activity_id": "363965584448680958", - "activity_name": "clanguml::t20006::tmain()", - "participant_id": "363965584448680958", - "participant_name": "clanguml::t20006::tmain()" + "participant_id": "363965584448680958" }, "name": "bb1(int,int)", "return_type": "void", @@ -363,7 +561,6 @@ void tmain() }, "to": { "activity_id": "1213865121829347654", - "activity_name": "clanguml::t20006::BB::bb1(int,int)", "participant_id": "264392653889863384" }, "type": "message" @@ -371,7 +568,6 @@ void tmain() { "from": { "activity_id": "1213865121829347654", - "activity_name": "clanguml::t20006::BB::bb1(int,int)", "participant_id": "264392653889863384" }, "name": "aa1(int)", @@ -385,7 +581,6 @@ void tmain() }, "to": { "activity_id": "1235428163990670191", - "activity_name": "clanguml::t20006::AA::aa1(int)", "participant_id": "1903567228894636312" }, "type": "message" @@ -393,9 +588,7 @@ void tmain() { "from": { "activity_id": "363965584448680958", - "activity_name": "clanguml::t20006::tmain()", - "participant_id": "363965584448680958", - "participant_name": "clanguml::t20006::tmain()" + "participant_id": "363965584448680958" }, "name": "bb2(int,int)", "return_type": "void", @@ -408,7 +601,6 @@ void tmain() }, "to": { "activity_id": "361650123916792854", - "activity_name": "clanguml::t20006::BB::bb2(int,int)", "participant_id": "264392653889863384" }, "type": "message" @@ -416,7 +608,6 @@ void tmain() { "from": { "activity_id": "361650123916792854", - "activity_name": "clanguml::t20006::BB::bb2(int,int)", "participant_id": "264392653889863384" }, "name": "aa2(int)", @@ -430,7 +621,6 @@ void tmain() }, "to": { "activity_id": "582097827335267290", - "activity_name": "clanguml::t20006::AA::aa2(int)", "participant_id": "1903567228894636312" }, "type": "message" @@ -438,9 +628,7 @@ void tmain() { "from": { "activity_id": "363965584448680958", - "activity_name": "clanguml::t20006::tmain()", - "participant_id": "363965584448680958", - "participant_name": "clanguml::t20006::tmain()" + "participant_id": "363965584448680958" }, "name": "bb1(int,std::string)", "return_type": "void", @@ -453,7 +641,6 @@ void tmain() }, "to": { "activity_id": "1062874005712014125", - "activity_name": "clanguml::t20006::BB::bb1(int,std::string)", "participant_id": "2269742833301555472" }, "type": "message" @@ -461,7 +648,6 @@ void tmain() { "from": { "activity_id": "1062874005712014125", - "activity_name": "clanguml::t20006::BB::bb1(int,std::string)", "participant_id": "2269742833301555472" }, "name": "aa2(int)", @@ -475,7 +661,6 @@ void tmain() }, "to": { "activity_id": "582097827335267290", - "activity_name": "clanguml::t20006::AA::aa2(int)", "participant_id": "1903567228894636312" }, "type": "message" @@ -483,9 +668,7 @@ void tmain() { "from": { "activity_id": "363965584448680958", - "activity_name": "clanguml::t20006::tmain()", - "participant_id": "363965584448680958", - "participant_name": "clanguml::t20006::tmain()" + "participant_id": "363965584448680958" }, "name": "bb2(int,std::string)", "return_type": "void", @@ -498,7 +681,6 @@ void tmain() }, "to": { "activity_id": "787705189994778234", - "activity_name": "clanguml::t20006::BB::bb2(int,std::string)", "participant_id": "2269742833301555472" }, "type": "message" @@ -506,7 +688,6 @@ void tmain() { "from": { "activity_id": "787705189994778234", - "activity_name": "clanguml::t20006::BB::bb2(int,std::string)", "participant_id": "2269742833301555472" }, "name": "aa1(int)", @@ -520,7 +701,6 @@ void tmain() }, "to": { "activity_id": "1235428163990670191", - "activity_name": "clanguml::t20006::AA::aa1(int)", "participant_id": "1903567228894636312" }, "type": "message" @@ -528,9 +708,7 @@ void tmain() { "from": { "activity_id": "363965584448680958", - "activity_name": "clanguml::t20006::tmain()", - "participant_id": "363965584448680958", - "participant_name": "clanguml::t20006::tmain()" + "participant_id": "363965584448680958" }, "name": "bb1(int,float)", "return_type": "void", @@ -543,7 +721,6 @@ void tmain() }, "to": { "activity_id": "1463188845572485713", - "activity_name": "clanguml::t20006::BB::bb1(int,float)", "participant_id": "1743503037360505162" }, "type": "message" @@ -551,7 +728,6 @@ void tmain() { "from": { "activity_id": "1463188845572485713", - "activity_name": "clanguml::t20006::BB::bb1(int,float)", "participant_id": "1743503037360505162" }, "name": "bb2(int,float)", @@ -565,7 +741,6 @@ void tmain() }, "to": { "activity_id": "732362671329401903", - "activity_name": "clanguml::t20006::BB::bb2(int,float)", "participant_id": "1743503037360505162" }, "type": "message" @@ -573,7 +748,6 @@ void tmain() { "from": { "activity_id": "732362671329401903", - "activity_name": "clanguml::t20006::BB::bb2(int,float)", "participant_id": "1743503037360505162" }, "name": "aa2(int)", @@ -587,7 +761,6 @@ void tmain() }, "to": { "activity_id": "582097827335267290", - "activity_name": "clanguml::t20006::AA::aa2(int)", "participant_id": "1903567228894636312" }, "type": "message" diff --git a/docs/test_cases/t20006_sequence.svg b/docs/test_cases/t20006_sequence.svg index 7ce2ed72..7c688f8f 100644 --- a/docs/test_cases/t20006_sequence.svg +++ b/docs/test_cases/t20006_sequence.svg @@ -1,201 +1,207 @@ - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - tmain() - - tmain() + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + tmain() + + tmain() - - - B<int> - - B<int> + + + B<int> + + B<int> - - - A<int> - - A<int> + + + A<int> + + A<int> - - - B<std::string> - - B<std::string> + + + B<std::string> + + B<std::string> - - - A<std::string> - - A<std::string> + + + A<std::string> + + A<std::string> - - - BB<int,std::string> - - BB<int,std::string> + + + BB<int,std::string> + + BB<int,std::string> - - - BB<int,float> - - BB<int,float> + + + BB<int,float> + + BB<int,float> - - - BB<int,int> - - BB<int,int> + + + BB<int,int> + + BB<int,int> - - - AA<int> - - AA<int> + + + AA<int> + + AA<int> - - - - - - - - - - - - - - - - - - - - - - b(int) + + + + + + + + + + + + + + + + + + + + + + b(int) - - - - a1(int) + + + + a1(int) - - - - - - - - b(std::string) + + + + + + + + b(std::string) - - - - a2(std::string) + + + + a2(std::string) - - - - - - - - BB(AA<int> *) + + + + + + + + BB(AA<int> *) - - - - BB(AA<int> &) + + + + BB(AA<int> &) - - - - bb1(int,int) + + + + bb1(int,int) - - - - aa1(int) + + + + aa1(int) - - - - bb2(int,int) + + + + bb2(int,int) - - - - aa2(int) + + + + aa2(int) - - - - bb1(int,std::string) + + + + bb1(int,std::string) - - - - aa2(int) + + + + aa2(int) - - - - bb2(int,std::string) + + + + bb2(int,std::string) - - - - aa1(int) + + + + aa1(int) - - - - bb1(int,float) + + + + bb1(int,float) - - - - - - bb2(int,float) + + + + + + bb2(int,float) - - - - aa2(int) + + + + aa2(int) diff --git a/docs/test_cases/t20006_sequence_mermaid.svg b/docs/test_cases/t20006_sequence_mermaid.svg index e291068d..33f9eca7 100644 --- a/docs/test_cases/t20006_sequence_mermaid.svg +++ b/docs/test_cases/t20006_sequence_mermaid.svg @@ -153,17 +153,17 @@ - + - + - + @@ -226,46 +226,46 @@ - b(int) - - a1(int) - - ​ - - ​ - - b(std::string) - - a2(std::string) - - ​ - - ​ - - BB(AA<int> *) - - BB(AA<int> &) - - bb1(int,int) - - aa1(int) - - bb2(int,int) - - aa2(int) - - bb1(int,std::string) - - aa2(int) - - bb2(int,std::string) - - aa1(int) - - bb1(int,float) - + b(int) + + a1(int) + + ​ + + ​ + + b(std::string) + + a2(std::string) + + ​ + + ​ + + BB(AA<int> *) + + BB(AA<int> &) + + bb1(int,int) + + aa1(int) + + bb2(int,int) + + aa2(int) + + bb1(int,std::string) + + aa2(int) + + bb2(int,std::string) + + aa1(int) + + bb1(int,float) + bb2(int,float) - aa2(int) - + aa2(int) + diff --git a/docs/test_cases/t20007.md b/docs/test_cases/t20007.md index ef03fdd1..8b727497 100644 --- a/docs/test_cases/t20007.md +++ b/docs/test_cases/t20007.md @@ -53,8 +53,10 @@ void tmain() "name": "t20007_sequence", "participants": [ { + "display_name": "tmain()", "id": "622662006747239840", - "name": "clanguml::t20007::tmain()", + "name": "tmain", + "namespace": "clanguml::t20007", "source_location": { "column": 6, "file": "t20007.cc", @@ -64,8 +66,25 @@ void tmain() "type": "function" }, { + "activities": [ + { + "display_name": "add(int &&,int &&)", + "id": "438133719207269065", + "name": "add", + "namespace": "", + "source_location": { + "column": 11, + "file": "t20007.cc", + "line": 8, + "translation_unit": "t20007.cc" + }, + "type": "method" + } + ], + "display_name": "Adder", "id": "1742497005509009302", - "name": "clanguml::t20007::Adder", + "name": "Adder", + "namespace": "clanguml::t20007", "source_location": { "column": 52, "file": "t20007.cc", @@ -75,8 +94,25 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "add(int &&,float &&,double &&)", + "id": "9522724767688870", + "name": "add", + "namespace": "", + "source_location": { + "column": 11, + "file": "t20007.cc", + "line": 8, + "translation_unit": "t20007.cc" + }, + "type": "method" + } + ], + "display_name": "Adder", "id": "599640474306956868", - "name": "clanguml::t20007::Adder", + "name": "Adder", + "namespace": "clanguml::t20007", "source_location": { "column": 52, "file": "t20007.cc", @@ -86,8 +122,25 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "add(std::string &&,std::string &&,std::string &&)", + "id": "384866641042941480", + "name": "add", + "namespace": "", + "source_location": { + "column": 11, + "file": "t20007.cc", + "line": 8, + "translation_unit": "t20007.cc" + }, + "type": "method" + } + ], + "display_name": "Adder", "id": "228191787514523926", - "name": "clanguml::t20007::Adder", + "name": "Adder", + "namespace": "clanguml::t20007", "source_location": { "column": 52, "file": "t20007.cc", @@ -103,9 +156,7 @@ void tmain() { "from": { "activity_id": "622662006747239840", - "activity_name": "clanguml::t20007::tmain()", - "participant_id": "622662006747239840", - "participant_name": "clanguml::t20007::tmain()" + "participant_id": "622662006747239840" }, "name": "add(int &&,int &&)", "return_type": "int", @@ -118,7 +169,6 @@ void tmain() }, "to": { "activity_id": "438133719207269065", - "activity_name": "clanguml::t20007::Adder::add(int &&,int &&)", "participant_id": "1742497005509009302" }, "type": "message" @@ -126,9 +176,7 @@ void tmain() { "from": { "activity_id": "622662006747239840", - "activity_name": "clanguml::t20007::tmain()", - "participant_id": "622662006747239840", - "participant_name": "clanguml::t20007::tmain()" + "participant_id": "622662006747239840" }, "name": "add(int &&,float &&,double &&)", "return_type": "int", @@ -141,7 +189,6 @@ void tmain() }, "to": { "activity_id": "9522724767688870", - "activity_name": "clanguml::t20007::Adder::add(int &&,float &&,double &&)", "participant_id": "599640474306956868" }, "type": "message" @@ -149,9 +196,7 @@ void tmain() { "from": { "activity_id": "622662006747239840", - "activity_name": "clanguml::t20007::tmain()", - "participant_id": "622662006747239840", - "participant_name": "clanguml::t20007::tmain()" + "participant_id": "622662006747239840" }, "name": "add(std::string &&,std::string &&,std::string &&)", "return_type": "std::basic_string", @@ -164,7 +209,6 @@ void tmain() }, "to": { "activity_id": "384866641042941480", - "activity_name": "clanguml::t20007::Adder::add(std::string &&,std::string &&,std::string &&)", "participant_id": "228191787514523926" }, "type": "message" diff --git a/docs/test_cases/t20007_sequence.svg b/docs/test_cases/t20007_sequence.svg index a823cc7a..ac92f4dc 100644 --- a/docs/test_cases/t20007_sequence.svg +++ b/docs/test_cases/t20007_sequence.svg @@ -1,64 +1,70 @@ - + + + + + + + - - - - - - - - - - - tmain() - - tmain() + + + + + + + + + + + tmain() + + tmain() - - - Adder<int,int> - - Adder<int,int> + + + Adder<int,int> + + Adder<int,int> - - - Adder<int,float,double> - - Adder<int,float,double> + + + Adder<int,float,double> + + Adder<int,float,double> - - - Adder<std::string,std::string,std::string> - - Adder<std::string,std::string,std::string> + + + Adder<std::string,std::string,std::string> + + Adder<std::string,std::string,std::string> - - - - - - - - add(int &&,int &&) + + + + + + + + add(int &&,int &&) - - - - - - add(int &&,float &&,double &&) + + + + + + add(int &&,float &&,double &&) - - - - - - add(std::string &&,std::string &&,std::string &&) + + + + + + add(std::string &&,std::string &&,std::string &&) - - + + diff --git a/docs/test_cases/t20007_sequence_mermaid.svg b/docs/test_cases/t20007_sequence_mermaid.svg index d8e74d36..44578764 100644 --- a/docs/test_cases/t20007_sequence_mermaid.svg +++ b/docs/test_cases/t20007_sequence_mermaid.svg @@ -78,17 +78,17 @@ - + - + - + @@ -109,16 +109,16 @@ - add(int &&,int &&) - - ​ - - add(int &&,float &&,double &&) - - ​ - - add(std::string &&,std::string &&,std::string &&) - - ​ - + add(int &&,int &&) + + ​ + + add(int &&,float &&,double &&) + + ​ + + add(std::string &&,std::string &&,std::string &&) + + ​ + diff --git a/docs/test_cases/t20008.md b/docs/test_cases/t20008.md index 84b5a01a..7db49a43 100644 --- a/docs/test_cases/t20008.md +++ b/docs/test_cases/t20008.md @@ -71,8 +71,10 @@ void tmain() "name": "t20008_sequence", "participants": [ { + "display_name": "tmain()", "id": "1180776240543224244", - "name": "clanguml::t20008::tmain()", + "name": "tmain", + "namespace": "clanguml::t20008", "source_location": { "column": 6, "file": "t20008.cc", @@ -82,8 +84,25 @@ void tmain() "type": "function" }, { + "activities": [ + { + "display_name": "b(int)", + "id": "379850145437051189", + "name": "b", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20008.cc", + "line": 16, + "translation_unit": "t20008.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "1906510289157013670", - "name": "clanguml::t20008::B", + "name": "B", + "namespace": "clanguml::t20008", "source_location": { "column": 30, "file": "t20008.cc", @@ -93,8 +112,25 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "a1(int)", + "id": "2066363630174644719", + "name": "a1", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20008.cc", + "line": 8, + "translation_unit": "t20008.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "1376149084762923197", - "name": "clanguml::t20008::A", + "name": "A", + "namespace": "clanguml::t20008", "source_location": { "column": 30, "file": "t20008.cc", @@ -104,8 +140,25 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "b(const char *)", + "id": "1347162523481637780", + "name": "b", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20008.cc", + "line": 16, + "translation_unit": "t20008.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "867098551202196741", - "name": "clanguml::t20008::B", + "name": "B", + "namespace": "clanguml::t20008", "source_location": { "column": 30, "file": "t20008.cc", @@ -115,8 +168,25 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "a2(const char *)", + "id": "718650834962275580", + "name": "a2", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20008.cc", + "line": 9, + "translation_unit": "t20008.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "144833378017373200", - "name": "clanguml::t20008::A", + "name": "A", + "namespace": "clanguml::t20008", "source_location": { "column": 30, "file": "t20008.cc", @@ -126,8 +196,25 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "b(std::string)", + "id": "1286410946666951254", + "name": "b", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20008.cc", + "line": 16, + "translation_unit": "t20008.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "927702553742507923", - "name": "clanguml::t20008::B", + "name": "B", + "namespace": "clanguml::t20008", "source_location": { "column": 30, "file": "t20008.cc", @@ -137,8 +224,25 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "a3(std::string)", + "id": "1404594247101138737", + "name": "a3", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20008.cc", + "line": 10, + "translation_unit": "t20008.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "390605614583363778", - "name": "clanguml::t20008::A", + "name": "A", + "namespace": "clanguml::t20008", "source_location": { "column": 30, "file": "t20008.cc", @@ -154,9 +258,7 @@ void tmain() { "from": { "activity_id": "1180776240543224244", - "activity_name": "clanguml::t20008::tmain()", - "participant_id": "1180776240543224244", - "participant_name": "clanguml::t20008::tmain()" + "participant_id": "1180776240543224244" }, "name": "b(int)", "return_type": "void", @@ -169,7 +271,6 @@ void tmain() }, "to": { "activity_id": "379850145437051189", - "activity_name": "clanguml::t20008::B::b(int)", "participant_id": "1906510289157013670" }, "type": "message" @@ -177,7 +278,6 @@ void tmain() { "from": { "activity_id": "379850145437051189", - "activity_name": "clanguml::t20008::B::b(int)", "participant_id": "1906510289157013670" }, "name": "a1(int)", @@ -191,7 +291,6 @@ void tmain() }, "to": { "activity_id": "2066363630174644719", - "activity_name": "clanguml::t20008::A::a1(int)", "participant_id": "1376149084762923197" }, "type": "message" @@ -199,9 +298,7 @@ void tmain() { "from": { "activity_id": "1180776240543224244", - "activity_name": "clanguml::t20008::tmain()", - "participant_id": "1180776240543224244", - "participant_name": "clanguml::t20008::tmain()" + "participant_id": "1180776240543224244" }, "name": "b(const char *)", "return_type": "void", @@ -214,7 +311,6 @@ void tmain() }, "to": { "activity_id": "1347162523481637780", - "activity_name": "clanguml::t20008::B::b(const char *)", "participant_id": "867098551202196741" }, "type": "message" @@ -222,7 +318,6 @@ void tmain() { "from": { "activity_id": "1347162523481637780", - "activity_name": "clanguml::t20008::B::b(const char *)", "participant_id": "867098551202196741" }, "name": "a2(const char *)", @@ -236,7 +331,6 @@ void tmain() }, "to": { "activity_id": "718650834962275580", - "activity_name": "clanguml::t20008::A::a2(const char *)", "participant_id": "144833378017373200" }, "type": "message" @@ -244,9 +338,7 @@ void tmain() { "from": { "activity_id": "1180776240543224244", - "activity_name": "clanguml::t20008::tmain()", - "participant_id": "1180776240543224244", - "participant_name": "clanguml::t20008::tmain()" + "participant_id": "1180776240543224244" }, "name": "b(std::string)", "return_type": "void", @@ -259,7 +351,6 @@ void tmain() }, "to": { "activity_id": "1286410946666951254", - "activity_name": "clanguml::t20008::B::b(std::string)", "participant_id": "927702553742507923" }, "type": "message" @@ -267,7 +358,6 @@ void tmain() { "from": { "activity_id": "1286410946666951254", - "activity_name": "clanguml::t20008::B::b(std::string)", "participant_id": "927702553742507923" }, "name": "a3(std::string)", @@ -281,7 +371,6 @@ void tmain() }, "to": { "activity_id": "1404594247101138737", - "activity_name": "clanguml::t20008::A::a3(std::string)", "participant_id": "390605614583363778" }, "type": "message" diff --git a/docs/test_cases/t20008_sequence.svg b/docs/test_cases/t20008_sequence.svg index e6a2e2ae..361541c7 100644 --- a/docs/test_cases/t20008_sequence.svg +++ b/docs/test_cases/t20008_sequence.svg @@ -1,100 +1,106 @@ - + + + + + + + - - - - - - - - - - - - - - - - - tmain() - - tmain() + + + + + + + + + + + + + + + + + tmain() + + tmain() - - - B<int> - - B<int> + + + B<int> + + B<int> - - - A<int> - - A<int> + + + A<int> + + A<int> - - - B<const char *> - - B<const char *> + + + B<const char *> + + B<const char *> - - - A<const char *> - - A<const char *> + + + A<const char *> + + A<const char *> - - - B<std::string> - - B<std::string> + + + B<std::string> + + B<std::string> - - - A<std::string> - - A<std::string> + + + A<std::string> + + A<std::string> - - - - - - - - - - - b(int) + + + + + + + + + + + b(int) - - - - a1(int) + + + + a1(int) - - - - b(const char *) + + + + b(const char *) - - - - a2(const char *) + + + + a2(const char *) - - - - b(std::string) + + + + b(std::string) - - - - a3(std::string) + + + + a3(std::string) diff --git a/docs/test_cases/t20008_sequence_mermaid.svg b/docs/test_cases/t20008_sequence_mermaid.svg index 7ed8f2b4..12de9b96 100644 --- a/docs/test_cases/t20008_sequence_mermaid.svg +++ b/docs/test_cases/t20008_sequence_mermaid.svg @@ -123,17 +123,17 @@ - + - + - + @@ -163,16 +163,16 @@ - b(int) - - a1(int) - - b(const char *) - - a2(const char *) - - b(std::string) - - a3(std::string) - + b(int) + + a1(int) + + b(const char *) + + a2(const char *) + + b(std::string) + + a3(std::string) + diff --git a/docs/test_cases/t20009.md b/docs/test_cases/t20009.md index 86ec38cd..4df3f8d4 100644 --- a/docs/test_cases/t20009.md +++ b/docs/test_cases/t20009.md @@ -57,8 +57,10 @@ void tmain() "name": "t20009_sequence", "participants": [ { + "display_name": "tmain()", "id": "791066686606379857", - "name": "clanguml::t20009::tmain()", + "name": "tmain", + "namespace": "clanguml::t20009", "source_location": { "column": 6, "file": "t20009.cc", @@ -68,8 +70,25 @@ void tmain() "type": "function" }, { + "activities": [ + { + "display_name": "b(std::string)", + "id": "1960266381909090879", + "name": "b", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20009.cc", + "line": 11, + "translation_unit": "t20009.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "450813573860627679", - "name": "clanguml::t20009::B", + "name": "B", + "namespace": "clanguml::t20009", "source_location": { "column": 30, "file": "t20009.cc", @@ -79,8 +98,25 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "a(std::string)", + "id": "1716775846967761286", + "name": "a", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20009.cc", + "line": 7, + "translation_unit": "t20009.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "1197403810800583218", - "name": "clanguml::t20009::A", + "name": "A", + "namespace": "clanguml::t20009", "source_location": { "column": 30, "file": "t20009.cc", @@ -90,8 +126,25 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "b(int)", + "id": "660557928399203634", + "name": "b", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20009.cc", + "line": 11, + "translation_unit": "t20009.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "2002310682025149090", - "name": "clanguml::t20009::B", + "name": "B", + "namespace": "clanguml::t20009", "source_location": { "column": 30, "file": "t20009.cc", @@ -101,8 +154,25 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "a(int)", + "id": "2030629454810805092", + "name": "a", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20009.cc", + "line": 7, + "translation_unit": "t20009.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "1228498754558363121", - "name": "clanguml::t20009::A", + "name": "A", + "namespace": "clanguml::t20009", "source_location": { "column": 30, "file": "t20009.cc", @@ -112,8 +182,25 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "b(float)", + "id": "367805163135583282", + "name": "b", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20009.cc", + "line": 11, + "translation_unit": "t20009.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "1461902328659683203", - "name": "clanguml::t20009::B", + "name": "B", + "namespace": "clanguml::t20009", "source_location": { "column": 30, "file": "t20009.cc", @@ -123,8 +210,25 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "a(float)", + "id": "1643733911490581293", + "name": "a", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20009.cc", + "line": 7, + "translation_unit": "t20009.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "1243520246309441967", - "name": "clanguml::t20009::A", + "name": "A", + "namespace": "clanguml::t20009", "source_location": { "column": 30, "file": "t20009.cc", @@ -140,9 +244,7 @@ void tmain() { "from": { "activity_id": "791066686606379857", - "activity_name": "clanguml::t20009::tmain()", - "participant_id": "791066686606379857", - "participant_name": "clanguml::t20009::tmain()" + "participant_id": "791066686606379857" }, "name": "b(std::string)", "return_type": "void", @@ -155,7 +257,6 @@ void tmain() }, "to": { "activity_id": "1960266381909090879", - "activity_name": "clanguml::t20009::B::b(std::string)", "participant_id": "450813573860627679" }, "type": "message" @@ -163,7 +264,6 @@ void tmain() { "from": { "activity_id": "1960266381909090879", - "activity_name": "clanguml::t20009::B::b(std::string)", "participant_id": "450813573860627679" }, "name": "a(std::string)", @@ -177,7 +277,6 @@ void tmain() }, "to": { "activity_id": "1716775846967761286", - "activity_name": "clanguml::t20009::A::a(std::string)", "participant_id": "1197403810800583218" }, "type": "message" @@ -185,9 +284,7 @@ void tmain() { "from": { "activity_id": "791066686606379857", - "activity_name": "clanguml::t20009::tmain()", - "participant_id": "791066686606379857", - "participant_name": "clanguml::t20009::tmain()" + "participant_id": "791066686606379857" }, "name": "b(int)", "return_type": "void", @@ -200,7 +297,6 @@ void tmain() }, "to": { "activity_id": "660557928399203634", - "activity_name": "clanguml::t20009::B::b(int)", "participant_id": "2002310682025149090" }, "type": "message" @@ -208,7 +304,6 @@ void tmain() { "from": { "activity_id": "660557928399203634", - "activity_name": "clanguml::t20009::B::b(int)", "participant_id": "2002310682025149090" }, "name": "a(int)", @@ -222,7 +317,6 @@ void tmain() }, "to": { "activity_id": "2030629454810805092", - "activity_name": "clanguml::t20009::A::a(int)", "participant_id": "1228498754558363121" }, "type": "message" @@ -230,9 +324,7 @@ void tmain() { "from": { "activity_id": "791066686606379857", - "activity_name": "clanguml::t20009::tmain()", - "participant_id": "791066686606379857", - "participant_name": "clanguml::t20009::tmain()" + "participant_id": "791066686606379857" }, "name": "b(float)", "return_type": "void", @@ -245,7 +337,6 @@ void tmain() }, "to": { "activity_id": "367805163135583282", - "activity_name": "clanguml::t20009::B::b(float)", "participant_id": "1461902328659683203" }, "type": "message" @@ -253,7 +344,6 @@ void tmain() { "from": { "activity_id": "367805163135583282", - "activity_name": "clanguml::t20009::B::b(float)", "participant_id": "1461902328659683203" }, "name": "a(float)", @@ -267,7 +357,6 @@ void tmain() }, "to": { "activity_id": "1643733911490581293", - "activity_name": "clanguml::t20009::A::a(float)", "participant_id": "1243520246309441967" }, "type": "message" diff --git a/docs/test_cases/t20009_sequence.svg b/docs/test_cases/t20009_sequence.svg index 36710d01..11a27c1c 100644 --- a/docs/test_cases/t20009_sequence.svg +++ b/docs/test_cases/t20009_sequence.svg @@ -1,100 +1,106 @@ - + + + + + + + - - - - - - - - - - - - - - - - - tmain() - - tmain() + + + + + + + + + + + + + + + + + tmain() + + tmain() - - - B<std::string> - - B<std::string> + + + B<std::string> + + B<std::string> - - - A<std::string> - - A<std::string> + + + A<std::string> + + A<std::string> - - - B<int> - - B<int> + + + B<int> + + B<int> - - - A<int> - - A<int> + + + A<int> + + A<int> - - - B<float> - - B<float> + + + B<float> + + B<float> - - - A<float> - - A<float> + + + A<float> + + A<float> - - - - - - - - - - - b(std::string) + + + + + + + + + + + b(std::string) - - - - a(std::string) + + + + a(std::string) - - - - b(int) + + + + b(int) - - - - a(int) + + + + a(int) - - - - b(float) + + + + b(float) - - - - a(float) + + + + a(float) diff --git a/docs/test_cases/t20009_sequence_mermaid.svg b/docs/test_cases/t20009_sequence_mermaid.svg index f53d5c87..a5ffc27e 100644 --- a/docs/test_cases/t20009_sequence_mermaid.svg +++ b/docs/test_cases/t20009_sequence_mermaid.svg @@ -123,17 +123,17 @@ - + - + - + @@ -163,16 +163,16 @@ - b(std::string) - - a(std::string) - - b(int) - - a(int) - - b(float) - - a(float) - + b(std::string) + + a(std::string) + + b(int) + + a(int) + + b(float) + + a(float) + diff --git a/docs/test_cases/t20010.md b/docs/test_cases/t20010.md index 3d66e51b..56336dc4 100644 --- a/docs/test_cases/t20010.md +++ b/docs/test_cases/t20010.md @@ -67,8 +67,10 @@ void tmain() "name": "t20010_sequence", "participants": [ { + "display_name": "tmain()", "id": "1364660609791735244", - "name": "clanguml::t20010::tmain()", + "name": "tmain", + "namespace": "clanguml::t20010", "source_location": { "column": 6, "file": "t20010.cc", @@ -78,8 +80,64 @@ void tmain() "type": "function" }, { + "activities": [ + { + "display_name": "b1()", + "id": "343626060927491836", + "name": "b1", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20010.cc", + "line": 17, + "translation_unit": "t20010.cc" + }, + "type": "method" + }, + { + "display_name": "b2()", + "id": "1633031113603062043", + "name": "b2", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20010.cc", + "line": 18, + "translation_unit": "t20010.cc" + }, + "type": "method" + }, + { + "display_name": "b3()", + "id": "786218543654309692", + "name": "b3", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20010.cc", + "line": 19, + "translation_unit": "t20010.cc" + }, + "type": "method" + }, + { + "display_name": "b4()", + "id": "1866068965397702666", + "name": "b4", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20010.cc", + "line": 20, + "translation_unit": "t20010.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "2154977200904210115", - "name": "clanguml::t20010::B", + "name": "B", + "namespace": "clanguml::t20010", "source_location": { "column": 30, "file": "t20010.cc", @@ -89,8 +147,64 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "a1()", + "id": "981184681827469850", + "name": "a1", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20010.cc", + "line": 10, + "translation_unit": "t20010.cc" + }, + "type": "method" + }, + { + "display_name": "a2()", + "id": "664370880632146592", + "name": "a2", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20010.cc", + "line": 11, + "translation_unit": "t20010.cc" + }, + "type": "method" + }, + { + "display_name": "a3()", + "id": "2145739294823015899", + "name": "a3", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20010.cc", + "line": 12, + "translation_unit": "t20010.cc" + }, + "type": "method" + }, + { + "display_name": "a4()", + "id": "1224936485834400821", + "name": "a4", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20010.cc", + "line": 13, + "translation_unit": "t20010.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "102070351492425113", - "name": "clanguml::t20010::A", + "name": "A", + "namespace": "clanguml::t20010", "source_location": { "column": 8, "file": "t20010.cc", @@ -106,9 +220,7 @@ void tmain() { "from": { "activity_id": "1364660609791735244", - "activity_name": "clanguml::t20010::tmain()", - "participant_id": "1364660609791735244", - "participant_name": "clanguml::t20010::tmain()" + "participant_id": "1364660609791735244" }, "name": "b1()", "return_type": "void", @@ -121,7 +233,6 @@ void tmain() }, "to": { "activity_id": "343626060927491836", - "activity_name": "clanguml::t20010::B::b1()", "participant_id": "2154977200904210115" }, "type": "message" @@ -129,7 +240,6 @@ void tmain() { "from": { "activity_id": "343626060927491836", - "activity_name": "clanguml::t20010::B::b1()", "participant_id": "2154977200904210115" }, "name": "a1()", @@ -143,7 +253,6 @@ void tmain() }, "to": { "activity_id": "981184681827469850", - "activity_name": "clanguml::t20010::A::a1()", "participant_id": "102070351492425113" }, "type": "message" @@ -151,9 +260,7 @@ void tmain() { "from": { "activity_id": "1364660609791735244", - "activity_name": "clanguml::t20010::tmain()", - "participant_id": "1364660609791735244", - "participant_name": "clanguml::t20010::tmain()" + "participant_id": "1364660609791735244" }, "name": "b2()", "return_type": "void", @@ -166,7 +273,6 @@ void tmain() }, "to": { "activity_id": "1633031113603062043", - "activity_name": "clanguml::t20010::B::b2()", "participant_id": "2154977200904210115" }, "type": "message" @@ -174,7 +280,6 @@ void tmain() { "from": { "activity_id": "1633031113603062043", - "activity_name": "clanguml::t20010::B::b2()", "participant_id": "2154977200904210115" }, "name": "a2()", @@ -188,7 +293,6 @@ void tmain() }, "to": { "activity_id": "664370880632146592", - "activity_name": "clanguml::t20010::A::a2()", "participant_id": "102070351492425113" }, "type": "message" @@ -196,9 +300,7 @@ void tmain() { "from": { "activity_id": "1364660609791735244", - "activity_name": "clanguml::t20010::tmain()", - "participant_id": "1364660609791735244", - "participant_name": "clanguml::t20010::tmain()" + "participant_id": "1364660609791735244" }, "name": "b3()", "return_type": "void", @@ -211,7 +313,6 @@ void tmain() }, "to": { "activity_id": "786218543654309692", - "activity_name": "clanguml::t20010::B::b3()", "participant_id": "2154977200904210115" }, "type": "message" @@ -219,7 +320,6 @@ void tmain() { "from": { "activity_id": "786218543654309692", - "activity_name": "clanguml::t20010::B::b3()", "participant_id": "2154977200904210115" }, "name": "a3()", @@ -233,7 +333,6 @@ void tmain() }, "to": { "activity_id": "2145739294823015899", - "activity_name": "clanguml::t20010::A::a3()", "participant_id": "102070351492425113" }, "type": "message" @@ -241,9 +340,7 @@ void tmain() { "from": { "activity_id": "1364660609791735244", - "activity_name": "clanguml::t20010::tmain()", - "participant_id": "1364660609791735244", - "participant_name": "clanguml::t20010::tmain()" + "participant_id": "1364660609791735244" }, "name": "b4()", "return_type": "void", @@ -256,7 +353,6 @@ void tmain() }, "to": { "activity_id": "1866068965397702666", - "activity_name": "clanguml::t20010::B::b4()", "participant_id": "2154977200904210115" }, "type": "message" @@ -264,7 +360,6 @@ void tmain() { "from": { "activity_id": "1866068965397702666", - "activity_name": "clanguml::t20010::B::b4()", "participant_id": "2154977200904210115" }, "name": "a4()", @@ -278,7 +373,6 @@ void tmain() }, "to": { "activity_id": "1224936485834400821", - "activity_name": "clanguml::t20010::A::a4()", "participant_id": "102070351492425113" }, "type": "message" diff --git a/docs/test_cases/t20010_sequence.svg b/docs/test_cases/t20010_sequence.svg index 7e058705..43dee0b8 100644 --- a/docs/test_cases/t20010_sequence.svg +++ b/docs/test_cases/t20010_sequence.svg @@ -1,86 +1,92 @@ - + + + + + + + - - - - - - - - - - - - - - - tmain() - - tmain() + + + + + + + + + + + + + + + tmain() + + tmain() - - - B<int> - - B<int> + + + B<int> + + B<int> - - - A - - A + + + A + + A - - - - - - - - - - - - - b1() + + + + + + + + + + + + + b1() - - - - a1() + + + + a1() - - - - b2() + + + + b2() - - - - a2() + + + + a2() - - - - b3() + + + + b3() - - - - a3() + + + + a3() - - - - b4() + + + + b4() - - - - a4() + + + + a4() diff --git a/docs/test_cases/t20010_sequence_mermaid.svg b/docs/test_cases/t20010_sequence_mermaid.svg index 787ae425..f8beb39e 100644 --- a/docs/test_cases/t20010_sequence_mermaid.svg +++ b/docs/test_cases/t20010_sequence_mermaid.svg @@ -63,17 +63,17 @@ - + - + - + @@ -109,20 +109,20 @@ - b1() - - a1() - - b2() - - a2() - - b3() - - a3() - - b4() - - a4() - + b1() + + a1() + + b2() + + a2() + + b3() + + a3() + + b4() + + a4() + diff --git a/docs/test_cases/t20011.md b/docs/test_cases/t20011.md index 38f5d1fe..9fa3443a 100644 --- a/docs/test_cases/t20011.md +++ b/docs/test_cases/t20011.md @@ -59,8 +59,10 @@ void tmain() "name": "t20011_sequence", "participants": [ { + "display_name": "tmain()", "id": "1866210527166391126", - "name": "clanguml::t20011::tmain()", + "name": "tmain", + "namespace": "clanguml::t20011", "source_location": { "column": 6, "file": "t20011.cc", @@ -70,8 +72,64 @@ void tmain() "type": "function" }, { + "activities": [ + { + "display_name": "a(int)", + "id": "1647578261840204206", + "name": "a", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20011.cc", + "line": 5, + "translation_unit": "t20011.cc" + }, + "type": "method" + }, + { + "display_name": "b(int)", + "id": "305456175818875420", + "name": "b", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20011.cc", + "line": 11, + "translation_unit": "t20011.cc" + }, + "type": "method" + }, + { + "display_name": "c(int)", + "id": "963268672079901211", + "name": "c", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20011.cc", + "line": 12, + "translation_unit": "t20011.cc" + }, + "type": "method" + }, + { + "display_name": "d(int)", + "id": "1874311762268001137", + "name": "d", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20011.cc", + "line": 13, + "translation_unit": "t20011.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "816061502062128285", - "name": "clanguml::t20011::A", + "name": "A", + "namespace": "clanguml::t20011", "source_location": { "column": 8, "file": "t20011.cc", @@ -87,9 +145,7 @@ void tmain() { "from": { "activity_id": "1866210527166391126", - "activity_name": "clanguml::t20011::tmain()", - "participant_id": "1866210527166391126", - "participant_name": "clanguml::t20011::tmain()" + "participant_id": "1866210527166391126" }, "name": "a(int)", "return_type": "void", @@ -102,7 +158,6 @@ void tmain() }, "to": { "activity_id": "1647578261840204206", - "activity_name": "clanguml::t20011::A::a(int)", "participant_id": "816061502062128285" }, "type": "message" @@ -115,7 +170,6 @@ void tmain() { "from": { "activity_id": "1647578261840204206", - "activity_name": "clanguml::t20011::A::a(int)", "participant_id": "816061502062128285" }, "name": "a(int)", @@ -129,7 +183,6 @@ void tmain() }, "to": { "activity_id": "1647578261840204206", - "activity_name": "clanguml::t20011::A::a(int)", "participant_id": "816061502062128285" }, "type": "message" @@ -144,9 +197,7 @@ void tmain() { "from": { "activity_id": "1866210527166391126", - "activity_name": "clanguml::t20011::tmain()", - "participant_id": "1866210527166391126", - "participant_name": "clanguml::t20011::tmain()" + "participant_id": "1866210527166391126" }, "name": "b(int)", "return_type": "void", @@ -159,7 +210,6 @@ void tmain() }, "to": { "activity_id": "305456175818875420", - "activity_name": "clanguml::t20011::A::b(int)", "participant_id": "816061502062128285" }, "type": "message" @@ -167,7 +217,6 @@ void tmain() { "from": { "activity_id": "305456175818875420", - "activity_name": "clanguml::t20011::A::b(int)", "participant_id": "816061502062128285" }, "name": "c(int)", @@ -181,7 +230,6 @@ void tmain() }, "to": { "activity_id": "963268672079901211", - "activity_name": "clanguml::t20011::A::c(int)", "participant_id": "816061502062128285" }, "type": "message" @@ -189,7 +237,6 @@ void tmain() { "from": { "activity_id": "963268672079901211", - "activity_name": "clanguml::t20011::A::c(int)", "participant_id": "816061502062128285" }, "name": "d(int)", @@ -203,7 +250,6 @@ void tmain() }, "to": { "activity_id": "1874311762268001137", - "activity_name": "clanguml::t20011::A::d(int)", "participant_id": "816061502062128285" }, "type": "message" @@ -216,7 +262,6 @@ void tmain() { "from": { "activity_id": "1874311762268001137", - "activity_name": "clanguml::t20011::A::d(int)", "participant_id": "816061502062128285" }, "name": "b(int)", @@ -230,7 +275,6 @@ void tmain() }, "to": { "activity_id": "305456175818875420", - "activity_name": "clanguml::t20011::A::b(int)", "participant_id": "816061502062128285" }, "type": "message" @@ -238,7 +282,6 @@ void tmain() { "from": { "activity_id": "1874311762268001137", - "activity_name": "clanguml::t20011::A::d(int)", "participant_id": "816061502062128285" }, "name": "a(int)", @@ -252,7 +295,6 @@ void tmain() }, "to": { "activity_id": "1647578261840204206", - "activity_name": "clanguml::t20011::A::a(int)", "participant_id": "816061502062128285" }, "type": "message" diff --git a/docs/test_cases/t20011_sequence.svg b/docs/test_cases/t20011_sequence.svg index 10ea35d2..4119da5a 100644 --- a/docs/test_cases/t20011_sequence.svg +++ b/docs/test_cases/t20011_sequence.svg @@ -1,103 +1,109 @@ - + + + + + + + - - - - - - - - - - - - - - - - - tmain() - - tmain() + + + + + + + + + + + + + + + + + tmain() + + tmain() - - - A - - A + + + A + + A - - - - - - - - - - - - - a(int) + + + + + + + + + + + + + a(int) - - - alt - - - - - - a(int) + + + alt + + + + + + a(int) - - - - b(int) + + + + b(int) - - - - - - c(int) + + + + + + c(int) - - - - - - d(int) + + + + + + d(int) - - - alt - - - - - - b(int) + + + alt + + + + + + b(int) - - - - - - a(int) + + + + + + a(int) - - - alt - - - - - - a(int) + + + alt + + + + + + a(int) diff --git a/docs/test_cases/t20011_sequence_mermaid.svg b/docs/test_cases/t20011_sequence_mermaid.svg index 1080c061..c412119f 100644 --- a/docs/test_cases/t20011_sequence_mermaid.svg +++ b/docs/test_cases/t20011_sequence_mermaid.svg @@ -48,17 +48,17 @@ - + - + - + @@ -127,12 +127,12 @@ ​ - a(int) - + a(int) + a(int) - b(int) - + b(int) + c(int) d(int) diff --git a/docs/test_cases/t20012.md b/docs/test_cases/t20012.md index 9cb1a56a..811072f9 100644 --- a/docs/test_cases/t20012.md +++ b/docs/test_cases/t20012.md @@ -134,8 +134,10 @@ void tmain() "name": "t20012_sequence", "participants": [ { + "display_name": "tmain()", "id": "893699278278125827", - "name": "clanguml::t20012::tmain()", + "name": "tmain", + "namespace": "clanguml::t20012", "source_location": { "column": 6, "file": "t20012.cc", @@ -145,19 +147,73 @@ void tmain() "type": "function" }, { + "activities": [ + { + "display_name": "operator()()", + "id": "1314931307342523651", + "name": "operator()", + "namespace": "", + "type": "method" + } + ], + "display_name": "tmain()::(lambda t20012.cc:67:20)", "id": "1823127147500894672", - "name": "clanguml::t20012::tmain()::(lambda t20012.cc:67:20)", + "name": "tmain()::(lambda t20012.cc:67:20)", + "namespace": "clanguml::t20012", "source_location": { "column": 20, "file": "t20012.cc", "line": 67, "translation_unit": "t20012.cc" }, - "type": "class" + "type": "lambda" }, { + "activities": [ + { + "display_name": "a()", + "id": "1871432932744498976", + "name": "a", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20012.cc", + "line": 11, + "translation_unit": "t20012.cc" + }, + "type": "method" + }, + { + "display_name": "aa()", + "id": "1100933039353876539", + "name": "aa", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20012.cc", + "line": 13, + "translation_unit": "t20012.cc" + }, + "type": "method" + }, + { + "display_name": "aaa()", + "id": "941636185823691898", + "name": "aaa", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20012.cc", + "line": 15, + "translation_unit": "t20012.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "1798184226128732119", - "name": "clanguml::t20012::A", + "name": "A", + "namespace": "clanguml::t20012", "source_location": { "column": 8, "file": "t20012.cc", @@ -167,8 +223,51 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "b()", + "id": "2142697410385270633", + "name": "b", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20012.cc", + "line": 19, + "translation_unit": "t20012.cc" + }, + "type": "method" + }, + { + "display_name": "bb()", + "id": "973718340784931313", + "name": "bb", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20012.cc", + "line": 21, + "translation_unit": "t20012.cc" + }, + "type": "method" + }, + { + "display_name": "bbb()", + "id": "195788529004378403", + "name": "bbb", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20012.cc", + "line": 23, + "translation_unit": "t20012.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "1893469899260202653", - "name": "clanguml::t20012::B", + "name": "B", + "namespace": "clanguml::t20012", "source_location": { "column": 8, "file": "t20012.cc", @@ -178,19 +277,73 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "operator()()", + "id": "1464047298179756286", + "name": "operator()", + "namespace": "", + "type": "method" + } + ], + "display_name": "tmain()::(lambda t20012.cc:80:20)", "id": "2103332104162021186", - "name": "clanguml::t20012::tmain()::(lambda t20012.cc:80:20)", + "name": "tmain()::(lambda t20012.cc:80:20)", + "namespace": "clanguml::t20012", "source_location": { "column": 20, "file": "t20012.cc", "line": 80, "translation_unit": "t20012.cc" }, - "type": "class" + "type": "lambda" }, { + "activities": [ + { + "display_name": "c()", + "id": "675369415318225607", + "name": "c", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20012.cc", + "line": 29, + "translation_unit": "t20012.cc" + }, + "type": "method" + }, + { + "display_name": "cc()", + "id": "1451821704315336057", + "name": "cc", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20012.cc", + "line": 31, + "translation_unit": "t20012.cc" + }, + "type": "method" + }, + { + "display_name": "ccc()", + "id": "1956141408799600460", + "name": "ccc", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20012.cc", + "line": 33, + "translation_unit": "t20012.cc" + }, + "type": "method" + } + ], + "display_name": "C", "id": "2071958121786360262", - "name": "clanguml::t20012::C", + "name": "C", + "namespace": "clanguml::t20012", "source_location": { "column": 8, "file": "t20012.cc", @@ -200,8 +353,38 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "R((lambda at /home/bartek/devel/clang-uml/tests/t20012/t20012.cc:86:9) &&)", + "id": "1225911104877544354", + "name": "R", + "namespace": "", + "source_location": { + "column": 5, + "file": "t20012.cc", + "line": 49, + "translation_unit": "t20012.cc" + }, + "type": "method" + }, + { + "display_name": "r()", + "id": "984475898639439059", + "name": "r", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20012.cc", + "line": 54, + "translation_unit": "t20012.cc" + }, + "type": "method" + } + ], + "display_name": "R", "id": "943938410171869397", - "name": "clanguml::t20012::R", + "name": "R", + "namespace": "clanguml::t20012", "source_location": { "column": 30, "file": "t20012.cc", @@ -211,15 +394,26 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "operator()()", + "id": "1801444422355429914", + "name": "operator()", + "namespace": "", + "type": "method" + } + ], + "display_name": "tmain()::(lambda t20012.cc:86:9)", "id": "1523229682883773614", - "name": "clanguml::t20012::tmain()::(lambda t20012.cc:86:9)", + "name": "tmain()::(lambda t20012.cc:86:9)", + "namespace": "clanguml::t20012", "source_location": { "column": 9, "file": "t20012.cc", "line": 86, "translation_unit": "t20012.cc" }, - "type": "class" + "type": "lambda" } ], "sequences": [ @@ -228,9 +422,7 @@ void tmain() { "from": { "activity_id": "893699278278125827", - "activity_name": "clanguml::t20012::tmain()", - "participant_id": "893699278278125827", - "participant_name": "clanguml::t20012::tmain()" + "participant_id": "893699278278125827" }, "name": "operator()()", "return_type": "", @@ -243,7 +435,6 @@ void tmain() }, "to": { "activity_id": "1314931307342523651", - "activity_name": "clanguml::t20012::tmain()##(lambda t20012.cc:67:20)::operator()()", "participant_id": "1823127147500894672" }, "type": "message" @@ -251,7 +442,6 @@ void tmain() { "from": { "activity_id": "1314931307342523651", - "activity_name": "clanguml::t20012::tmain()::(lambda t20012.cc:67:20)::operator()()", "participant_id": "1823127147500894672" }, "name": "a()", @@ -265,7 +455,6 @@ void tmain() }, "to": { "activity_id": "1871432932744498976", - "activity_name": "clanguml::t20012::A::a()", "participant_id": "1798184226128732119" }, "type": "message" @@ -273,7 +462,6 @@ void tmain() { "from": { "activity_id": "1871432932744498976", - "activity_name": "clanguml::t20012::A::a()", "participant_id": "1798184226128732119" }, "name": "aa()", @@ -287,7 +475,6 @@ void tmain() }, "to": { "activity_id": "1100933039353876539", - "activity_name": "clanguml::t20012::A::aa()", "participant_id": "1798184226128732119" }, "type": "message" @@ -295,7 +482,6 @@ void tmain() { "from": { "activity_id": "1100933039353876539", - "activity_name": "clanguml::t20012::A::aa()", "participant_id": "1798184226128732119" }, "name": "aaa()", @@ -309,7 +495,6 @@ void tmain() }, "to": { "activity_id": "941636185823691898", - "activity_name": "clanguml::t20012::A::aaa()", "participant_id": "1798184226128732119" }, "type": "message" @@ -317,7 +502,6 @@ void tmain() { "from": { "activity_id": "1314931307342523651", - "activity_name": "clanguml::t20012::tmain()::(lambda t20012.cc:67:20)::operator()()", "participant_id": "1823127147500894672" }, "name": "b()", @@ -331,7 +515,6 @@ void tmain() }, "to": { "activity_id": "2142697410385270633", - "activity_name": "clanguml::t20012::B::b()", "participant_id": "1893469899260202653" }, "type": "message" @@ -339,7 +522,6 @@ void tmain() { "from": { "activity_id": "2142697410385270633", - "activity_name": "clanguml::t20012::B::b()", "participant_id": "1893469899260202653" }, "name": "bb()", @@ -353,7 +535,6 @@ void tmain() }, "to": { "activity_id": "973718340784931313", - "activity_name": "clanguml::t20012::B::bb()", "participant_id": "1893469899260202653" }, "type": "message" @@ -361,7 +542,6 @@ void tmain() { "from": { "activity_id": "973718340784931313", - "activity_name": "clanguml::t20012::B::bb()", "participant_id": "1893469899260202653" }, "name": "bbb()", @@ -375,7 +555,6 @@ void tmain() }, "to": { "activity_id": "195788529004378403", - "activity_name": "clanguml::t20012::B::bbb()", "participant_id": "1893469899260202653" }, "type": "message" @@ -383,9 +562,7 @@ void tmain() { "from": { "activity_id": "893699278278125827", - "activity_name": "clanguml::t20012::tmain()", - "participant_id": "893699278278125827", - "participant_name": "clanguml::t20012::tmain()" + "participant_id": "893699278278125827" }, "name": "operator()()", "return_type": "", @@ -398,7 +575,6 @@ void tmain() }, "to": { "activity_id": "1464047298179756286", - "activity_name": "clanguml::t20012::tmain()##(lambda t20012.cc:80:20)::operator()()", "participant_id": "2103332104162021186" }, "type": "message" @@ -406,7 +582,6 @@ void tmain() { "from": { "activity_id": "1464047298179756286", - "activity_name": "clanguml::t20012::tmain()::(lambda t20012.cc:80:20)::operator()()", "participant_id": "2103332104162021186" }, "name": "c()", @@ -420,7 +595,6 @@ void tmain() }, "to": { "activity_id": "675369415318225607", - "activity_name": "clanguml::t20012::C::c()", "participant_id": "2071958121786360262" }, "type": "message" @@ -428,7 +602,6 @@ void tmain() { "from": { "activity_id": "675369415318225607", - "activity_name": "clanguml::t20012::C::c()", "participant_id": "2071958121786360262" }, "name": "cc()", @@ -442,7 +615,6 @@ void tmain() }, "to": { "activity_id": "1451821704315336057", - "activity_name": "clanguml::t20012::C::cc()", "participant_id": "2071958121786360262" }, "type": "message" @@ -450,7 +622,6 @@ void tmain() { "from": { "activity_id": "1451821704315336057", - "activity_name": "clanguml::t20012::C::cc()", "participant_id": "2071958121786360262" }, "name": "ccc()", @@ -464,7 +635,6 @@ void tmain() }, "to": { "activity_id": "1956141408799600460", - "activity_name": "clanguml::t20012::C::ccc()", "participant_id": "2071958121786360262" }, "type": "message" @@ -472,7 +642,6 @@ void tmain() { "from": { "activity_id": "1464047298179756286", - "activity_name": "clanguml::t20012::tmain()::(lambda t20012.cc:80:20)::operator()()", "participant_id": "2103332104162021186" }, "name": "operator()()", @@ -486,7 +655,6 @@ void tmain() }, "to": { "activity_id": "1314931307342523651", - "activity_name": "clanguml::t20012::tmain()##(lambda t20012.cc:67:20)::operator()()", "participant_id": "1823127147500894672" }, "type": "message" @@ -494,9 +662,7 @@ void tmain() { "from": { "activity_id": "893699278278125827", - "activity_name": "clanguml::t20012::tmain()", - "participant_id": "893699278278125827", - "participant_name": "clanguml::t20012::tmain()" + "participant_id": "893699278278125827" }, "name": "R((lambda at /home/bartek/devel/clang-uml/tests/t20012/t20012.cc:86:9) &&)", "return_type": "void", @@ -509,7 +675,6 @@ void tmain() }, "to": { "activity_id": "1225911104877544354", - "activity_name": "clanguml::t20012::R::R((lambda at /home/bartek/devel/clang-uml/tests/t20012/t20012.cc:86:9) &&)", "participant_id": "943938410171869397" }, "type": "message" @@ -517,9 +682,7 @@ void tmain() { "from": { "activity_id": "893699278278125827", - "activity_name": "clanguml::t20012::tmain()", - "participant_id": "893699278278125827", - "participant_name": "clanguml::t20012::tmain()" + "participant_id": "893699278278125827" }, "name": "r()", "return_type": "void", @@ -532,7 +695,6 @@ void tmain() }, "to": { "activity_id": "984475898639439059", - "activity_name": "clanguml::t20012::R::r()", "participant_id": "943938410171869397" }, "type": "message" @@ -540,7 +702,6 @@ void tmain() { "from": { "activity_id": "984475898639439059", - "activity_name": "clanguml::t20012::R::r()", "participant_id": "943938410171869397" }, "name": "operator()()", @@ -554,7 +715,6 @@ void tmain() }, "to": { "activity_id": "1801444422355429914", - "activity_name": "clanguml::t20012::tmain()##(lambda t20012.cc:86:9)::operator()()", "participant_id": "1523229682883773614" }, "type": "message" @@ -562,7 +722,6 @@ void tmain() { "from": { "activity_id": "1801444422355429914", - "activity_name": "clanguml::t20012::tmain()::(lambda t20012.cc:86:9)::operator()()", "participant_id": "1523229682883773614" }, "name": "c()", @@ -576,7 +735,6 @@ void tmain() }, "to": { "activity_id": "675369415318225607", - "activity_name": "clanguml::t20012::C::c()", "participant_id": "2071958121786360262" }, "type": "message" diff --git a/docs/test_cases/t20012_sequence.svg b/docs/test_cases/t20012_sequence.svg index dbd2da97..82308366 100644 --- a/docs/test_cases/t20012_sequence.svg +++ b/docs/test_cases/t20012_sequence.svg @@ -1,265 +1,271 @@ - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - tmain() - - tmain() + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + tmain() + + tmain() - - - tmain()::(lambda t20012.cc:67:20) - - tmain()::(lambda t20012.cc:67:20) + + + tmain()::(lambda t20012.cc:67:20) + + tmain()::(lambda t20012.cc:67:20) - - - A - - A + + + A + + A - - - B - - B + + + B + + B - - - tmain()::(lambda t20012.cc:80:20) - - tmain()::(lambda t20012.cc:80:20) + + + tmain()::(lambda t20012.cc:80:20) + + tmain()::(lambda t20012.cc:80:20) - - - C - - C + + + C + + C - - - R<R::(lambda t20012.cc:86:9)> - - R<R::(lambda t20012.cc:86:9)> + + + R<R::(lambda t20012.cc:86:9)> + + R<R::(lambda t20012.cc:86:9)> - - - tmain()::(lambda t20012.cc:86:9) - - tmain()::(lambda t20012.cc:86:9) + + + tmain()::(lambda t20012.cc:86:9) + + tmain()::(lambda t20012.cc:86:9) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - operator()() + + + + + + + + + + + + + + + + + + + + + + + + + + + + + operator()() - - - - a() + + + + a() - - - - - - aa() + + + + + + aa() - - - - - - aaa() + + + + + + aaa() - - - - b() + + + + b() - - - - - - bb() + + + + + + bb() - - - - - - bbb() + + + + + + bbb() - - - - - - operator()() + + + + + + operator()() - - - - c() + + + + c() - - - - - - cc() + + + + + + cc() - - - - - - ccc() + + + + + + ccc() - - - - operator()() + + + + operator()() - - - - a() + + + + a() - - - - - - aa() + + + + + + aa() - - - - - - aaa() + + + + + + aaa() - - - - b() + + + + b() - - - - - - bb() + + + + + + bb() - - - - - - bbb() + + + + + + bbb() - - - - - - - - R((lambda at /home/bartek/devel/clang-uml/tests/t20012/t20012.cc:86:9) &&) + + + + + + + + R((lambda at /home/bartek/devel/clang-uml/tests/t20012/t20012.cc:86:9) &&) - - - - r() + + + + r() - - - - operator()() + + + + operator()() - - - - c() + + + + c() - - - - - - cc() + + + + + + cc() - - - - - - ccc() + + + + + + ccc() - - + + diff --git a/docs/test_cases/t20012_sequence_mermaid.svg b/docs/test_cases/t20012_sequence_mermaid.svg index c0ac5669..45caec59 100644 --- a/docs/test_cases/t20012_sequence_mermaid.svg +++ b/docs/test_cases/t20012_sequence_mermaid.svg @@ -138,17 +138,17 @@ - + - + - + @@ -232,60 +232,60 @@ - operator()() - - a() - + operator()() + + a() + aa() aaa() - b() - + b() + bb() bbb() - ​ - - operator()() - - c() - + ​ + + operator()() + + c() + cc() ccc() - operator()() - - a() - + operator()() + + a() + aa() aaa() - b() - + b() + bb() bbb() - ​ - - ​ - - R((lambda at /home/bartek/devel/clang-uml/tests/t20012/t20012.cc:86:9) &&) - - r() - - operator()() - - c() - + ​ + + ​ + + R((lambda at /home/bartek/devel/clang-uml/tests/t20012/t20012.cc:86:9) &&) + + r() + + operator()() + + c() + cc() ccc() - ​ - + ​ + diff --git a/docs/test_cases/t20013.md b/docs/test_cases/t20013.md index 8967c979..98eef980 100644 --- a/docs/test_cases/t20013.md +++ b/docs/test_cases/t20013.md @@ -55,8 +55,10 @@ void tmain(int argc, char **argv) "name": "t20013_sequence", "participants": [ { + "display_name": "tmain(int,char **)", "id": "1249768632077843821", - "name": "clanguml::t20013::tmain(int,char **)", + "name": "tmain", + "namespace": "clanguml::t20013", "source_location": { "column": 6, "file": "t20013.cc", @@ -66,8 +68,51 @@ void tmain(int argc, char **argv) "type": "function" }, { + "activities": [ + { + "display_name": "b(int)", + "id": "2144804108273682993", + "name": "b", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20013.cc", + "line": 11, + "translation_unit": "t20013.cc" + }, + "type": "method" + }, + { + "display_name": "b(double)", + "id": "640747884486165287", + "name": "b", + "namespace": "", + "source_location": { + "column": 12, + "file": "t20013.cc", + "line": 12, + "translation_unit": "t20013.cc" + }, + "type": "method" + }, + { + "display_name": "b(const char *)", + "id": "1066935874364409142", + "name": "b", + "namespace": "", + "source_location": { + "column": 17, + "file": "t20013.cc", + "line": 13, + "translation_unit": "t20013.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "1106407610612951303", - "name": "clanguml::t20013::B", + "name": "B", + "namespace": "clanguml::t20013", "source_location": { "column": 8, "file": "t20013.cc", @@ -77,8 +122,51 @@ void tmain(int argc, char **argv) "type": "class" }, { + "activities": [ + { + "display_name": "a1(int)", + "id": "1034027282942033004", + "name": "a1", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20013.cc", + "line": 5, + "translation_unit": "t20013.cc" + }, + "type": "method" + }, + { + "display_name": "a2(double)", + "id": "394053399890813915", + "name": "a2", + "namespace": "", + "source_location": { + "column": 12, + "file": "t20013.cc", + "line": 6, + "translation_unit": "t20013.cc" + }, + "type": "method" + }, + { + "display_name": "a3(const char *)", + "id": "1841239321495867611", + "name": "a3", + "namespace": "", + "source_location": { + "column": 17, + "file": "t20013.cc", + "line": 7, + "translation_unit": "t20013.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "976623130699225079", - "name": "clanguml::t20013::A", + "name": "A", + "namespace": "clanguml::t20013", "source_location": { "column": 8, "file": "t20013.cc", @@ -94,9 +182,7 @@ void tmain(int argc, char **argv) { "from": { "activity_id": "1249768632077843821", - "activity_name": "clanguml::t20013::tmain(int,char **)", - "participant_id": "1249768632077843821", - "participant_name": "clanguml::t20013::tmain(int,char **)" + "participant_id": "1249768632077843821" }, "name": "b(int)", "return_type": "int", @@ -109,7 +195,6 @@ void tmain(int argc, char **argv) }, "to": { "activity_id": "2144804108273682993", - "activity_name": "clanguml::t20013::B::b(int)", "participant_id": "1106407610612951303" }, "type": "message" @@ -117,7 +202,6 @@ void tmain(int argc, char **argv) { "from": { "activity_id": "2144804108273682993", - "activity_name": "clanguml::t20013::B::b(int)", "participant_id": "1106407610612951303" }, "name": "a1(int)", @@ -131,7 +215,6 @@ void tmain(int argc, char **argv) }, "to": { "activity_id": "1034027282942033004", - "activity_name": "clanguml::t20013::A::a1(int)", "participant_id": "976623130699225079" }, "type": "message" @@ -139,9 +222,7 @@ void tmain(int argc, char **argv) { "from": { "activity_id": "1249768632077843821", - "activity_name": "clanguml::t20013::tmain(int,char **)", - "participant_id": "1249768632077843821", - "participant_name": "clanguml::t20013::tmain(int,char **)" + "participant_id": "1249768632077843821" }, "name": "b(double)", "return_type": "double", @@ -154,7 +235,6 @@ void tmain(int argc, char **argv) }, "to": { "activity_id": "640747884486165287", - "activity_name": "clanguml::t20013::B::b(double)", "participant_id": "1106407610612951303" }, "type": "message" @@ -162,7 +242,6 @@ void tmain(int argc, char **argv) { "from": { "activity_id": "640747884486165287", - "activity_name": "clanguml::t20013::B::b(double)", "participant_id": "1106407610612951303" }, "name": "a2(double)", @@ -176,7 +255,6 @@ void tmain(int argc, char **argv) }, "to": { "activity_id": "394053399890813915", - "activity_name": "clanguml::t20013::A::a2(double)", "participant_id": "976623130699225079" }, "type": "message" @@ -184,9 +262,7 @@ void tmain(int argc, char **argv) { "from": { "activity_id": "1249768632077843821", - "activity_name": "clanguml::t20013::tmain(int,char **)", - "participant_id": "1249768632077843821", - "participant_name": "clanguml::t20013::tmain(int,char **)" + "participant_id": "1249768632077843821" }, "name": "b(const char *)", "return_type": "const char *", @@ -199,7 +275,6 @@ void tmain(int argc, char **argv) }, "to": { "activity_id": "1066935874364409142", - "activity_name": "clanguml::t20013::B::b(const char *)", "participant_id": "1106407610612951303" }, "type": "message" @@ -207,7 +282,6 @@ void tmain(int argc, char **argv) { "from": { "activity_id": "1066935874364409142", - "activity_name": "clanguml::t20013::B::b(const char *)", "participant_id": "1106407610612951303" }, "name": "a3(const char *)", @@ -221,7 +295,6 @@ void tmain(int argc, char **argv) }, "to": { "activity_id": "1841239321495867611", - "activity_name": "clanguml::t20013::A::a3(const char *)", "participant_id": "976623130699225079" }, "type": "message" diff --git a/docs/test_cases/t20013_sequence.svg b/docs/test_cases/t20013_sequence.svg index 51f6a6fb..f1f6fb96 100644 --- a/docs/test_cases/t20013_sequence.svg +++ b/docs/test_cases/t20013_sequence.svg @@ -1,84 +1,90 @@ - + + + + + + + - - - - - - - - - - - - - tmain(int,char **) - - tmain(int,char **) + + + + + + + + + + + + + tmain(int,char **) + + tmain(int,char **) - - - B - - B + + + B + + B - - - A - - A + + + A + + A - - - - - - - - - - - b(int) + + + + + + + + + + + b(int) - - - - a1(int) + + + + a1(int) - - - - - - - - b(double) + + + + + + + + b(double) - - - - a2(double) + + + + a2(double) - - - - - - - - b(const char *) + + + + + + + + b(const char *) - - - - a3(const char *) + + + + a3(const char *) - - - - + + + + diff --git a/docs/test_cases/t20013_sequence_mermaid.svg b/docs/test_cases/t20013_sequence_mermaid.svg index 1cc14dee..9113c14e 100644 --- a/docs/test_cases/t20013_sequence_mermaid.svg +++ b/docs/test_cases/t20013_sequence_mermaid.svg @@ -63,17 +63,17 @@ - + - + - + @@ -103,28 +103,28 @@ - b(int) - - a1(int) - - ​ - - ​ - - b(double) - - a2(double) - - ​ - - ​ - - b(const char *) - - a3(const char *) - - ​ - - ​ - + b(int) + + a1(int) + + ​ + + ​ + + b(double) + + a2(double) + + ​ + + ​ + + b(const char *) + + a3(const char *) + + ​ + + ​ + diff --git a/docs/test_cases/t20014.md b/docs/test_cases/t20014.md index 682a3f78..59d155bd 100644 --- a/docs/test_cases/t20014.md +++ b/docs/test_cases/t20014.md @@ -17,32 +17,6 @@ diagrams: - function: "clanguml::t20014::tmain()" ``` ## Source code -File `tests/t20014/t20014_a.cc` -```cpp -#include "include/t20014_a.h" -namespace clanguml { -namespace t20014 { - -int A::a1(int i, int j) { return i + j; } - -int A::a2(int i, int j) { return i - j; } - -} -} -``` -File `tests/t20014/t20014_b.cc` -```cpp -#include "include/t20014_b.h" -namespace clanguml { -namespace t20014 { - -int B::b1(int i, int j) { return a_.a1(i, j); } - -int B::b2(int i, int j) { return a_.a2(i, j); } - -} -} -``` File `tests/t20014/t20014.cc` ```cpp #include "include/t20014.h" @@ -66,6 +40,32 @@ int tmain() return 0; } +} +} +``` +File `tests/t20014/t20014_a.cc` +```cpp +#include "include/t20014_a.h" +namespace clanguml { +namespace t20014 { + +int A::a1(int i, int j) { return i + j; } + +int A::a2(int i, int j) { return i - j; } + +} +} +``` +File `tests/t20014/t20014_b.cc` +```cpp +#include "include/t20014_b.h" +namespace clanguml { +namespace t20014 { + +int B::b1(int i, int j) { return a_.a1(i, j); } + +int B::b2(int i, int j) { return a_.a2(i, j); } + } } ``` @@ -76,18 +76,6 @@ File `tests/t20014/t20014_c.cc` namespace clanguml { namespace t20014 { -} -} -``` -File `tests/t20014/include/t20014.h` -```cpp -#pragma once - -namespace clanguml { -namespace t20014 { - -int tmain(); - } } ``` @@ -107,6 +95,18 @@ struct B { A a_; }; +} +} +``` +File `tests/t20014/include/t20014.h` +```cpp +#pragma once + +namespace clanguml { +namespace t20014 { + +int tmain(); + } } ``` @@ -154,8 +154,10 @@ struct A { "name": "t20014_sequence", "participants": [ { + "display_name": "tmain()", "id": "512436830818921250", - "name": "clanguml::t20014::tmain()", + "name": "tmain", + "namespace": "clanguml::t20014", "source_location": { "column": 5, "file": "t20014.cc", @@ -165,8 +167,38 @@ struct A { "type": "function" }, { + "activities": [ + { + "display_name": "b1(int,int)", + "id": "1251633571711578431", + "name": "b1", + "namespace": "", + "source_location": { + "column": 9, + "file": "include/t20014_b.h", + "line": 9, + "translation_unit": "t20014.cc" + }, + "type": "method" + }, + { + "display_name": "b2(int,int)", + "id": "767830966714379991", + "name": "b2", + "namespace": "", + "source_location": { + "column": 9, + "file": "include/t20014_b.h", + "line": 10, + "translation_unit": "t20014.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "1537634076295867978", - "name": "clanguml::t20014::B", + "name": "B", + "namespace": "clanguml::t20014", "source_location": { "column": 8, "file": "include/t20014_b.h", @@ -176,8 +208,38 @@ struct A { "type": "class" }, { + "activities": [ + { + "display_name": "a1(int,int)", + "id": "1753682948110709616", + "name": "a1", + "namespace": "", + "source_location": { + "column": 9, + "file": "include/t20014_a.h", + "line": 7, + "translation_unit": "t20014.cc" + }, + "type": "method" + }, + { + "display_name": "a2(int,int)", + "id": "1943487088673912694", + "name": "a2", + "namespace": "", + "source_location": { + "column": 9, + "file": "include/t20014_a.h", + "line": 8, + "translation_unit": "t20014.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "1504706415756333840", - "name": "clanguml::t20014::A", + "name": "A", + "namespace": "clanguml::t20014", "source_location": { "column": 8, "file": "include/t20014_a.h", @@ -187,8 +249,25 @@ struct A { "type": "class" }, { + "activities": [ + { + "display_name": "c1(int,int)", + "id": "407559038402563981", + "name": "c1", + "namespace": "", + "source_location": { + "column": 7, + "file": "include/t20014_c.h", + "line": 7, + "translation_unit": "t20014.cc" + }, + "type": "method" + } + ], + "display_name": "C", "id": "500712304857049435", - "name": "clanguml::t20014::C", + "name": "C", + "namespace": "clanguml::t20014", "source_location": { "column": 42, "file": "include/t20014_c.h", @@ -204,9 +283,7 @@ struct A { { "from": { "activity_id": "512436830818921250", - "activity_name": "clanguml::t20014::tmain()", - "participant_id": "512436830818921250", - "participant_name": "clanguml::t20014::tmain()" + "participant_id": "512436830818921250" }, "name": "b1(int,int)", "return_type": "int", @@ -219,7 +296,6 @@ struct A { }, "to": { "activity_id": "1251633571711578431", - "activity_name": "clanguml::t20014::B::b1(int,int)", "participant_id": "1537634076295867978" }, "type": "message" @@ -227,7 +303,6 @@ struct A { { "from": { "activity_id": "1251633571711578431", - "activity_name": "clanguml::t20014::B::b1(int,int)", "participant_id": "1537634076295867978" }, "name": "a1(int,int)", @@ -241,7 +316,6 @@ struct A { }, "to": { "activity_id": "1753682948110709616", - "activity_name": "clanguml::t20014::A::a1(int,int)", "participant_id": "1504706415756333840" }, "type": "message" @@ -249,9 +323,7 @@ struct A { { "from": { "activity_id": "512436830818921250", - "activity_name": "clanguml::t20014::tmain()", - "participant_id": "512436830818921250", - "participant_name": "clanguml::t20014::tmain()" + "participant_id": "512436830818921250" }, "name": "b2(int,int)", "return_type": "int", @@ -264,7 +336,6 @@ struct A { }, "to": { "activity_id": "767830966714379991", - "activity_name": "clanguml::t20014::B::b2(int,int)", "participant_id": "1537634076295867978" }, "type": "message" @@ -272,7 +343,6 @@ struct A { { "from": { "activity_id": "767830966714379991", - "activity_name": "clanguml::t20014::B::b2(int,int)", "participant_id": "1537634076295867978" }, "name": "a2(int,int)", @@ -286,7 +356,6 @@ struct A { }, "to": { "activity_id": "1943487088673912694", - "activity_name": "clanguml::t20014::A::a2(int,int)", "participant_id": "1504706415756333840" }, "type": "message" @@ -294,9 +363,7 @@ struct A { { "from": { "activity_id": "512436830818921250", - "activity_name": "clanguml::t20014::tmain()", - "participant_id": "512436830818921250", - "participant_name": "clanguml::t20014::tmain()" + "participant_id": "512436830818921250" }, "name": "c1(int,int)", "return_type": "int", @@ -309,7 +376,6 @@ struct A { }, "to": { "activity_id": "407559038402563981", - "activity_name": "clanguml::t20014::C::c1(int,int)", "participant_id": "500712304857049435" }, "type": "message" @@ -317,7 +383,6 @@ struct A { { "from": { "activity_id": "407559038402563981", - "activity_name": "clanguml::t20014::C::c1(int,int)", "participant_id": "500712304857049435" }, "name": "b1(int,int)", @@ -331,7 +396,6 @@ struct A { }, "to": { "activity_id": "1251633571711578431", - "activity_name": "clanguml::t20014::B::b1(int,int)", "participant_id": "1537634076295867978" }, "type": "message" diff --git a/docs/test_cases/t20014_sequence.svg b/docs/test_cases/t20014_sequence.svg index 99748fb3..64f1274c 100644 --- a/docs/test_cases/t20014_sequence.svg +++ b/docs/test_cases/t20014_sequence.svg @@ -1,100 +1,106 @@ - + + + + + + + - - - - - - - - - - - - - - - tmain() - - tmain() + + + + + + + + + + + + + + + tmain() + + tmain() - - - B - - B + + + B + + B - - - A - - A + + + A + + A - - - C<B,int> - - C<B,int> + + + C<B,int> + + C<B,int> - - - - - - - - - - - - b1(int,int) + + + + + + + + + + + + b1(int,int) - - - - a1(int,int) + + + + a1(int,int) - - - - - - - - b2(int,int) + + + + + + + + b2(int,int) - - - - a2(int,int) + + + + a2(int,int) - - - - - - - - c1(int,int) + + + + + + + + c1(int,int) - - - - b1(int,int) + + + + b1(int,int) - - - - a1(int,int) + + + + a1(int,int) - - - - - - + + + + + + diff --git a/docs/test_cases/t20014_sequence_mermaid.svg b/docs/test_cases/t20014_sequence_mermaid.svg index 863079c3..701f40f7 100644 --- a/docs/test_cases/t20014_sequence_mermaid.svg +++ b/docs/test_cases/t20014_sequence_mermaid.svg @@ -78,17 +78,17 @@ - + - + - + @@ -121,32 +121,32 @@ - b1(int,int) - - a1(int,int) - - ​ - - ​ - - b2(int,int) - - a2(int,int) - - ​ - - ​ - - c1(int,int) - - b1(int,int) - - a1(int,int) - - ​ - - ​ - - ​ - + b1(int,int) + + a1(int,int) + + ​ + + ​ + + b2(int,int) + + a2(int,int) + + ​ + + ​ + + c1(int,int) + + b1(int,int) + + a1(int,int) + + ​ + + ​ + + ​ + diff --git a/docs/test_cases/t20015.md b/docs/test_cases/t20015.md index 450f464e..3cd38edd 100644 --- a/docs/test_cases/t20015.md +++ b/docs/test_cases/t20015.md @@ -71,8 +71,10 @@ void tmain() "name": "t20015_sequence", "participants": [ { + "display_name": "tmain()", "id": "1011496551872082945", - "name": "clanguml::t20015::tmain()", + "name": "tmain", + "namespace": "clanguml::t20015", "source_location": { "column": 6, "file": "t20015.cc", @@ -82,8 +84,25 @@ void tmain() "type": "function" }, { + "activities": [ + { + "display_name": "setup_a(std::shared_ptr &)", + "id": "431575772398797060", + "name": "setup_a", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20015.cc", + "line": 23, + "translation_unit": "t20015.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "1302656676783358645", - "name": "clanguml::t20015::B", + "name": "B", + "namespace": "clanguml::t20015", "source_location": { "column": 7, "file": "t20015.cc", @@ -99,9 +118,7 @@ void tmain() { "from": { "activity_id": "1011496551872082945", - "activity_name": "clanguml::t20015::tmain()", - "participant_id": "1011496551872082945", - "participant_name": "clanguml::t20015::tmain()" + "participant_id": "1011496551872082945" }, "name": "setup_a(std::shared_ptr &)", "return_type": "void", @@ -114,7 +131,6 @@ void tmain() }, "to": { "activity_id": "431575772398797060", - "activity_name": "clanguml::t20015::B::setup_a(std::shared_ptr &)", "participant_id": "1302656676783358645" }, "type": "message" diff --git a/docs/test_cases/t20015_sequence.svg b/docs/test_cases/t20015_sequence.svg index 85679e02..73dee18e 100644 --- a/docs/test_cases/t20015_sequence.svg +++ b/docs/test_cases/t20015_sequence.svg @@ -1,30 +1,36 @@ - + + + + + + + - - - - - - - tmain() - - tmain() + + + + + + + tmain() + + tmain() - - - B - - B + + + B + + B - - - - - - setup_a(std::shared_ptr<detail::A> &) + + + + + + setup_a(std::shared_ptr<detail::A> &) diff --git a/docs/test_cases/t20015_sequence_mermaid.svg b/docs/test_cases/t20015_sequence_mermaid.svg index 1ad5fd15..15fab6f5 100644 --- a/docs/test_cases/t20015_sequence_mermaid.svg +++ b/docs/test_cases/t20015_sequence_mermaid.svg @@ -48,17 +48,17 @@ - + - + - + @@ -73,6 +73,6 @@ - setup_a(std::shared_ptr<detail::A> &) - + setup_a(std::shared_ptr<detail::A> &) + diff --git a/docs/test_cases/t20016.md b/docs/test_cases/t20016.md index 240d4618..1dd9921c 100644 --- a/docs/test_cases/t20016.md +++ b/docs/test_cases/t20016.md @@ -53,8 +53,10 @@ void tmain() "name": "t20016_sequence", "participants": [ { + "display_name": "tmain()", "id": "1912662358651926712", - "name": "clanguml::t20016::tmain()", + "name": "tmain", + "namespace": "clanguml::t20016", "source_location": { "column": 6, "file": "t20016.cc", @@ -64,8 +66,38 @@ void tmain() "type": "function" }, { + "activities": [ + { + "display_name": "b1(long)", + "id": "2064264710178722261", + "name": "b1", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20016.cc", + "line": 9, + "translation_unit": "t20016.cc" + }, + "type": "method" + }, + { + "display_name": "b2(long)", + "id": "203381140188081853", + "name": "b2", + "namespace": "", + "source_location": { + "column": 29, + "file": "t20016.cc", + "line": 11, + "translation_unit": "t20016.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "1688340912643326666", - "name": "clanguml::t20016::B", + "name": "B", + "namespace": "clanguml::t20016", "source_location": { "column": 30, "file": "t20016.cc", @@ -75,8 +107,38 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "a1(int)", + "id": "1198371121423942542", + "name": "a1", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20016.cc", + "line": 4, + "translation_unit": "t20016.cc" + }, + "type": "method" + }, + { + "display_name": "a2(const long &)", + "id": "1208784669530380166", + "name": "a2", + "namespace": "", + "source_location": { + "column": 29, + "file": "t20016.cc", + "line": 5, + "translation_unit": "t20016.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "1351242594275053195", - "name": "clanguml::t20016::A", + "name": "A", + "namespace": "clanguml::t20016", "source_location": { "column": 8, "file": "t20016.cc", @@ -92,9 +154,7 @@ void tmain() { "from": { "activity_id": "1912662358651926712", - "activity_name": "clanguml::t20016::tmain()", - "participant_id": "1912662358651926712", - "participant_name": "clanguml::t20016::tmain()" + "participant_id": "1912662358651926712" }, "name": "b1(long)", "return_type": "void", @@ -107,7 +167,6 @@ void tmain() }, "to": { "activity_id": "2064264710178722261", - "activity_name": "clanguml::t20016::B::b1(long)", "participant_id": "1688340912643326666" }, "type": "message" @@ -115,7 +174,6 @@ void tmain() { "from": { "activity_id": "2064264710178722261", - "activity_name": "clanguml::t20016::B::b1(long)", "participant_id": "1688340912643326666" }, "name": "a1(int)", @@ -129,7 +187,6 @@ void tmain() }, "to": { "activity_id": "1198371121423942542", - "activity_name": "clanguml::t20016::A::a1(int)", "participant_id": "1351242594275053195" }, "type": "message" @@ -137,9 +194,7 @@ void tmain() { "from": { "activity_id": "1912662358651926712", - "activity_name": "clanguml::t20016::tmain()", - "participant_id": "1912662358651926712", - "participant_name": "clanguml::t20016::tmain()" + "participant_id": "1912662358651926712" }, "name": "b2(long)", "return_type": "F", @@ -152,7 +207,6 @@ void tmain() }, "to": { "activity_id": "203381140188081853", - "activity_name": "clanguml::t20016::B::b2(long)", "participant_id": "1688340912643326666" }, "type": "message" @@ -160,7 +214,6 @@ void tmain() { "from": { "activity_id": "203381140188081853", - "activity_name": "clanguml::t20016::B::b2(long)", "participant_id": "1688340912643326666" }, "name": "a2(const long &)", @@ -174,7 +227,6 @@ void tmain() }, "to": { "activity_id": "1208784669530380166", - "activity_name": "clanguml::t20016::A::a2(const long &)", "participant_id": "1351242594275053195" }, "type": "message" diff --git a/docs/test_cases/t20016_sequence.svg b/docs/test_cases/t20016_sequence.svg index 58671b0b..1c99303d 100644 --- a/docs/test_cases/t20016_sequence.svg +++ b/docs/test_cases/t20016_sequence.svg @@ -1,62 +1,68 @@ - + + + + + + + - - - - - - - - - - - tmain() - - tmain() + + + + + + + + + + + tmain() + + tmain() - - - B<long> - - B<long> + + + B<long> + + B<long> - - - A - - A + + + A + + A - - - - - - - - - b1(long) + + + + + + + + + b1(long) - - - - a1(int) + + + + a1(int) - - - - b2(long) + + + + b2(long) - - - - a2(const long &) + + + + a2(const long &) - - - - + + + + diff --git a/docs/test_cases/t20016_sequence_mermaid.svg b/docs/test_cases/t20016_sequence_mermaid.svg index ab1dfed3..a4e11094 100644 --- a/docs/test_cases/t20016_sequence_mermaid.svg +++ b/docs/test_cases/t20016_sequence_mermaid.svg @@ -63,17 +63,17 @@ - + - + - + @@ -97,16 +97,16 @@ - b1(long) - - a1(int) - - b2(long) - - a2(const long &) - - ​ - - ​ - + b1(long) + + a1(int) + + b2(long) + + a2(const long &) + + ​ + + ​ + diff --git a/docs/test_cases/t20017.md b/docs/test_cases/t20017.md index 84ac052b..f783f2c3 100644 --- a/docs/test_cases/t20017.md +++ b/docs/test_cases/t20017.md @@ -39,18 +39,6 @@ int tmain() { return b2(a1(a2(a3(1, 2), b1(3, 4)), 5), 6); } } } ``` -File `tests/t20017/include/t20017_b.h` -```cpp -#pragma once - -namespace clanguml { -namespace t20017 { -int b1(int x, int y); - -template T b2(T x, T y) { return x / y; } -} -} -``` File `tests/t20017/include/t20017_a.h` ```cpp #pragma once @@ -63,6 +51,18 @@ int a3(int x, int y) { return x * y; } } } ``` +File `tests/t20017/include/t20017_b.h` +```cpp +#pragma once + +namespace clanguml { +namespace t20017 { +int b1(int x, int y); + +template T b2(T x, T y) { return x / y; } +} +} +``` ## Generated PlantUML diagrams ![t20017_sequence](./t20017_sequence.svg "Test case for combine_free_functions_into_file_participants option") ## Generated Mermaid diagrams @@ -74,37 +74,109 @@ int a3(int x, int y) { return x * y; } "name": "t20017_sequence", "participants": [ { + "activities": [ + { + "display_name": "tmain()", + "id": "1484746432546296115", + "name": "tmain", + "namespace": "clanguml::t20017", + "source_location": { + "column": 5, + "file": "t20017.cc", + "line": 6, + "translation_unit": "t20017.cc" + }, + "type": "function" + } + ], + "display_name": "t20017.cc", "id": "294332401323799021", "name": "t20017.cc", - "source_location": { - "column": 5, - "file": "t20017.cc", - "line": 6, - "translation_unit": "t20017.cc" - }, - "type": "function" + "namespace": "clanguml::t20017", + "type": "file" }, { + "activities": [ + { + "display_name": "a3(int,int)", + "id": "1681392050252260928", + "name": "a3", + "namespace": "clanguml::t20017", + "source_location": { + "column": 5, + "file": "include/t20017_a.h", + "line": 7, + "translation_unit": "t20017.cc" + }, + "type": "function" + }, + { + "display_name": "a2(int,int)", + "id": "291553542743365259", + "name": "a2", + "namespace": "clanguml::t20017", + "source_location": { + "column": 5, + "file": "include/t20017_a.h", + "line": 6, + "translation_unit": "t20017.cc" + }, + "type": "function" + }, + { + "display_name": "a1(int,int)", + "id": "113759676939330212", + "name": "a1", + "namespace": "clanguml::t20017", + "source_location": { + "column": 5, + "file": "include/t20017_a.h", + "line": 5, + "translation_unit": "t20017.cc" + }, + "type": "function" + } + ], + "display_name": "include/t20017_a.h", "id": "1591222867263639510", - "name": "include/t20017_a.h", - "source_location": { - "column": 5, - "file": "include/t20017_a.h", - "line": 7, - "translation_unit": "t20017.cc" - }, - "type": "function" + "name": "t20017_a.h", + "namespace": "clanguml::t20017", + "type": "file" }, { + "activities": [ + { + "display_name": "b1(int,int)", + "id": "1714277838806105702", + "name": "b1", + "namespace": "clanguml::t20017", + "source_location": { + "column": 5, + "file": "include/t20017_b.h", + "line": 5, + "translation_unit": "t20017.cc" + }, + "type": "function" + }, + { + "display_name": "b2(int,int)", + "id": "775081116464505528", + "name": "b2", + "namespace": "clanguml::t20017", + "source_location": { + "column": 25, + "file": "include/t20017_b.h", + "line": 7, + "translation_unit": "t20017.cc" + }, + "type": "function_template" + } + ], + "display_name": "include/t20017_b.h", "id": "1113611539183189365", - "name": "include/t20017_b.h", - "source_location": { - "column": 5, - "file": "include/t20017_b.h", - "line": 5, - "translation_unit": "t20017.cc" - }, - "type": "function" + "name": "t20017_b.h", + "namespace": "clanguml::t20017", + "type": "file" } ], "sequences": [ @@ -113,7 +185,6 @@ int a3(int x, int y) { return x * y; } { "from": { "activity_id": "1484746432546296115", - "activity_name": "clanguml::t20017::tmain()", "participant_id": "294332401323799021" }, "name": "a3(int,int)", @@ -127,7 +198,6 @@ int a3(int x, int y) { return x * y; } }, "to": { "activity_id": "1681392050252260928", - "activity_name": "clanguml::t20017::a3(int,int)", "participant_id": "1591222867263639510" }, "type": "message" @@ -135,7 +205,6 @@ int a3(int x, int y) { return x * y; } { "from": { "activity_id": "1484746432546296115", - "activity_name": "clanguml::t20017::tmain()", "participant_id": "294332401323799021" }, "name": "b1(int,int)", @@ -149,7 +218,6 @@ int a3(int x, int y) { return x * y; } }, "to": { "activity_id": "1714277838806105702", - "activity_name": "clanguml::t20017::b1(int,int)", "participant_id": "1113611539183189365" }, "type": "message" @@ -157,7 +225,6 @@ int a3(int x, int y) { return x * y; } { "from": { "activity_id": "1484746432546296115", - "activity_name": "clanguml::t20017::tmain()", "participant_id": "294332401323799021" }, "name": "a2(int,int)", @@ -171,7 +238,6 @@ int a3(int x, int y) { return x * y; } }, "to": { "activity_id": "291553542743365259", - "activity_name": "clanguml::t20017::a2(int,int)", "participant_id": "1591222867263639510" }, "type": "message" @@ -179,7 +245,6 @@ int a3(int x, int y) { return x * y; } { "from": { "activity_id": "1484746432546296115", - "activity_name": "clanguml::t20017::tmain()", "participant_id": "294332401323799021" }, "name": "a1(int,int)", @@ -193,7 +258,6 @@ int a3(int x, int y) { return x * y; } }, "to": { "activity_id": "113759676939330212", - "activity_name": "clanguml::t20017::a1(int,int)", "participant_id": "1591222867263639510" }, "type": "message" @@ -201,7 +265,6 @@ int a3(int x, int y) { return x * y; } { "from": { "activity_id": "1484746432546296115", - "activity_name": "clanguml::t20017::tmain()", "participant_id": "294332401323799021" }, "name": "b2(int,int)", @@ -215,7 +278,6 @@ int a3(int x, int y) { return x * y; } }, "to": { "activity_id": "775081116464505528", - "activity_name": "clanguml::t20017::b2(int,int)", "participant_id": "1113611539183189365" }, "type": "message" diff --git a/docs/test_cases/t20017_sequence.svg b/docs/test_cases/t20017_sequence.svg index 281ddfec..ede48086 100644 --- a/docs/test_cases/t20017_sequence.svg +++ b/docs/test_cases/t20017_sequence.svg @@ -1,74 +1,80 @@ - + + + + + + + - - - - - - - - - - - t20017.cc - - t20017.cc - - include/t20017_a.h - - include/t20017_a.h - - include/t20017_b.h - - include/t20017_b.h - - - - - - - - - tmain() - - - - a3(int,int) + + + + + + + + + + + t20017.cc + + t20017.cc + + include/t20017_a.h + + include/t20017_a.h + + include/t20017_b.h + + include/t20017_b.h + + + + + + + + + tmain() + + + + a3(int,int) - - - - - - b1(int,int) + + + + + + b1(int,int) - - - - - - a2(int,int) + + + + + + a2(int,int) - - - - - - a1(int,int) + + + + + + a1(int,int) - - - - - - b2<int>(int,int) + + + + + + b2<int>(int,int) - - - - + + + + diff --git a/docs/test_cases/t20017_sequence_mermaid.svg b/docs/test_cases/t20017_sequence_mermaid.svg index 61f8c28f..27d40e19 100644 --- a/docs/test_cases/t20017_sequence_mermaid.svg +++ b/docs/test_cases/t20017_sequence_mermaid.svg @@ -78,17 +78,17 @@ - + - + - + @@ -115,28 +115,28 @@ - tmain() - - a3(int,int) - - ​ - - b1(int,int) - - ​ - - a2(int,int) - - ​ - - a1(int,int) - - ​ - - b2<int>(int,int) - - ​ - - ​ - + tmain() + + a3(int,int) + + ​ + + b1(int,int) + + ​ + + a2(int,int) + + ​ + + a1(int,int) + + ​ + + b2<int>(int,int) + + ​ + + ​ + diff --git a/docs/test_cases/t20018.md b/docs/test_cases/t20018.md index 993ada3e..79814f4e 100644 --- a/docs/test_cases/t20018.md +++ b/docs/test_cases/t20018.md @@ -55,8 +55,10 @@ void tmain() { Answer>::print(); } "name": "t20018_sequence", "participants": [ { + "display_name": "tmain()", "id": "227581758025403815", - "name": "clanguml::t20018::tmain()", + "name": "tmain", + "namespace": "clanguml::t20018", "source_location": { "column": 6, "file": "t20018.cc", @@ -66,8 +68,25 @@ void tmain() { Answer>::print(); } "type": "function" }, { + "activities": [ + { + "display_name": "print()", + "id": "1185770766239304952", + "name": "print", + "namespace": "", + "source_location": { + "column": 17, + "file": "t20018.cc", + "line": 22, + "translation_unit": "t20018.cc" + }, + "type": "method" + } + ], + "display_name": "Answer,120>", "id": "1163521725351533502", - "name": "clanguml::t20018::Answer,120>", + "name": "Answer", + "namespace": "clanguml::t20018", "source_location": { "column": 48, "file": "t20018.cc", @@ -77,8 +96,25 @@ void tmain() { Answer>::print(); } "type": "class" }, { + "activities": [ + { + "display_name": "print(int)", + "id": "833100888453299461", + "name": "print", + "namespace": "", + "source_location": { + "column": 17, + "file": "t20018.cc", + "line": 9, + "translation_unit": "t20018.cc" + }, + "type": "method" + } + ], + "display_name": "Factorial<5>", "id": "1482779373563849921", - "name": "clanguml::t20018::Factorial<5>", + "name": "Factorial", + "namespace": "clanguml::t20018", "source_location": { "column": 25, "file": "t20018.cc", @@ -88,8 +124,25 @@ void tmain() { Answer>::print(); } "type": "class" }, { + "activities": [ + { + "display_name": "print(int)", + "id": "1782586643813991247", + "name": "print", + "namespace": "", + "source_location": { + "column": 17, + "file": "t20018.cc", + "line": 9, + "translation_unit": "t20018.cc" + }, + "type": "method" + } + ], + "display_name": "Factorial<4>", "id": "52416404065514823", - "name": "clanguml::t20018::Factorial<4>", + "name": "Factorial", + "namespace": "clanguml::t20018", "source_location": { "column": 25, "file": "t20018.cc", @@ -99,8 +152,25 @@ void tmain() { Answer>::print(); } "type": "class" }, { + "activities": [ + { + "display_name": "print(int)", + "id": "1238078028595736678", + "name": "print", + "namespace": "", + "source_location": { + "column": 17, + "file": "t20018.cc", + "line": 9, + "translation_unit": "t20018.cc" + }, + "type": "method" + } + ], + "display_name": "Factorial<3>", "id": "1658728078296100018", - "name": "clanguml::t20018::Factorial<3>", + "name": "Factorial", + "namespace": "clanguml::t20018", "source_location": { "column": 25, "file": "t20018.cc", @@ -110,8 +180,25 @@ void tmain() { Answer>::print(); } "type": "class" }, { + "activities": [ + { + "display_name": "print(int)", + "id": "2163270950475476780", + "name": "print", + "namespace": "", + "source_location": { + "column": 17, + "file": "t20018.cc", + "line": 9, + "translation_unit": "t20018.cc" + }, + "type": "method" + } + ], + "display_name": "Factorial<2>", "id": "969903469166760124", - "name": "clanguml::t20018::Factorial<2>", + "name": "Factorial", + "namespace": "clanguml::t20018", "source_location": { "column": 25, "file": "t20018.cc", @@ -121,8 +208,25 @@ void tmain() { Answer>::print(); } "type": "class" }, { + "activities": [ + { + "display_name": "print(int)", + "id": "501166016325937670", + "name": "print", + "namespace": "", + "source_location": { + "column": 17, + "file": "t20018.cc", + "line": 9, + "translation_unit": "t20018.cc" + }, + "type": "method" + } + ], + "display_name": "Factorial<1>", "id": "2032621198190600516", - "name": "clanguml::t20018::Factorial<1>", + "name": "Factorial", + "namespace": "clanguml::t20018", "source_location": { "column": 25, "file": "t20018.cc", @@ -132,8 +236,25 @@ void tmain() { Answer>::print(); } "type": "class" }, { + "activities": [ + { + "display_name": "print(int)", + "id": "577232827352391544", + "name": "print", + "namespace": "", + "source_location": { + "column": 17, + "file": "t20018.cc", + "line": 15, + "translation_unit": "t20018.cc" + }, + "type": "method" + } + ], + "display_name": "Factorial<0>", "id": "1581865799666386458", - "name": "clanguml::t20018::Factorial<0>", + "name": "Factorial", + "namespace": "clanguml::t20018", "source_location": { "column": 20, "file": "t20018.cc", @@ -149,9 +270,7 @@ void tmain() { Answer>::print(); } { "from": { "activity_id": "227581758025403815", - "activity_name": "clanguml::t20018::tmain()", - "participant_id": "227581758025403815", - "participant_name": "clanguml::t20018::tmain()" + "participant_id": "227581758025403815" }, "name": "print()", "return_type": "void", @@ -164,7 +283,6 @@ void tmain() { Answer>::print(); } }, "to": { "activity_id": "1185770766239304952", - "activity_name": "clanguml::t20018::Answer,120>::print()", "participant_id": "1163521725351533502" }, "type": "message" @@ -172,7 +290,6 @@ void tmain() { Answer>::print(); } { "from": { "activity_id": "1185770766239304952", - "activity_name": "clanguml::t20018::Answer,120>::print()", "participant_id": "1163521725351533502" }, "name": "print(int)", @@ -186,7 +303,6 @@ void tmain() { Answer>::print(); } }, "to": { "activity_id": "833100888453299461", - "activity_name": "clanguml::t20018::Factorial<5>::print(int)", "participant_id": "1482779373563849921" }, "type": "message" @@ -194,7 +310,6 @@ void tmain() { Answer>::print(); } { "from": { "activity_id": "833100888453299461", - "activity_name": "clanguml::t20018::Factorial<5>::print(int)", "participant_id": "1482779373563849921" }, "name": "print(int)", @@ -208,7 +323,6 @@ void tmain() { Answer>::print(); } }, "to": { "activity_id": "1782586643813991247", - "activity_name": "clanguml::t20018::Factorial<4>::print(int)", "participant_id": "52416404065514823" }, "type": "message" @@ -216,7 +330,6 @@ void tmain() { Answer>::print(); } { "from": { "activity_id": "1782586643813991247", - "activity_name": "clanguml::t20018::Factorial<4>::print(int)", "participant_id": "52416404065514823" }, "name": "print(int)", @@ -230,7 +343,6 @@ void tmain() { Answer>::print(); } }, "to": { "activity_id": "1238078028595736678", - "activity_name": "clanguml::t20018::Factorial<3>::print(int)", "participant_id": "1658728078296100018" }, "type": "message" @@ -238,7 +350,6 @@ void tmain() { Answer>::print(); } { "from": { "activity_id": "1238078028595736678", - "activity_name": "clanguml::t20018::Factorial<3>::print(int)", "participant_id": "1658728078296100018" }, "name": "print(int)", @@ -252,7 +363,6 @@ void tmain() { Answer>::print(); } }, "to": { "activity_id": "2163270950475476780", - "activity_name": "clanguml::t20018::Factorial<2>::print(int)", "participant_id": "969903469166760124" }, "type": "message" @@ -260,7 +370,6 @@ void tmain() { Answer>::print(); } { "from": { "activity_id": "2163270950475476780", - "activity_name": "clanguml::t20018::Factorial<2>::print(int)", "participant_id": "969903469166760124" }, "name": "print(int)", @@ -274,7 +383,6 @@ void tmain() { Answer>::print(); } }, "to": { "activity_id": "501166016325937670", - "activity_name": "clanguml::t20018::Factorial<1>::print(int)", "participant_id": "2032621198190600516" }, "type": "message" @@ -282,7 +390,6 @@ void tmain() { Answer>::print(); } { "from": { "activity_id": "501166016325937670", - "activity_name": "clanguml::t20018::Factorial<1>::print(int)", "participant_id": "2032621198190600516" }, "name": "print(int)", @@ -296,7 +403,6 @@ void tmain() { Answer>::print(); } }, "to": { "activity_id": "577232827352391544", - "activity_name": "clanguml::t20018::Factorial<0>::print(int)", "participant_id": "1581865799666386458" }, "type": "message" diff --git a/docs/test_cases/t20018_sequence.svg b/docs/test_cases/t20018_sequence.svg index 52eeb7a4..148bd602 100644 --- a/docs/test_cases/t20018_sequence.svg +++ b/docs/test_cases/t20018_sequence.svg @@ -1,114 +1,120 @@ - + + + + + + + - - - - - - - - - - - - - - - - - - - tmain() - - tmain() + + + + + + + + + + + + + + + + + + + tmain() + + tmain() - - - Answer<Factorial<5>,120> - - Answer<Factorial<5>,120> + + + Answer<Factorial<5>,120> + + Answer<Factorial<5>,120> - - - Factorial<5> - - Factorial<5> + + + Factorial<5> + + Factorial<5> - - - Factorial<4> - - Factorial<4> + + + Factorial<4> + + Factorial<4> - - - Factorial<3> - - Factorial<3> + + + Factorial<3> + + Factorial<3> - - - Factorial<2> - - Factorial<2> + + + Factorial<2> + + Factorial<2> - - - Factorial<1> - - Factorial<1> + + + Factorial<1> + + Factorial<1> - - - Factorial<0> - - Factorial<0> + + + Factorial<0> + + Factorial<0> - - - - - - - - - - - - print() + + + + + + + + + + + + print() - - - - print(int) + + + + print(int) - - - - print(int) + + + + print(int) - - - - print(int) + + + + print(int) - - - - print(int) + + + + print(int) - - - - print(int) + + + + print(int) - - - - print(int) + + + + print(int) diff --git a/docs/test_cases/t20018_sequence_mermaid.svg b/docs/test_cases/t20018_sequence_mermaid.svg index f4234234..93ba205f 100644 --- a/docs/test_cases/t20018_sequence_mermaid.svg +++ b/docs/test_cases/t20018_sequence_mermaid.svg @@ -138,17 +138,17 @@ - + - + - + @@ -181,18 +181,18 @@ - print() - - print(int) - - print(int) - - print(int) - - print(int) - - print(int) - - print(int) - + print() + + print(int) + + print(int) + + print(int) + + print(int) + + print(int) + + print(int) + diff --git a/docs/test_cases/t20019.md b/docs/test_cases/t20019.md index 255e972b..b8f1358d 100644 --- a/docs/test_cases/t20019.md +++ b/docs/test_cases/t20019.md @@ -62,8 +62,10 @@ void tmain() "name": "t20019_sequence", "participants": [ { + "display_name": "tmain()", "id": "375304196268652861", - "name": "clanguml::t20019::tmain()", + "name": "tmain", + "namespace": "clanguml::t20019", "source_location": { "column": 6, "file": "t20019.cc", @@ -73,8 +75,25 @@ void tmain() "type": "function" }, { + "activities": [ + { + "display_name": "name()", + "id": "1038853547136467401", + "name": "name", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20019.cc", + "line": 9, + "translation_unit": "t20019.cc" + }, + "type": "method" + } + ], + "display_name": "Base", "id": "381327373934972004", - "name": "clanguml::t20019::Base", + "name": "Base", + "namespace": "clanguml::t20019", "source_location": { "column": 33, "file": "t20019.cc", @@ -84,8 +103,25 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "impl()", + "id": "603969604599968603", + "name": "impl", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20019.cc", + "line": 13, + "translation_unit": "t20019.cc" + }, + "type": "method" + } + ], + "display_name": "D1", "id": "1282259011856139592", - "name": "clanguml::t20019::D1", + "name": "D1", + "namespace": "clanguml::t20019", "source_location": { "column": 8, "file": "t20019.cc", @@ -95,8 +131,25 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "name()", + "id": "1918672956676175365", + "name": "name", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20019.cc", + "line": 9, + "translation_unit": "t20019.cc" + }, + "type": "method" + } + ], + "display_name": "Base", "id": "1659477498076328530", - "name": "clanguml::t20019::Base", + "name": "Base", + "namespace": "clanguml::t20019", "source_location": { "column": 33, "file": "t20019.cc", @@ -106,8 +159,25 @@ void tmain() "type": "class" }, { + "activities": [ + { + "display_name": "impl()", + "id": "861400435979772695", + "name": "impl", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20019.cc", + "line": 17, + "translation_unit": "t20019.cc" + }, + "type": "method" + } + ], + "display_name": "D2", "id": "1307471723138212117", - "name": "clanguml::t20019::D2", + "name": "D2", + "namespace": "clanguml::t20019", "source_location": { "column": 8, "file": "t20019.cc", @@ -123,9 +193,7 @@ void tmain() { "from": { "activity_id": "375304196268652861", - "activity_name": "clanguml::t20019::tmain()", - "participant_id": "375304196268652861", - "participant_name": "clanguml::t20019::tmain()" + "participant_id": "375304196268652861" }, "name": "name()", "return_type": "void", @@ -138,7 +206,6 @@ void tmain() }, "to": { "activity_id": "1038853547136467401", - "activity_name": "clanguml::t20019::Base::name()", "participant_id": "381327373934972004" }, "type": "message" @@ -146,7 +213,6 @@ void tmain() { "from": { "activity_id": "1038853547136467401", - "activity_name": "clanguml::t20019::Base::name()", "participant_id": "381327373934972004" }, "name": "impl()", @@ -160,7 +226,6 @@ void tmain() }, "to": { "activity_id": "603969604599968603", - "activity_name": "clanguml::t20019::D1::impl()", "participant_id": "1282259011856139592" }, "type": "message" @@ -168,9 +233,7 @@ void tmain() { "from": { "activity_id": "375304196268652861", - "activity_name": "clanguml::t20019::tmain()", - "participant_id": "375304196268652861", - "participant_name": "clanguml::t20019::tmain()" + "participant_id": "375304196268652861" }, "name": "name()", "return_type": "void", @@ -183,7 +246,6 @@ void tmain() }, "to": { "activity_id": "1918672956676175365", - "activity_name": "clanguml::t20019::Base::name()", "participant_id": "1659477498076328530" }, "type": "message" @@ -191,7 +253,6 @@ void tmain() { "from": { "activity_id": "1918672956676175365", - "activity_name": "clanguml::t20019::Base::name()", "participant_id": "1659477498076328530" }, "name": "impl()", @@ -205,7 +266,6 @@ void tmain() }, "to": { "activity_id": "861400435979772695", - "activity_name": "clanguml::t20019::D2::impl()", "participant_id": "1307471723138212117" }, "type": "message" @@ -213,9 +273,7 @@ void tmain() { "from": { "activity_id": "375304196268652861", - "activity_name": "clanguml::t20019::tmain()", - "participant_id": "375304196268652861", - "participant_name": "clanguml::t20019::tmain()" + "participant_id": "375304196268652861" }, "name": "name()", "return_type": "void", @@ -228,7 +286,6 @@ void tmain() }, "to": { "activity_id": "1038853547136467401", - "activity_name": "clanguml::t20019::Base::name()", "participant_id": "381327373934972004" }, "type": "message" @@ -236,9 +293,7 @@ void tmain() { "from": { "activity_id": "375304196268652861", - "activity_name": "clanguml::t20019::tmain()", - "participant_id": "375304196268652861", - "participant_name": "clanguml::t20019::tmain()" + "participant_id": "375304196268652861" }, "name": "name()", "return_type": "void", @@ -251,7 +306,6 @@ void tmain() }, "to": { "activity_id": "1918672956676175365", - "activity_name": "clanguml::t20019::Base::name()", "participant_id": "1659477498076328530" }, "type": "message" diff --git a/docs/test_cases/t20019_sequence.svg b/docs/test_cases/t20019_sequence.svg index 56ea902d..ee0323af 100644 --- a/docs/test_cases/t20019_sequence.svg +++ b/docs/test_cases/t20019_sequence.svg @@ -1,100 +1,106 @@ - + + + + + + + - - - - - - - - - - - - - - - - - tmain() - - tmain() + + + + + + + + + + + + + + + + + tmain() + + tmain() - - - Base<D1> - - Base<D1> + + + Base<D1> + + Base<D1> - - - D1 - - D1 + + + D1 + + D1 - - - Base<D2> - - Base<D2> + + + Base<D2> + + Base<D2> - - - D2 - - D2 + + + D2 + + D2 - - - - - - - - - - - - - name() + + + + + + + + + + + + + name() - - - - impl() + + + + impl() - - - - name() + + + + name() - - - - impl() + + + + impl() - - - - name() + + + + name() - - - - impl() + + + + impl() - - - - name() + + + + name() - - - - impl() + + + + impl() diff --git a/docs/test_cases/t20019_sequence_mermaid.svg b/docs/test_cases/t20019_sequence_mermaid.svg index 0faa67ed..51597fd2 100644 --- a/docs/test_cases/t20019_sequence_mermaid.svg +++ b/docs/test_cases/t20019_sequence_mermaid.svg @@ -93,17 +93,17 @@ - + - + - + @@ -139,20 +139,20 @@ - name() - - impl() - - name() - - impl() - - name() - - impl() - - name() - - impl() - + name() + + impl() + + name() + + impl() + + name() + + impl() + + name() + + impl() + diff --git a/docs/test_cases/t20020.md b/docs/test_cases/t20020.md index 07fd03cf..26b80d87 100644 --- a/docs/test_cases/t20020.md +++ b/docs/test_cases/t20020.md @@ -118,8 +118,10 @@ int tmain() "name": "t20020_sequence", "participants": [ { + "display_name": "tmain()", "id": "432124388562400664", - "name": "clanguml::t20020::tmain()", + "name": "tmain", + "namespace": "clanguml::t20020", "source_location": { "column": 5, "file": "t20020.cc", @@ -129,8 +131,77 @@ int tmain() "type": "function" }, { + "activities": [ + { + "display_name": "a1()", + "id": "43928675765534701", + "name": "a1", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20020.cc", + "line": 7, + "translation_unit": "t20020.cc" + }, + "type": "method" + }, + { + "display_name": "a5()", + "id": "1613457246223182826", + "name": "a5", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20020.cc", + "line": 11, + "translation_unit": "t20020.cc" + }, + "type": "method" + }, + { + "display_name": "a2()", + "id": "1289745252290688140", + "name": "a2", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20020.cc", + "line": 8, + "translation_unit": "t20020.cc" + }, + "type": "method" + }, + { + "display_name": "a3()", + "id": "1983660679554669898", + "name": "a3", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20020.cc", + "line": 9, + "translation_unit": "t20020.cc" + }, + "type": "method" + }, + { + "display_name": "a4()", + "id": "20573198999978866", + "name": "a4", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20020.cc", + "line": 10, + "translation_unit": "t20020.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "208941846648931609", - "name": "clanguml::t20020::A", + "name": "A", + "namespace": "clanguml::t20020", "source_location": { "column": 8, "file": "t20020.cc", @@ -140,8 +211,64 @@ int tmain() "type": "class" }, { + "activities": [ + { + "display_name": "c3(int)", + "id": "1303438784842196201", + "name": "c3", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20020.cc", + "line": 32, + "translation_unit": "t20020.cc" + }, + "type": "method" + }, + { + "display_name": "c1() const", + "id": "1473521613404783653", + "name": "c1", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20020.cc", + "line": 24, + "translation_unit": "t20020.cc" + }, + "type": "method" + }, + { + "display_name": "c2() const", + "id": "1789116382725485914", + "name": "c2", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20020.cc", + "line": 30, + "translation_unit": "t20020.cc" + }, + "type": "method" + }, + { + "display_name": "log() const", + "id": "635780525021572670", + "name": "log", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20020.cc", + "line": 22, + "translation_unit": "t20020.cc" + }, + "type": "method" + } + ], + "display_name": "C", "id": "1562462306909405383", - "name": "clanguml::t20020::C", + "name": "C", + "namespace": "clanguml::t20020", "source_location": { "column": 8, "file": "t20020.cc", @@ -151,8 +278,51 @@ int tmain() "type": "class" }, { + "activities": [ + { + "display_name": "b1()", + "id": "542196582335607343", + "name": "b1", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20020.cc", + "line": 17, + "translation_unit": "t20020.cc" + }, + "type": "method" + }, + { + "display_name": "b2()", + "id": "505760236964179187", + "name": "b2", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20020.cc", + "line": 18, + "translation_unit": "t20020.cc" + }, + "type": "method" + }, + { + "display_name": "log()", + "id": "1436250788704205026", + "name": "log", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20020.cc", + "line": 15, + "translation_unit": "t20020.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "1342563483612170412", - "name": "clanguml::t20020::B", + "name": "B", + "namespace": "clanguml::t20020", "source_location": { "column": 8, "file": "t20020.cc", @@ -162,8 +332,25 @@ int tmain() "type": "class" }, { + "activities": [ + { + "display_name": "d1(int,int)", + "id": "1780002010052842766", + "name": "d1", + "namespace": "", + "source_location": { + "column": 7, + "file": "t20020.cc", + "line": 37, + "translation_unit": "t20020.cc" + }, + "type": "method" + } + ], + "display_name": "D", "id": "1605914310746811866", - "name": "clanguml::t20020::D", + "name": "D", + "namespace": "clanguml::t20020", "source_location": { "column": 30, "file": "t20020.cc", @@ -184,9 +371,7 @@ int tmain() { "from": { "activity_id": "432124388562400664", - "activity_name": "clanguml::t20020::tmain()", - "participant_id": "432124388562400664", - "participant_name": "clanguml::t20020::tmain()" + "participant_id": "432124388562400664" }, "name": "a1()", "return_type": "int", @@ -199,7 +384,6 @@ int tmain() }, "to": { "activity_id": "43928675765534701", - "activity_name": "clanguml::t20020::A::a1()", "participant_id": "208941846648931609" }, "type": "message" @@ -212,9 +396,7 @@ int tmain() { "from": { "activity_id": "432124388562400664", - "activity_name": "clanguml::t20020::tmain()", - "participant_id": "432124388562400664", - "participant_name": "clanguml::t20020::tmain()" + "participant_id": "432124388562400664" }, "name": "a5()", "return_type": "int", @@ -227,7 +409,6 @@ int tmain() }, "to": { "activity_id": "1613457246223182826", - "activity_name": "clanguml::t20020::A::a5()", "participant_id": "208941846648931609" }, "type": "message" @@ -245,9 +426,7 @@ int tmain() { "from": { "activity_id": "432124388562400664", - "activity_name": "clanguml::t20020::tmain()", - "participant_id": "432124388562400664", - "participant_name": "clanguml::t20020::tmain()" + "participant_id": "432124388562400664" }, "name": "a2()", "return_type": "int", @@ -260,7 +439,6 @@ int tmain() }, "to": { "activity_id": "1289745252290688140", - "activity_name": "clanguml::t20020::A::a2()", "participant_id": "208941846648931609" }, "type": "message" @@ -268,9 +446,7 @@ int tmain() { "from": { "activity_id": "432124388562400664", - "activity_name": "clanguml::t20020::tmain()", - "participant_id": "432124388562400664", - "participant_name": "clanguml::t20020::tmain()" + "participant_id": "432124388562400664" }, "name": "c3(int)", "return_type": "int", @@ -283,7 +459,6 @@ int tmain() }, "to": { "activity_id": "1303438784842196201", - "activity_name": "clanguml::t20020::C::c3(int)", "participant_id": "1562462306909405383" }, "type": "message" @@ -291,9 +466,7 @@ int tmain() { "from": { "activity_id": "432124388562400664", - "activity_name": "clanguml::t20020::tmain()", - "participant_id": "432124388562400664", - "participant_name": "clanguml::t20020::tmain()" + "participant_id": "432124388562400664" }, "name": "b1()", "return_type": "int", @@ -306,7 +479,6 @@ int tmain() }, "to": { "activity_id": "542196582335607343", - "activity_name": "clanguml::t20020::B::b1()", "participant_id": "1342563483612170412" }, "type": "message" @@ -319,9 +491,7 @@ int tmain() { "from": { "activity_id": "432124388562400664", - "activity_name": "clanguml::t20020::tmain()", - "participant_id": "432124388562400664", - "participant_name": "clanguml::t20020::tmain()" + "participant_id": "432124388562400664" }, "name": "a3()", "return_type": "int", @@ -334,7 +504,6 @@ int tmain() }, "to": { "activity_id": "1983660679554669898", - "activity_name": "clanguml::t20020::A::a3()", "participant_id": "208941846648931609" }, "type": "message" @@ -342,9 +511,7 @@ int tmain() { "from": { "activity_id": "432124388562400664", - "activity_name": "clanguml::t20020::tmain()", - "participant_id": "432124388562400664", - "participant_name": "clanguml::t20020::tmain()" + "participant_id": "432124388562400664" }, "name": "b2()", "return_type": "int", @@ -357,7 +524,6 @@ int tmain() }, "to": { "activity_id": "505760236964179187", - "activity_name": "clanguml::t20020::B::b2()", "participant_id": "1342563483612170412" }, "type": "message" @@ -377,9 +543,7 @@ int tmain() { "from": { "activity_id": "432124388562400664", - "activity_name": "clanguml::t20020::tmain()", - "participant_id": "432124388562400664", - "participant_name": "clanguml::t20020::tmain()" + "participant_id": "432124388562400664" }, "name": "a4()", "return_type": "int", @@ -392,7 +556,6 @@ int tmain() }, "to": { "activity_id": "20573198999978866", - "activity_name": "clanguml::t20020::A::a4()", "participant_id": "208941846648931609" }, "type": "message" @@ -407,9 +570,7 @@ int tmain() { "from": { "activity_id": "432124388562400664", - "activity_name": "clanguml::t20020::tmain()", - "participant_id": "432124388562400664", - "participant_name": "clanguml::t20020::tmain()" + "participant_id": "432124388562400664" }, "name": "log()", "return_type": "void", @@ -422,7 +583,6 @@ int tmain() }, "to": { "activity_id": "1436250788704205026", - "activity_name": "clanguml::t20020::B::log()", "participant_id": "1342563483612170412" }, "type": "message" @@ -435,9 +595,7 @@ int tmain() { "from": { "activity_id": "432124388562400664", - "activity_name": "clanguml::t20020::tmain()", - "participant_id": "432124388562400664", - "participant_name": "clanguml::t20020::tmain()" + "participant_id": "432124388562400664" }, "name": "c1() const", "return_type": "void", @@ -450,7 +608,6 @@ int tmain() }, "to": { "activity_id": "1473521613404783653", - "activity_name": "clanguml::t20020::C::c1() const", "participant_id": "1562462306909405383" }, "type": "message" @@ -463,7 +620,6 @@ int tmain() { "from": { "activity_id": "1473521613404783653", - "activity_name": "clanguml::t20020::C::c1() const", "participant_id": "1562462306909405383" }, "name": "c2() const", @@ -477,7 +633,6 @@ int tmain() }, "to": { "activity_id": "1789116382725485914", - "activity_name": "clanguml::t20020::C::c2() const", "participant_id": "1562462306909405383" }, "type": "message" @@ -485,7 +640,6 @@ int tmain() { "from": { "activity_id": "1473521613404783653", - "activity_name": "clanguml::t20020::C::c1() const", "participant_id": "1562462306909405383" }, "name": "log() const", @@ -499,7 +653,6 @@ int tmain() }, "to": { "activity_id": "635780525021572670", - "activity_name": "clanguml::t20020::C::log() const", "participant_id": "1562462306909405383" }, "type": "message" @@ -526,9 +679,7 @@ int tmain() { "from": { "activity_id": "432124388562400664", - "activity_name": "clanguml::t20020::tmain()", - "participant_id": "432124388562400664", - "participant_name": "clanguml::t20020::tmain()" + "participant_id": "432124388562400664" }, "name": "d1(int,int)", "return_type": "int", @@ -541,7 +692,6 @@ int tmain() }, "to": { "activity_id": "1780002010052842766", - "activity_name": "clanguml::t20020::D::d1(int,int)", "participant_id": "1605914310746811866" }, "type": "message" diff --git a/docs/test_cases/t20020_sequence.svg b/docs/test_cases/t20020_sequence.svg index f03f9db4..105d3614 100644 --- a/docs/test_cases/t20020_sequence.svg +++ b/docs/test_cases/t20020_sequence.svg @@ -1,193 +1,203 @@ - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - tmain() - - tmain() + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + tmain() + + tmain() - - - A - - A + + + A + + A - - - C - - C + + + C + + C - - - B - - B + + + B + + B - - - D<int> - - D<int> + + + D<int> + + D<int> - - - - - - - - - - - - - - - - - alt - - - - a1() + + + + + + + + + + + + + + + + + alt + + + + a1() - - - - - - - a5() + + + + + + + a5() - - - - - - alt - - - - [ - a2() - ] + + + + + + alt + + + + [ + a2() + ] - - - - - - [ - c3(int) - ] + + + + + + [ + c3(int) + ] - - - - - - b1() + + + + + + b1() - - - - - - - [ - a3() - ] + + + + + + + [ + a3() + ] - - - - - - b2() + + + + + + b2() - - - - - - - a4() + + + + + + + a4() - - - - - - log() + + + + + + log() - - - alt - - - - c1() const + + + alt + + + + c1() const - - - alt - - - - - - [ - c2() const - ] + + + alt + + + + + + [ + c2() const + ] - - - - - - - - - - log() const + + + + + + + + + + log() const - - - alt - - - - d1(int,int) + + + alt + + + + d1(int,int) - - + + diff --git a/docs/test_cases/t20020_sequence_mermaid.svg b/docs/test_cases/t20020_sequence_mermaid.svg index 5d5264f7..df3f9b5a 100644 --- a/docs/test_cases/t20020_sequence_mermaid.svg +++ b/docs/test_cases/t20020_sequence_mermaid.svg @@ -93,17 +93,17 @@ - + - + - + @@ -213,50 +213,50 @@ ​ - a1() - - ​ - - a5() - - ​ - - [a2()] - - ​ - - [c3(int)] - - ​ - - b1() - - ​ - - [a3()] - - ​ - - b2() - - ​ - - a4() - - ​ - - log() - - c1() const - + a1() + + ​ + + a5() + + ​ + + [a2()] + + ​ + + [c3(int)] + + ​ + + b1() + + ​ + + [a3()] + + ​ + + b2() + + ​ + + a4() + + ​ + + log() + + c1() const + [c2() const] ​ log() const - d1(int,int) - - ​ - + d1(int,int) + + ​ + diff --git a/docs/test_cases/t20021.md b/docs/test_cases/t20021.md index dd372543..aaa507b9 100644 --- a/docs/test_cases/t20021.md +++ b/docs/test_cases/t20021.md @@ -85,8 +85,10 @@ int tmain() "name": "t20021_sequence", "participants": [ { + "display_name": "tmain()", "id": "1682631020380557915", - "name": "clanguml::t20021::tmain()", + "name": "tmain", + "namespace": "clanguml::t20021", "source_location": { "column": 5, "file": "t20021.cc", @@ -96,8 +98,90 @@ int tmain() "type": "function" }, { + "activities": [ + { + "display_name": "c4()", + "id": "124927877622321176", + "name": "c4", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20021.cc", + "line": 22, + "translation_unit": "t20021.cc" + }, + "type": "method" + }, + { + "display_name": "c5()", + "id": "1325720714179808628", + "name": "c5", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20021.cc", + "line": 23, + "translation_unit": "t20021.cc" + }, + "type": "method" + }, + { + "display_name": "c1()", + "id": "2143764740072323303", + "name": "c1", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20021.cc", + "line": 19, + "translation_unit": "t20021.cc" + }, + "type": "method" + }, + { + "display_name": "c2()", + "id": "1707693479408501017", + "name": "c2", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20021.cc", + "line": 20, + "translation_unit": "t20021.cc" + }, + "type": "method" + }, + { + "display_name": "c3()", + "id": "1302892753246800390", + "name": "c3", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20021.cc", + "line": 21, + "translation_unit": "t20021.cc" + }, + "type": "method" + }, + { + "display_name": "contents()", + "id": "814405216385697964", + "name": "contents", + "namespace": "", + "source_location": { + "column": 23, + "file": "t20021.cc", + "line": 25, + "translation_unit": "t20021.cc" + }, + "type": "method" + } + ], + "display_name": "C", "id": "451128000259357438", - "name": "clanguml::t20021::C", + "name": "C", + "namespace": "clanguml::t20021", "source_location": { "column": 8, "file": "t20021.cc", @@ -107,8 +191,51 @@ int tmain() "type": "class" }, { + "activities": [ + { + "display_name": "a3()", + "id": "1867955233624891190", + "name": "a3", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20021.cc", + "line": 8, + "translation_unit": "t20021.cc" + }, + "type": "method" + }, + { + "display_name": "a2()", + "id": "1139294797758415018", + "name": "a2", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20021.cc", + "line": 7, + "translation_unit": "t20021.cc" + }, + "type": "method" + }, + { + "display_name": "a1()", + "id": "1659488549696810992", + "name": "a1", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20021.cc", + "line": 6, + "translation_unit": "t20021.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "1280483607329510730", - "name": "clanguml::t20021::A", + "name": "A", + "namespace": "clanguml::t20021", "source_location": { "column": 8, "file": "t20021.cc", @@ -118,8 +245,25 @@ int tmain() "type": "class" }, { + "activities": [ + { + "display_name": "b2() const", + "id": "1561040999276563077", + "name": "b2", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20021.cc", + "line": 15, + "translation_unit": "t20021.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "1849696080443395393", - "name": "clanguml::t20021::B", + "name": "B", + "namespace": "clanguml::t20021", "source_location": { "column": 8, "file": "t20021.cc", @@ -138,9 +282,7 @@ int tmain() { "from": { "activity_id": "1682631020380557915", - "activity_name": "clanguml::t20021::tmain()", - "participant_id": "1682631020380557915", - "participant_name": "clanguml::t20021::tmain()" + "participant_id": "1682631020380557915" }, "name": "c4()", "return_type": "int", @@ -153,7 +295,6 @@ int tmain() }, "to": { "activity_id": "124927877622321176", - "activity_name": "clanguml::t20021::C::c4()", "participant_id": "451128000259357438" }, "type": "message" @@ -161,7 +302,6 @@ int tmain() { "from": { "activity_id": "124927877622321176", - "activity_name": "clanguml::t20021::C::c4()", "participant_id": "451128000259357438" }, "name": "c5()", @@ -175,7 +315,6 @@ int tmain() }, "to": { "activity_id": "1325720714179808628", - "activity_name": "clanguml::t20021::C::c5()", "participant_id": "451128000259357438" }, "type": "message" @@ -183,9 +322,7 @@ int tmain() { "from": { "activity_id": "1682631020380557915", - "activity_name": "clanguml::t20021::tmain()", - "participant_id": "1682631020380557915", - "participant_name": "clanguml::t20021::tmain()" + "participant_id": "1682631020380557915" }, "name": "a3()", "return_type": "int", @@ -198,7 +335,6 @@ int tmain() }, "to": { "activity_id": "1867955233624891190", - "activity_name": "clanguml::t20021::A::a3()", "participant_id": "1280483607329510730" }, "type": "message" @@ -212,9 +348,7 @@ int tmain() { "from": { "activity_id": "1682631020380557915", - "activity_name": "clanguml::t20021::tmain()", - "participant_id": "1682631020380557915", - "participant_name": "clanguml::t20021::tmain()" + "participant_id": "1682631020380557915" }, "name": "a2()", "return_type": "int", @@ -227,7 +361,6 @@ int tmain() }, "to": { "activity_id": "1139294797758415018", - "activity_name": "clanguml::t20021::A::a2()", "participant_id": "1280483607329510730" }, "type": "message" @@ -235,9 +368,7 @@ int tmain() { "from": { "activity_id": "1682631020380557915", - "activity_name": "clanguml::t20021::tmain()", - "participant_id": "1682631020380557915", - "participant_name": "clanguml::t20021::tmain()" + "participant_id": "1682631020380557915" }, "name": "c1()", "return_type": "int", @@ -250,7 +381,6 @@ int tmain() }, "to": { "activity_id": "2143764740072323303", - "activity_name": "clanguml::t20021::C::c1()", "participant_id": "451128000259357438" }, "type": "message" @@ -258,9 +388,7 @@ int tmain() { "from": { "activity_id": "1682631020380557915", - "activity_name": "clanguml::t20021::tmain()", - "participant_id": "1682631020380557915", - "participant_name": "clanguml::t20021::tmain()" + "participant_id": "1682631020380557915" }, "name": "c2()", "return_type": "int", @@ -273,7 +401,6 @@ int tmain() }, "to": { "activity_id": "1707693479408501017", - "activity_name": "clanguml::t20021::C::c2()", "participant_id": "451128000259357438" }, "type": "message" @@ -281,9 +408,7 @@ int tmain() { "from": { "activity_id": "1682631020380557915", - "activity_name": "clanguml::t20021::tmain()", - "participant_id": "1682631020380557915", - "participant_name": "clanguml::t20021::tmain()" + "participant_id": "1682631020380557915" }, "name": "a1()", "return_type": "int", @@ -296,7 +421,6 @@ int tmain() }, "to": { "activity_id": "1659488549696810992", - "activity_name": "clanguml::t20021::A::a1()", "participant_id": "1280483607329510730" }, "type": "message" @@ -308,9 +432,7 @@ int tmain() { "from": { "activity_id": "1682631020380557915", - "activity_name": "clanguml::t20021::tmain()", - "participant_id": "1682631020380557915", - "participant_name": "clanguml::t20021::tmain()" + "participant_id": "1682631020380557915" }, "name": "c3()", "return_type": "int", @@ -323,7 +445,6 @@ int tmain() }, "to": { "activity_id": "1302892753246800390", - "activity_name": "clanguml::t20021::C::c3()", "participant_id": "451128000259357438" }, "type": "message" @@ -342,9 +463,7 @@ int tmain() { "from": { "activity_id": "1682631020380557915", - "activity_name": "clanguml::t20021::tmain()", - "participant_id": "1682631020380557915", - "participant_name": "clanguml::t20021::tmain()" + "participant_id": "1682631020380557915" }, "name": "b2() const", "return_type": "int", @@ -357,7 +476,6 @@ int tmain() }, "to": { "activity_id": "1561040999276563077", - "activity_name": "clanguml::t20021::B::b2() const", "participant_id": "1849696080443395393" }, "type": "message" @@ -372,9 +490,7 @@ int tmain() { "from": { "activity_id": "1682631020380557915", - "activity_name": "clanguml::t20021::tmain()", - "participant_id": "1682631020380557915", - "participant_name": "clanguml::t20021::tmain()" + "participant_id": "1682631020380557915" }, "name": "contents()", "return_type": "std::vector &", @@ -387,7 +503,6 @@ int tmain() }, "to": { "activity_id": "814405216385697964", - "activity_name": "clanguml::t20021::C::contents()", "participant_id": "451128000259357438" }, "type": "message" @@ -399,9 +514,7 @@ int tmain() { "from": { "activity_id": "1682631020380557915", - "activity_name": "clanguml::t20021::tmain()", - "participant_id": "1682631020380557915", - "participant_name": "clanguml::t20021::tmain()" + "participant_id": "1682631020380557915" }, "name": "b2() const", "return_type": "int", @@ -414,7 +527,6 @@ int tmain() }, "to": { "activity_id": "1561040999276563077", - "activity_name": "clanguml::t20021::B::b2() const", "participant_id": "1849696080443395393" }, "type": "message" diff --git a/docs/test_cases/t20021_sequence.svg b/docs/test_cases/t20021_sequence.svg index 42f16e13..420f0175 100644 --- a/docs/test_cases/t20021_sequence.svg +++ b/docs/test_cases/t20021_sequence.svg @@ -1,172 +1,178 @@ - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - tmain() - - tmain() + + + + + + + + + + + + + + + + + + + + + + + + tmain() + + tmain() - - - C - - C + + + C + + C - - - A - - A + + + A + + A - - - B - - B + + + B + + B - - - - - - - - - - - - - - - loop - - - - [ - c4() - ] + + + + + + + + + + + + + + + loop + + + + [ + c4() + ] - - - - - - c5() + + + + + + c5() - - - - - - - - - - a3() + + + + + + + + + + a3() - - - - - loop - - - loop - - - - [ - a2() - ] + + + + + loop + + + loop + + + + [ + a2() + ] - - - - - - [ - c1() - ] + + + + + + [ + c1() + ] - - - - - - [ - c2() - ] + + + + + + [ + c2() + ] - - - - - - a1() + + + + + + a1() - - - - - - [ - c3() - ] + + + + + + [ + c3() + ] - - - - - loop - - - - b2() const + + + + + loop + + + + b2() const - - - - - loop - - - - [ - contents() - ] + + + + + loop + + + + [ + contents() + ] - - - - - - b2() const + + + + + + b2() const - - + + diff --git a/docs/test_cases/t20021_sequence_mermaid.svg b/docs/test_cases/t20021_sequence_mermaid.svg index 304da27e..5b801fd5 100644 --- a/docs/test_cases/t20021_sequence_mermaid.svg +++ b/docs/test_cases/t20021_sequence_mermaid.svg @@ -78,17 +78,17 @@ - + - + - + @@ -188,48 +188,48 @@ - [c4()] - + [c4()] + c5() ​ - ​ - - a3() - - ​ - - [a2()] - - ​ - - [c1()] - - ​ - - [c2()] - - ​ - - a1() - - ​ - - [c3()] - - ​ - - b2() const - - ​ - - [contents()] - - ​ - - b2() const - - ​ - + ​ + + a3() + + ​ + + [a2()] + + ​ + + [c1()] + + ​ + + [c2()] + + ​ + + a1() + + ​ + + [c3()] + + ​ + + b2() const + + ​ + + [contents()] + + ​ + + b2() const + + ​ + diff --git a/docs/test_cases/t20022.md b/docs/test_cases/t20022.md index 4227c200..3a5b201f 100644 --- a/docs/test_cases/t20022.md +++ b/docs/test_cases/t20022.md @@ -65,8 +65,10 @@ int tmain() "name": "t20022_sequence", "participants": [ { + "display_name": "tmain()", "id": "1374011101998494743", - "name": "clanguml::t20022::tmain()", + "name": "tmain", + "namespace": "clanguml::t20022", "source_location": { "column": 5, "file": "t20022.cc", @@ -76,8 +78,38 @@ int tmain() "type": "function" }, { + "activities": [ + { + "display_name": "A(std::unique_ptr)", + "id": "1226569306557207632", + "name": "A", + "namespace": "", + "source_location": { + "column": 4, + "file": "t20022.cc", + "line": 21, + "translation_unit": "t20022.cc" + }, + "type": "method" + }, + { + "display_name": "a()", + "id": "1158824701633811441", + "name": "a", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20022.cc", + "line": 26, + "translation_unit": "t20022.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "1535467498096081224", - "name": "clanguml::t20022::A", + "name": "A", + "namespace": "clanguml::t20022", "source_location": { "column": 7, "file": "t20022.cc", @@ -87,8 +119,25 @@ int tmain() "type": "class" }, { + "activities": [ + { + "display_name": "b()", + "id": "2114222968575993291", + "name": "b", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20022.cc", + "line": 18, + "translation_unit": "t20022.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "1316821731069034940", - "name": "clanguml::t20022::B", + "name": "B", + "namespace": "clanguml::t20022", "source_location": { "column": 7, "file": "t20022.cc", @@ -104,9 +153,7 @@ int tmain() { "from": { "activity_id": "1374011101998494743", - "activity_name": "clanguml::t20022::tmain()", - "participant_id": "1374011101998494743", - "participant_name": "clanguml::t20022::tmain()" + "participant_id": "1374011101998494743" }, "name": "A(std::unique_ptr)", "return_type": "void", @@ -119,7 +166,6 @@ int tmain() }, "to": { "activity_id": "1226569306557207632", - "activity_name": "clanguml::t20022::A::A(std::unique_ptr)", "participant_id": "1535467498096081224" }, "type": "message" @@ -127,9 +173,7 @@ int tmain() { "from": { "activity_id": "1374011101998494743", - "activity_name": "clanguml::t20022::tmain()", - "participant_id": "1374011101998494743", - "participant_name": "clanguml::t20022::tmain()" + "participant_id": "1374011101998494743" }, "name": "a()", "return_type": "void", @@ -142,7 +186,6 @@ int tmain() }, "to": { "activity_id": "1158824701633811441", - "activity_name": "clanguml::t20022::A::a()", "participant_id": "1535467498096081224" }, "type": "message" @@ -150,7 +193,6 @@ int tmain() { "from": { "activity_id": "1158824701633811441", - "activity_name": "clanguml::t20022::A::a()", "participant_id": "1535467498096081224" }, "name": "b()", @@ -164,7 +206,6 @@ int tmain() }, "to": { "activity_id": "2114222968575993291", - "activity_name": "clanguml::t20022::B::b()", "participant_id": "1316821731069034940" }, "type": "message" diff --git a/docs/test_cases/t20022_sequence.svg b/docs/test_cases/t20022_sequence.svg index 45010b5c..49ddfb09 100644 --- a/docs/test_cases/t20022_sequence.svg +++ b/docs/test_cases/t20022_sequence.svg @@ -1,52 +1,58 @@ - + + + + + + + - - - - - - - - - - tmain() - - tmain() + + + + + + + + + + tmain() + + tmain() - - - A - - A + + + A + + A - - - B - - B + + + B + + B - - - - - - - - A(std::unique_ptr - ) + + + + + + + + A(std::unique_ptr + ) - - - - a() + + + + a() - - - - b() + + + + b() diff --git a/docs/test_cases/t20022_sequence_mermaid.svg b/docs/test_cases/t20022_sequence_mermaid.svg index d5311f88..d9408adc 100644 --- a/docs/test_cases/t20022_sequence_mermaid.svg +++ b/docs/test_cases/t20022_sequence_mermaid.svg @@ -63,17 +63,17 @@ - + - + - + @@ -94,10 +94,10 @@ - A(std::unique_ptr<B>) - - a() - - b() - + A(std::unique_ptr<B>) + + a() + + b() + diff --git a/docs/test_cases/t20023.md b/docs/test_cases/t20023.md index 46a8368f..2c6e8223 100644 --- a/docs/test_cases/t20023.md +++ b/docs/test_cases/t20023.md @@ -68,8 +68,10 @@ int tmain() "name": "t20023_sequence", "participants": [ { + "display_name": "tmain()", "id": "761552264135157511", - "name": "clanguml::t20023::tmain()", + "name": "tmain", + "namespace": "clanguml::t20023", "source_location": { "column": 5, "file": "t20023.cc", @@ -79,8 +81,77 @@ int tmain() "type": "function" }, { + "activities": [ + { + "display_name": "a()", + "id": "530651320277188697", + "name": "a", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20023.cc", + "line": 12, + "translation_unit": "t20023.cc" + }, + "type": "method" + }, + { + "display_name": "a1()", + "id": "94135113932519208", + "name": "a1", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20023.cc", + "line": 7, + "translation_unit": "t20023.cc" + }, + "type": "method" + }, + { + "display_name": "a2()", + "id": "2060438178899014465", + "name": "a2", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20023.cc", + "line": 8, + "translation_unit": "t20023.cc" + }, + "type": "method" + }, + { + "display_name": "a3()", + "id": "1776927259621603017", + "name": "a3", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20023.cc", + "line": 9, + "translation_unit": "t20023.cc" + }, + "type": "method" + }, + { + "display_name": "a4()", + "id": "1082587698374248813", + "name": "a4", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20023.cc", + "line": 10, + "translation_unit": "t20023.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "750638294800359616", - "name": "clanguml::t20023::A", + "name": "A", + "namespace": "clanguml::t20023", "source_location": { "column": 8, "file": "t20023.cc", @@ -96,9 +167,7 @@ int tmain() { "from": { "activity_id": "761552264135157511", - "activity_name": "clanguml::t20023::tmain()", - "participant_id": "761552264135157511", - "participant_name": "clanguml::t20023::tmain()" + "participant_id": "761552264135157511" }, "name": "a()", "return_type": "int", @@ -111,7 +180,6 @@ int tmain() }, "to": { "activity_id": "530651320277188697", - "activity_name": "clanguml::t20023::A::a()", "participant_id": "750638294800359616" }, "type": "message" @@ -124,7 +192,6 @@ int tmain() { "from": { "activity_id": "530651320277188697", - "activity_name": "clanguml::t20023::A::a()", "participant_id": "750638294800359616" }, "name": "a1()", @@ -138,7 +205,6 @@ int tmain() }, "to": { "activity_id": "94135113932519208", - "activity_name": "clanguml::t20023::A::a1()", "participant_id": "750638294800359616" }, "type": "message" @@ -151,7 +217,6 @@ int tmain() { "from": { "activity_id": "530651320277188697", - "activity_name": "clanguml::t20023::A::a()", "participant_id": "750638294800359616" }, "name": "a2()", @@ -165,7 +230,6 @@ int tmain() }, "to": { "activity_id": "2060438178899014465", - "activity_name": "clanguml::t20023::A::a2()", "participant_id": "750638294800359616" }, "type": "message" @@ -178,7 +242,6 @@ int tmain() { "from": { "activity_id": "530651320277188697", - "activity_name": "clanguml::t20023::A::a()", "participant_id": "750638294800359616" }, "name": "a3()", @@ -192,7 +255,6 @@ int tmain() }, "to": { "activity_id": "1776927259621603017", - "activity_name": "clanguml::t20023::A::a3()", "participant_id": "750638294800359616" }, "type": "message" @@ -205,7 +267,6 @@ int tmain() { "from": { "activity_id": "530651320277188697", - "activity_name": "clanguml::t20023::A::a()", "participant_id": "750638294800359616" }, "name": "a4()", @@ -219,7 +280,6 @@ int tmain() }, "to": { "activity_id": "1082587698374248813", - "activity_name": "clanguml::t20023::A::a4()", "participant_id": "750638294800359616" }, "type": "message" diff --git a/docs/test_cases/t20023_sequence.svg b/docs/test_cases/t20023_sequence.svg index 4b194beb..e2aa8b90 100644 --- a/docs/test_cases/t20023_sequence.svg +++ b/docs/test_cases/t20023_sequence.svg @@ -1,94 +1,103 @@ - + + + + + + + - - - - - - - - - - - - tmain() - - tmain() + + + + + + + + + + + + + + + tmain() + + tmain() - - - A - - A + + + A + + A - - - - - - - - - - a() + + + + + + + + + + a() - - - try - - - - - - a1() + + + try + + + + + + a1() - - - - - - [std::runtime_error &] - - - - - - a2() + + + + + + [std::runtime_error &] + + + + + + a2() - - - - - - [std::logic_error &] - - - - - - a3() + + + + + + [std::logic_error &] + + + + + + a3() - - - - - - [...] - - - - - - a4() + + + + + + [...] + + + + + + a4() - - - - - - + + + + + + diff --git a/docs/test_cases/t20023_sequence_mermaid.svg b/docs/test_cases/t20023_sequence_mermaid.svg index fd33db0c..724fa9de 100644 --- a/docs/test_cases/t20023_sequence_mermaid.svg +++ b/docs/test_cases/t20023_sequence_mermaid.svg @@ -48,17 +48,17 @@ - + - + - + @@ -104,8 +104,8 @@ rror &] [...] - a() - + a() + a1() ​ @@ -122,6 +122,6 @@ ​ - ​ - + ​ + diff --git a/docs/test_cases/t20024.md b/docs/test_cases/t20024.md index 421c3b2b..83fdb4c9 100644 --- a/docs/test_cases/t20024.md +++ b/docs/test_cases/t20024.md @@ -93,8 +93,10 @@ int tmain() "name": "t20024_sequence", "participants": [ { + "display_name": "tmain()", "id": "1919714441225983014", - "name": "clanguml::t20024::tmain()", + "name": "tmain", + "namespace": "clanguml::t20024", "source_location": { "column": 5, "file": "t20024.cc", @@ -104,8 +106,77 @@ int tmain() "type": "function" }, { + "activities": [ + { + "display_name": "select(enum_a)", + "id": "1200587047701031901", + "name": "select", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20024.cc", + "line": 9, + "translation_unit": "t20024.cc" + }, + "type": "method" + }, + { + "display_name": "a0()", + "id": "1859614580641799156", + "name": "a0", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20024.cc", + "line": 23, + "translation_unit": "t20024.cc" + }, + "type": "method" + }, + { + "display_name": "a1()", + "id": "501598940454911460", + "name": "a1", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20024.cc", + "line": 24, + "translation_unit": "t20024.cc" + }, + "type": "method" + }, + { + "display_name": "a2()", + "id": "1698866541173753340", + "name": "a2", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20024.cc", + "line": 25, + "translation_unit": "t20024.cc" + }, + "type": "method" + }, + { + "display_name": "a3()", + "id": "490376438551958259", + "name": "a3", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20024.cc", + "line": 26, + "translation_unit": "t20024.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "40786919835708828", - "name": "clanguml::t20024::A", + "name": "A", + "namespace": "clanguml::t20024", "source_location": { "column": 8, "file": "t20024.cc", @@ -115,8 +186,77 @@ int tmain() "type": "class" }, { + "activities": [ + { + "display_name": "select(colors)", + "id": "286108218156977422", + "name": "select", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20024.cc", + "line": 30, + "translation_unit": "t20024.cc" + }, + "type": "method" + }, + { + "display_name": "red()", + "id": "112014563206084467", + "name": "red", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20024.cc", + "line": 47, + "translation_unit": "t20024.cc" + }, + "type": "method" + }, + { + "display_name": "orange()", + "id": "2222823236498505185", + "name": "orange", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20024.cc", + "line": 48, + "translation_unit": "t20024.cc" + }, + "type": "method" + }, + { + "display_name": "green()", + "id": "519021723720658376", + "name": "green", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20024.cc", + "line": 49, + "translation_unit": "t20024.cc" + }, + "type": "method" + }, + { + "display_name": "grey()", + "id": "1813557671878544737", + "name": "grey", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20024.cc", + "line": 50, + "translation_unit": "t20024.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "933287014626440872", - "name": "clanguml::t20024::B", + "name": "B", + "namespace": "clanguml::t20024", "source_location": { "column": 8, "file": "t20024.cc", @@ -132,9 +272,7 @@ int tmain() { "from": { "activity_id": "1919714441225983014", - "activity_name": "clanguml::t20024::tmain()", - "participant_id": "1919714441225983014", - "participant_name": "clanguml::t20024::tmain()" + "participant_id": "1919714441225983014" }, "name": "select(enum_a)", "return_type": "int", @@ -147,7 +285,6 @@ int tmain() }, "to": { "activity_id": "1200587047701031901", - "activity_name": "clanguml::t20024::A::select(enum_a)", "participant_id": "40786919835708828" }, "type": "message" @@ -160,7 +297,6 @@ int tmain() { "from": { "activity_id": "1200587047701031901", - "activity_name": "clanguml::t20024::A::select(enum_a)", "participant_id": "40786919835708828" }, "name": "a0()", @@ -174,7 +310,6 @@ int tmain() }, "to": { "activity_id": "1859614580641799156", - "activity_name": "clanguml::t20024::A::a0()", "participant_id": "40786919835708828" }, "type": "message" @@ -188,7 +323,6 @@ int tmain() { "from": { "activity_id": "1200587047701031901", - "activity_name": "clanguml::t20024::A::select(enum_a)", "participant_id": "40786919835708828" }, "name": "a1()", @@ -202,7 +336,6 @@ int tmain() }, "to": { "activity_id": "501598940454911460", - "activity_name": "clanguml::t20024::A::a1()", "participant_id": "40786919835708828" }, "type": "message" @@ -216,7 +349,6 @@ int tmain() { "from": { "activity_id": "1200587047701031901", - "activity_name": "clanguml::t20024::A::select(enum_a)", "participant_id": "40786919835708828" }, "name": "a2()", @@ -230,7 +362,6 @@ int tmain() }, "to": { "activity_id": "1698866541173753340", - "activity_name": "clanguml::t20024::A::a2()", "participant_id": "40786919835708828" }, "type": "message" @@ -244,7 +375,6 @@ int tmain() { "from": { "activity_id": "1200587047701031901", - "activity_name": "clanguml::t20024::A::select(enum_a)", "participant_id": "40786919835708828" }, "name": "a3()", @@ -258,7 +388,6 @@ int tmain() }, "to": { "activity_id": "490376438551958259", - "activity_name": "clanguml::t20024::A::a3()", "participant_id": "40786919835708828" }, "type": "message" @@ -274,9 +403,7 @@ int tmain() { "from": { "activity_id": "1919714441225983014", - "activity_name": "clanguml::t20024::tmain()", - "participant_id": "1919714441225983014", - "participant_name": "clanguml::t20024::tmain()" + "participant_id": "1919714441225983014" }, "name": "select(colors)", "return_type": "void", @@ -289,7 +416,6 @@ int tmain() }, "to": { "activity_id": "286108218156977422", - "activity_name": "clanguml::t20024::B::select(colors)", "participant_id": "933287014626440872" }, "type": "message" @@ -302,7 +428,6 @@ int tmain() { "from": { "activity_id": "286108218156977422", - "activity_name": "clanguml::t20024::B::select(colors)", "participant_id": "933287014626440872" }, "name": "red()", @@ -316,7 +441,6 @@ int tmain() }, "to": { "activity_id": "112014563206084467", - "activity_name": "clanguml::t20024::B::red()", "participant_id": "933287014626440872" }, "type": "message" @@ -330,7 +454,6 @@ int tmain() { "from": { "activity_id": "286108218156977422", - "activity_name": "clanguml::t20024::B::select(colors)", "participant_id": "933287014626440872" }, "name": "orange()", @@ -344,7 +467,6 @@ int tmain() }, "to": { "activity_id": "2222823236498505185", - "activity_name": "clanguml::t20024::B::orange()", "participant_id": "933287014626440872" }, "type": "message" @@ -358,7 +480,6 @@ int tmain() { "from": { "activity_id": "286108218156977422", - "activity_name": "clanguml::t20024::B::select(colors)", "participant_id": "933287014626440872" }, "name": "green()", @@ -372,7 +493,6 @@ int tmain() }, "to": { "activity_id": "519021723720658376", - "activity_name": "clanguml::t20024::B::green()", "participant_id": "933287014626440872" }, "type": "message" @@ -386,7 +506,6 @@ int tmain() { "from": { "activity_id": "286108218156977422", - "activity_name": "clanguml::t20024::B::select(colors)", "participant_id": "933287014626440872" }, "name": "grey()", @@ -400,7 +519,6 @@ int tmain() }, "to": { "activity_id": "1813557671878544737", - "activity_name": "clanguml::t20024::B::grey()", "participant_id": "933287014626440872" }, "type": "message" diff --git a/docs/test_cases/t20024_sequence.svg b/docs/test_cases/t20024_sequence.svg index 09ffcf86..7d41ac6e 100644 --- a/docs/test_cases/t20024_sequence.svg +++ b/docs/test_cases/t20024_sequence.svg @@ -1,158 +1,172 @@ - + + + + + + + - - - - - - - - - - - - - - - - - - - tmain() - - tmain() + + + + + + + + + + + + + + + + + + + + + + + + + + + tmain() + + tmain() - - - A - - A + + + A + + A - - - B - - B + + + B + + B - - - - - - - - - - - - - - - select(enum_a) + + + + + + + + + + + + + + + select(enum_a) - - - switch - - [zero] - - - - - - a0() + + + switch + + [zero] + + + + + + a0() - - - - - - [one] - - - - - - a1() + + + + + + [one] + + + + + + a1() - - - - - - [two] - - - - - - a2() + + + + + + [two] + + + + + + a2() - - - - - - [default] - - - - - - a3() + + + + + + [default] + + + + + + a3() - - - - - - - - - - select(colors) + + + + + + + + + + select(colors) - - - switch - - [enum colors::red] - - - - - - red() + + + switch + + [enum colors::red] + + + + + + red() - - [enum colors::orange] - - - - - - orange() + + [enum colors::orange] + + + + + + orange() - - [enum colors::green] - - - - - - green() + + [enum colors::green] + + + + + + green() - - [default] - - - - - - grey() + + [default] + + + + + + grey() diff --git a/docs/test_cases/t20024_sequence_mermaid.svg b/docs/test_cases/t20024_sequence_mermaid.svg index b75ef24a..f7db7c3e 100644 --- a/docs/test_cases/t20024_sequence_mermaid.svg +++ b/docs/test_cases/t20024_sequence_mermaid.svg @@ -63,17 +63,17 @@ - + - + - + @@ -158,8 +158,8 @@ ] [default] - select(enum_a) - + select(enum_a) + a0() ​ @@ -176,10 +176,10 @@ ​ - ​ - - select(colors) - + ​ + + select(colors) + red() orange() diff --git a/docs/test_cases/t20025.md b/docs/test_cases/t20025.md index 01286289..fccaf773 100644 --- a/docs/test_cases/t20025.md +++ b/docs/test_cases/t20025.md @@ -73,8 +73,10 @@ int tmain() "name": "t20025_sequence", "participants": [ { + "display_name": "tmain()", "id": "1268545806896171690", - "name": "clanguml::t20025::tmain()", + "name": "tmain", + "namespace": "clanguml::t20025", "source_location": { "column": 5, "file": "t20025.cc", @@ -84,8 +86,25 @@ int tmain() "type": "function" }, { + "activities": [ + { + "display_name": "a()", + "id": "1119830104994271584", + "name": "a", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20025.cc", + "line": 15, + "translation_unit": "t20025.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "2144852170258286289", - "name": "clanguml::t20025::A", + "name": "A", + "namespace": "clanguml::t20025", "source_location": { "column": 8, "file": "t20025.cc", @@ -95,8 +114,10 @@ int tmain() "type": "class" }, { + "display_name": "add(int,int)", "id": "228843323046630374", - "name": "clanguml::t20025::add(int,int)", + "name": "add", + "namespace": "clanguml::t20025", "source_location": { "column": 5, "file": "t20025.cc", @@ -112,9 +133,7 @@ int tmain() { "from": { "activity_id": "1268545806896171690", - "activity_name": "clanguml::t20025::tmain()", - "participant_id": "1268545806896171690", - "participant_name": "clanguml::t20025::tmain()" + "participant_id": "1268545806896171690" }, "name": "a()", "return_type": "int", @@ -127,7 +146,6 @@ int tmain() }, "to": { "activity_id": "1119830104994271584", - "activity_name": "clanguml::t20025::A::a()", "participant_id": "2144852170258286289" }, "type": "message" @@ -135,9 +153,7 @@ int tmain() { "from": { "activity_id": "1268545806896171690", - "activity_name": "clanguml::t20025::tmain()", - "participant_id": "1268545806896171690", - "participant_name": "clanguml::t20025::tmain()" + "participant_id": "1268545806896171690" }, "name": "", "return_type": "int", @@ -150,7 +166,6 @@ int tmain() }, "to": { "activity_id": "228843323046630374", - "activity_name": "clanguml::t20025::add(int,int)", "participant_id": "228843323046630374" }, "type": "message" diff --git a/docs/test_cases/t20025_sequence.svg b/docs/test_cases/t20025_sequence.svg index e55861a2..8db3b07b 100644 --- a/docs/test_cases/t20025_sequence.svg +++ b/docs/test_cases/t20025_sequence.svg @@ -1,47 +1,53 @@ - + + + + + + + - - - - - - - - - tmain() - - tmain() + + + + + + + + + tmain() + + tmain() - - - A - - A + + + A + + A - - - add(int,int) - - add(int,int) + + + add(int,int) + + add(int,int) - - - - - - - a() + + + + + + + a() - - - - - + + + + + - - + + diff --git a/docs/test_cases/t20025_sequence_mermaid.svg b/docs/test_cases/t20025_sequence_mermaid.svg index c0d86545..35762bd1 100644 --- a/docs/test_cases/t20025_sequence_mermaid.svg +++ b/docs/test_cases/t20025_sequence_mermaid.svg @@ -63,17 +63,17 @@ - + - + - + @@ -91,12 +91,12 @@ - a() - - ​ - - ​ - - ​ - + a() + + ​ + + ​ + + ​ + diff --git a/docs/test_cases/t20026.md b/docs/test_cases/t20026.md index 68641dfe..dcb559c4 100644 --- a/docs/test_cases/t20026.md +++ b/docs/test_cases/t20026.md @@ -53,8 +53,10 @@ int tmain() "name": "t20026_sequence", "participants": [ { + "display_name": "tmain()", "id": "2268697350307997040", - "name": "clanguml::t20026::tmain()", + "name": "tmain", + "namespace": "clanguml::t20026", "source_location": { "column": 5, "file": "t20026.cc", @@ -64,8 +66,25 @@ int tmain() "type": "function" }, { + "activities": [ + { + "display_name": "a()", + "id": "600590770418147864", + "name": "a", + "namespace": "", + "source_location": { + "column": 18, + "file": "t20026.cc", + "line": 5, + "translation_unit": "t20026.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "1962121823853291899", - "name": "clanguml::t20026::A", + "name": "A", + "namespace": "clanguml::t20026", "source_location": { "column": 8, "file": "t20026.cc", @@ -81,9 +100,7 @@ int tmain() { "from": { "activity_id": "2268697350307997040", - "activity_name": "clanguml::t20026::tmain()", - "participant_id": "2268697350307997040", - "participant_name": "clanguml::t20026::tmain()" + "participant_id": "2268697350307997040" }, "name": "a()", "return_type": "void", @@ -96,7 +113,6 @@ int tmain() }, "to": { "activity_id": "600590770418147864", - "activity_name": "clanguml::t20026::A::a()", "participant_id": "1962121823853291899" }, "type": "message" diff --git a/docs/test_cases/t20026_sequence.svg b/docs/test_cases/t20026_sequence.svg index 61829ec1..fe9ada8c 100644 --- a/docs/test_cases/t20026_sequence.svg +++ b/docs/test_cases/t20026_sequence.svg @@ -1,30 +1,36 @@ - + + + + + + + - - - - - - - tmain() - - tmain() + + + + + + + tmain() + + tmain() - - - A - - A + + + A + + A - - - - - - a() + + + + + + a() diff --git a/docs/test_cases/t20026_sequence_mermaid.svg b/docs/test_cases/t20026_sequence_mermaid.svg index aa7c3fe8..121a3afb 100644 --- a/docs/test_cases/t20026_sequence_mermaid.svg +++ b/docs/test_cases/t20026_sequence_mermaid.svg @@ -48,17 +48,17 @@ - + - + - + @@ -73,6 +73,6 @@ - a() - + a() + diff --git a/docs/test_cases/t20027.md b/docs/test_cases/t20027.md index 960a38e8..debe9624 100644 --- a/docs/test_cases/t20027.md +++ b/docs/test_cases/t20027.md @@ -52,8 +52,10 @@ void tmain() "name": "t20027_sequence", "participants": [ { + "display_name": "tmain()", "id": "1581009482994430286", - "name": "clanguml::t20027::tmain()", + "name": "tmain", + "namespace": "clanguml::t20027", "source_location": { "column": 6, "file": "t20027.cc", @@ -63,8 +65,25 @@ void tmain() "type": "function" }, { + "activities": [ + { + "display_name": "a()", + "id": "910514967786202717", + "name": "a", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20027.cc", + "line": 6, + "translation_unit": "t20027.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "583525629936262089", - "name": "clanguml::t20027::A", + "name": "A", + "namespace": "clanguml::t20027", "source_location": { "column": 7, "file": "t20027.cc", @@ -80,9 +99,7 @@ void tmain() { "from": { "activity_id": "1581009482994430286", - "activity_name": "clanguml::t20027::tmain()", - "participant_id": "1581009482994430286", - "participant_name": "clanguml::t20027::tmain()" + "participant_id": "1581009482994430286" }, "name": "a()", "return_type": "void", @@ -95,7 +112,6 @@ void tmain() }, "to": { "activity_id": "910514967786202717", - "activity_name": "clanguml::t20027::A::a()", "participant_id": "583525629936262089" }, "type": "message" diff --git a/docs/test_cases/t20027_sequence.svg b/docs/test_cases/t20027_sequence.svg index bf5a9d45..873a91ec 100644 --- a/docs/test_cases/t20027_sequence.svg +++ b/docs/test_cases/t20027_sequence.svg @@ -1,30 +1,36 @@ - + + + + + + + - - - - - - - tmain() - - tmain() + + + + + + + tmain() + + tmain() - - - A - - A + + + A + + A - - - - - - a() + + + + + + a() diff --git a/docs/test_cases/t20027_sequence_mermaid.svg b/docs/test_cases/t20027_sequence_mermaid.svg index aa7c3fe8..121a3afb 100644 --- a/docs/test_cases/t20027_sequence_mermaid.svg +++ b/docs/test_cases/t20027_sequence_mermaid.svg @@ -48,17 +48,17 @@ - + - + - + @@ -73,6 +73,6 @@ - a() - + a() + diff --git a/docs/test_cases/t20028.md b/docs/test_cases/t20028.md index ecaa82ba..9f698cdd 100644 --- a/docs/test_cases/t20028.md +++ b/docs/test_cases/t20028.md @@ -62,8 +62,10 @@ int tmain() "name": "t20028_sequence", "participants": [ { + "display_name": "tmain()", "id": "1347206662193933194", - "name": "clanguml::t20028::tmain()", + "name": "tmain", + "namespace": "clanguml::t20028", "source_location": { "column": 5, "file": "t20028.cc", @@ -73,8 +75,64 @@ int tmain() "type": "function" }, { + "activities": [ + { + "display_name": "a()", + "id": "666210834901940781", + "name": "a", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20028.cc", + "line": 5, + "translation_unit": "t20028.cc" + }, + "type": "method" + }, + { + "display_name": "b()", + "id": "793793464184037795", + "name": "b", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20028.cc", + "line": 6, + "translation_unit": "t20028.cc" + }, + "type": "method" + }, + { + "display_name": "c()", + "id": "1582152567698110078", + "name": "c", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20028.cc", + "line": 7, + "translation_unit": "t20028.cc" + }, + "type": "method" + }, + { + "display_name": "d()", + "id": "1178268687951492696", + "name": "d", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20028.cc", + "line": 8, + "translation_unit": "t20028.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "2073479923903128898", - "name": "clanguml::t20028::A", + "name": "A", + "namespace": "clanguml::t20028", "source_location": { "column": 8, "file": "t20028.cc", @@ -95,9 +153,7 @@ int tmain() { "from": { "activity_id": "1347206662193933194", - "activity_name": "clanguml::t20028::tmain()", - "participant_id": "1347206662193933194", - "participant_name": "clanguml::t20028::tmain()" + "participant_id": "1347206662193933194" }, "name": "a()", "return_type": "int", @@ -110,7 +166,6 @@ int tmain() }, "to": { "activity_id": "666210834901940781", - "activity_name": "clanguml::t20028::A::a()", "participant_id": "2073479923903128898" }, "type": "message" @@ -118,9 +173,7 @@ int tmain() { "from": { "activity_id": "1347206662193933194", - "activity_name": "clanguml::t20028::tmain()", - "participant_id": "1347206662193933194", - "participant_name": "clanguml::t20028::tmain()" + "participant_id": "1347206662193933194" }, "name": "b()", "return_type": "int", @@ -133,7 +186,6 @@ int tmain() }, "to": { "activity_id": "793793464184037795", - "activity_name": "clanguml::t20028::A::b()", "participant_id": "2073479923903128898" }, "type": "message" @@ -141,9 +193,7 @@ int tmain() { "from": { "activity_id": "1347206662193933194", - "activity_name": "clanguml::t20028::tmain()", - "participant_id": "1347206662193933194", - "participant_name": "clanguml::t20028::tmain()" + "participant_id": "1347206662193933194" }, "name": "c()", "return_type": "int", @@ -156,7 +206,6 @@ int tmain() }, "to": { "activity_id": "1582152567698110078", - "activity_name": "clanguml::t20028::A::c()", "participant_id": "2073479923903128898" }, "type": "message" @@ -169,9 +218,7 @@ int tmain() { "from": { "activity_id": "1347206662193933194", - "activity_name": "clanguml::t20028::tmain()", - "participant_id": "1347206662193933194", - "participant_name": "clanguml::t20028::tmain()" + "participant_id": "1347206662193933194" }, "name": "d()", "return_type": "int", @@ -184,7 +231,6 @@ int tmain() }, "to": { "activity_id": "1178268687951492696", - "activity_name": "clanguml::t20028::A::d()", "participant_id": "2073479923903128898" }, "type": "message" diff --git a/docs/test_cases/t20028_sequence.svg b/docs/test_cases/t20028_sequence.svg index 48bbd873..60928af7 100644 --- a/docs/test_cases/t20028_sequence.svg +++ b/docs/test_cases/t20028_sequence.svg @@ -1,66 +1,73 @@ - + + + + + + + - - - - - - - - - - - tmain() - - tmain() + + + + + + + + + + + + tmain() + + tmain() - - - A - - A + + + A + + A - - - - - - - - alt - - - - [ - a() - ] + + + + + + + + alt + + + + [ + a() + ] - - - - - - b() + + + + + + b() - - - - - - c() + + + + + + c() - - - - - - - d() + + + + + + + d() - - + + diff --git a/docs/test_cases/t20028_sequence_mermaid.svg b/docs/test_cases/t20028_sequence_mermaid.svg index 8e6a25b5..0ebc51b3 100644 --- a/docs/test_cases/t20028_sequence_mermaid.svg +++ b/docs/test_cases/t20028_sequence_mermaid.svg @@ -48,17 +48,17 @@ - + - + - + @@ -94,20 +94,20 @@ ​ - [a()] - - ​ - - b() - - ​ - - c() - - ​ - - d() - - ​ - + [a()] + + ​ + + b() + + ​ + + c() + + ​ + + d() + + ​ + diff --git a/docs/test_cases/t20029.md b/docs/test_cases/t20029.md index 3dae67cb..5adbaa45 100644 --- a/docs/test_cases/t20029.md +++ b/docs/test_cases/t20029.md @@ -115,8 +115,10 @@ int tmain() "name": "t20029_sequence", "participants": [ { + "display_name": "tmain()", "id": "2091374738808319642", - "name": "clanguml::t20029::tmain()", + "name": "tmain", + "namespace": "clanguml::t20029", "source_location": { "column": 5, "file": "t20029.cc", @@ -126,8 +128,38 @@ int tmain() "type": "function" }, { + "activities": [ + { + "display_name": "send(std::string &&)", + "id": "2026763864005979273", + "name": "send", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20029.cc", + "line": 13, + "translation_unit": "t20029.cc" + }, + "type": "method" + }, + { + "display_name": "encode(std::string &&)", + "id": "1468258269466480773", + "name": "encode", + "namespace": "", + "source_location": { + "column": 17, + "file": "t20029.cc", + "line": 22, + "translation_unit": "t20029.cc" + }, + "type": "method" + } + ], + "display_name": "Encoder>", "id": "1673261195873192383", - "name": "clanguml::t20029::Encoder>", + "name": "Encoder", + "namespace": "clanguml::t20029", "source_location": { "column": 29, "file": "t20029.cc", @@ -137,8 +169,25 @@ int tmain() "type": "class" }, { + "activities": [ + { + "display_name": "send(std::string &&)", + "id": "30515971485361302", + "name": "send", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20029.cc", + "line": 27, + "translation_unit": "t20029.cc" + }, + "type": "method" + } + ], + "display_name": "Retrier", "id": "658058855590948094", - "name": "clanguml::t20029::Retrier", + "name": "Retrier", + "namespace": "clanguml::t20029", "source_location": { "column": 29, "file": "t20029.cc", @@ -148,8 +197,38 @@ int tmain() "type": "class" }, { + "activities": [ + { + "display_name": "connect()", + "id": "940428568182104530", + "name": "connect", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20029.cc", + "line": 45, + "translation_unit": "t20029.cc" + }, + "type": "method" + }, + { + "display_name": "send(const std::string &)", + "id": "972625940114169157", + "name": "send", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20029.cc", + "line": 51, + "translation_unit": "t20029.cc" + }, + "type": "method" + } + ], + "display_name": "ConnectionPool", "id": "1896406205097618937", - "name": "clanguml::t20029::ConnectionPool", + "name": "ConnectionPool", + "namespace": "clanguml::t20029", "source_location": { "column": 7, "file": "t20029.cc", @@ -159,8 +238,10 @@ int tmain() "type": "class" }, { + "display_name": "encode_b64(std::string &&)", "id": "1362646431260879440", - "name": "clanguml::t20029::encode_b64(std::string &&)", + "name": "encode_b64", + "namespace": "clanguml::t20029", "source_location": { "column": 13, "file": "t20029.cc", @@ -177,9 +258,7 @@ int tmain() "comment": "Establish connection to the remote server synchronously", "from": { "activity_id": "2091374738808319642", - "activity_name": "clanguml::t20029::tmain()", - "participant_id": "2091374738808319642", - "participant_name": "clanguml::t20029::tmain()" + "participant_id": "2091374738808319642" }, "name": "connect()", "return_type": "void", @@ -192,7 +271,6 @@ int tmain() }, "to": { "activity_id": "940428568182104530", - "activity_name": "clanguml::t20029::ConnectionPool::connect()", "participant_id": "1896406205097618937" }, "type": "message" @@ -208,9 +286,7 @@ int tmain() { "from": { "activity_id": "2091374738808319642", - "activity_name": "clanguml::t20029::tmain()", - "participant_id": "2091374738808319642", - "participant_name": "clanguml::t20029::tmain()" + "participant_id": "2091374738808319642" }, "name": "send(std::string &&)", "return_type": "bool", @@ -223,7 +299,6 @@ int tmain() }, "to": { "activity_id": "2026763864005979273", - "activity_name": "clanguml::t20029::Encoder>::send(std::string &&)", "participant_id": "1673261195873192383" }, "type": "message" @@ -232,7 +307,6 @@ int tmain() "comment": "Encode the message using Base64 encoding and pass it to the next\nlayer", "from": { "activity_id": "2026763864005979273", - "activity_name": "clanguml::t20029::Encoder>::send(std::string &&)", "participant_id": "1673261195873192383" }, "name": "encode(std::string &&)", @@ -246,7 +320,6 @@ int tmain() }, "to": { "activity_id": "1468258269466480773", - "activity_name": "clanguml::t20029::Encoder>::encode(std::string &&)", "participant_id": "1673261195873192383" }, "type": "message" @@ -254,7 +327,6 @@ int tmain() { "from": { "activity_id": "1468258269466480773", - "activity_name": "clanguml::t20029::Encoder>::encode(std::string &&)", "participant_id": "1673261195873192383" }, "name": "", @@ -268,7 +340,6 @@ int tmain() }, "to": { "activity_id": "1362646431260879440", - "activity_name": "clanguml::t20029::encode_b64(std::string &&)", "participant_id": "1362646431260879440" }, "type": "message" @@ -276,7 +347,6 @@ int tmain() { "from": { "activity_id": "2026763864005979273", - "activity_name": "clanguml::t20029::Encoder>::send(std::string &&)", "participant_id": "1673261195873192383" }, "name": "send(std::string &&)", @@ -290,7 +360,6 @@ int tmain() }, "to": { "activity_id": "30515971485361302", - "activity_name": "clanguml::t20029::Retrier::send(std::string &&)", "participant_id": "658058855590948094" }, "type": "message" @@ -306,7 +375,6 @@ int tmain() { "from": { "activity_id": "30515971485361302", - "activity_name": "clanguml::t20029::Retrier::send(std::string &&)", "participant_id": "658058855590948094" }, "name": "send(const std::string &)", @@ -320,7 +388,6 @@ int tmain() }, "to": { "activity_id": "972625940114169157", - "activity_name": "clanguml::t20029::ConnectionPool::send(const std::string &)", "participant_id": "1896406205097618937" }, "type": "message" diff --git a/docs/test_cases/t20029_sequence.svg b/docs/test_cases/t20029_sequence.svg index 3445eb7c..e106d422 100644 --- a/docs/test_cases/t20029_sequence.svg +++ b/docs/test_cases/t20029_sequence.svg @@ -1,136 +1,142 @@ - + + + + + + + - - - - - - - - - - - - - - - - - - - tmain() - - tmain() + + + + + + + + + + + + + + + + + + + tmain() + + tmain() - - - Encoder<Retrier<ConnectionPool>> - - Encoder<Retrier<ConnectionPool>> + + + Encoder<Retrier<ConnectionPool>> + + Encoder<Retrier<ConnectionPool>> - - - Retrier<ConnectionPool> - - Retrier<ConnectionPool> + + + Retrier<ConnectionPool> + + Retrier<ConnectionPool> - - - ConnectionPool - - ConnectionPool + + + ConnectionPool + + ConnectionPool - - - encode_b64(std::string &&) - - encode_b64(std::string &&) + + + encode_b64(std::string &&) + + encode_b64(std::string &&) - - - - - - - - - - Establish connection to the - remote server synchronously - - - - connect() + + + + + + + + + + Establish connection to the + remote server synchronously + + + + connect() - - - Repeat for each line in the - input stream - - - loop - - - alt - - - - [ - send(std::string &&) - ] + + + Repeat for each line in the + input stream + + + loop + + + alt + + + + [ + send(std::string &&) + ] - - - Encode the message using - Base64 encoding and pass - it to the next layer - - - - - - encode(std::string &&) + + + Encode the message using + Base64 encoding and pass + it to the next layer + + + + + + encode(std::string &&) - - - + + + - - - - - - - - - - send(std::string &&) + + + + + + + + + + send(std::string &&) - - - Repeat until send() succeeds - or retry count is exceeded - - - loop - - - alt - - - - [ - send(const std::string &) - ] + + + Repeat until send() succeeds + or retry count is exceeded + + + loop + + + alt + + + + [ + send(const std::string &) + ] - - - - - - + + + + + + diff --git a/docs/test_cases/t20029_sequence_mermaid.svg b/docs/test_cases/t20029_sequence_mermaid.svg index 1938095e..262a0097 100644 --- a/docs/test_cases/t20029_sequence_mermaid.svg +++ b/docs/test_cases/t20029_sequence_mermaid.svg @@ -93,17 +93,17 @@ - + - + - + @@ -216,26 +216,26 @@ ​ - connect() - - [send(std::string &&)] - + connect() + + [send(std::string &&)] + encode(std::string &&) - ​ - - ​ - + ​ + + ​ + ​ - send(std::string &&) - - [send(const std::string &)] - - ​ - - ​ - - ​ - + send(std::string &&) + + [send(const std::string &)] + + ​ + + ​ + + ​ + diff --git a/docs/test_cases/t20030.md b/docs/test_cases/t20030.md index 769f29df..1046ed4f 100644 --- a/docs/test_cases/t20030.md +++ b/docs/test_cases/t20030.md @@ -80,8 +80,10 @@ int tmain(bool f, int a) "name": "t20030_sequence", "participants": [ { + "display_name": "tmain(int)", "id": "1264643561983920529", - "name": "clanguml::t20030::tmain(int)", + "name": "tmain", + "namespace": "clanguml::t20030", "source_location": { "column": 6, "file": "t20030.cc", @@ -91,8 +93,10 @@ int tmain(bool f, int a) "type": "function" }, { + "display_name": "magic()", "id": "1038740565367213967", - "name": "clanguml::t20030::magic()", + "name": "magic", + "namespace": "clanguml::t20030", "source_location": { "column": 5, "file": "t20030.cc", @@ -102,8 +106,116 @@ int tmain(bool f, int a) "type": "function" }, { + "activities": [ + { + "display_name": "A(int)", + "id": "2192298168642377389", + "name": "A", + "namespace": "", + "source_location": { + "column": 5, + "file": "t20030.cc", + "line": 10, + "translation_unit": "t20030.cc" + }, + "type": "method" + }, + { + "display_name": "operator+=(int)", + "id": "2032167997122548080", + "name": "operator+=", + "namespace": "", + "source_location": { + "column": 8, + "file": "t20030.cc", + "line": 18, + "translation_unit": "t20030.cc" + }, + "type": "method" + }, + { + "display_name": "add(int)", + "id": "2174827432067616124", + "name": "add", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20030.cc", + "line": 29, + "translation_unit": "t20030.cc" + }, + "type": "method" + }, + { + "display_name": "A()", + "id": "32184916294885915", + "name": "A", + "namespace": "", + "source_location": { + "column": 5, + "file": "t20030.cc", + "line": 8, + "translation_unit": "t20030.cc" + }, + "type": "method" + }, + { + "display_name": "create()", + "id": "890578100069139188", + "name": "create", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20030.cc", + "line": 27, + "translation_unit": "t20030.cc" + }, + "type": "method" + }, + { + "display_name": "operator=(const A &)", + "id": "1796303685088700396", + "name": "operator=", + "namespace": "", + "source_location": { + "column": 8, + "file": "t20030.cc", + "line": 12, + "translation_unit": "t20030.cc" + }, + "type": "method" + }, + { + "display_name": "set(int)", + "id": "2212978510776223413", + "name": "set", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20030.cc", + "line": 30, + "translation_unit": "t20030.cc" + }, + "type": "method" + }, + { + "display_name": "value() const", + "id": "1754957340376276968", + "name": "value", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20030.cc", + "line": 24, + "translation_unit": "t20030.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "1081707114848460702", - "name": "clanguml::t20030::A", + "name": "A", + "namespace": "clanguml::t20030", "source_location": { "column": 7, "file": "t20030.cc", @@ -113,8 +225,10 @@ int tmain(bool f, int a) "type": "class" }, { + "display_name": "tmain(bool,int)", "id": "36090614888670483", - "name": "clanguml::t20030::tmain(bool,int)", + "name": "tmain", + "namespace": "clanguml::t20030", "source_location": { "column": 5, "file": "t20030.cc", @@ -130,9 +244,7 @@ int tmain(bool f, int a) { "from": { "activity_id": "1264643561983920529", - "activity_name": "clanguml::t20030::tmain(int)", - "participant_id": "1264643561983920529", - "participant_name": "clanguml::t20030::tmain(int)" + "participant_id": "1264643561983920529" }, "name": "", "return_type": "int", @@ -145,7 +257,6 @@ int tmain(bool f, int a) }, "to": { "activity_id": "1038740565367213967", - "activity_name": "clanguml::t20030::magic()", "participant_id": "1038740565367213967" }, "type": "message" @@ -153,9 +264,7 @@ int tmain(bool f, int a) { "from": { "activity_id": "1264643561983920529", - "activity_name": "clanguml::t20030::tmain(int)", - "participant_id": "1264643561983920529", - "participant_name": "clanguml::t20030::tmain(int)" + "participant_id": "1264643561983920529" }, "name": "A(int)", "return_type": "void", @@ -168,7 +277,6 @@ int tmain(bool f, int a) }, "to": { "activity_id": "2192298168642377389", - "activity_name": "clanguml::t20030::A::A(int)", "participant_id": "1081707114848460702" }, "type": "message" @@ -176,9 +284,7 @@ int tmain(bool f, int a) { "from": { "activity_id": "1264643561983920529", - "activity_name": "clanguml::t20030::tmain(int)", - "participant_id": "1264643561983920529", - "participant_name": "clanguml::t20030::tmain(int)" + "participant_id": "1264643561983920529" }, "name": "operator+=(int)", "return_type": "A &", @@ -191,7 +297,6 @@ int tmain(bool f, int a) }, "to": { "activity_id": "2032167997122548080", - "activity_name": "clanguml::t20030::A::operator+=(int)", "participant_id": "1081707114848460702" }, "type": "message" @@ -199,7 +304,6 @@ int tmain(bool f, int a) { "from": { "activity_id": "2032167997122548080", - "activity_name": "clanguml::t20030::A::operator+=(int)", "participant_id": "1081707114848460702" }, "name": "add(int)", @@ -213,7 +317,6 @@ int tmain(bool f, int a) }, "to": { "activity_id": "2174827432067616124", - "activity_name": "clanguml::t20030::A::add(int)", "participant_id": "1081707114848460702" }, "type": "message" @@ -229,9 +332,7 @@ int tmain(bool f, int a) { "from": { "activity_id": "36090614888670483", - "activity_name": "clanguml::t20030::tmain(bool,int)", - "participant_id": "36090614888670483", - "participant_name": "clanguml::t20030::tmain(bool,int)" + "participant_id": "36090614888670483" }, "name": "A()", "return_type": "void", @@ -244,7 +345,6 @@ int tmain(bool f, int a) }, "to": { "activity_id": "32184916294885915", - "activity_name": "clanguml::t20030::A::A()", "participant_id": "1081707114848460702" }, "type": "message" @@ -252,7 +352,6 @@ int tmain(bool f, int a) { "from": { "activity_id": "32184916294885915", - "activity_name": "clanguml::t20030::A::A()", "participant_id": "1081707114848460702" }, "name": "create()", @@ -266,7 +365,6 @@ int tmain(bool f, int a) }, "to": { "activity_id": "890578100069139188", - "activity_name": "clanguml::t20030::A::create()", "participant_id": "1081707114848460702" }, "type": "message" @@ -274,9 +372,7 @@ int tmain(bool f, int a) { "from": { "activity_id": "36090614888670483", - "activity_name": "clanguml::t20030::tmain(bool,int)", - "participant_id": "36090614888670483", - "participant_name": "clanguml::t20030::tmain(bool,int)" + "participant_id": "36090614888670483" }, "name": "A()", "return_type": "void", @@ -289,7 +385,6 @@ int tmain(bool f, int a) }, "to": { "activity_id": "32184916294885915", - "activity_name": "clanguml::t20030::A::A()", "participant_id": "1081707114848460702" }, "type": "message" @@ -297,9 +392,7 @@ int tmain(bool f, int a) { "from": { "activity_id": "36090614888670483", - "activity_name": "clanguml::t20030::tmain(bool,int)", - "participant_id": "36090614888670483", - "participant_name": "clanguml::t20030::tmain(bool,int)" + "participant_id": "36090614888670483" }, "name": "operator+=(int)", "return_type": "A &", @@ -312,7 +405,6 @@ int tmain(bool f, int a) }, "to": { "activity_id": "2032167997122548080", - "activity_name": "clanguml::t20030::A::operator+=(int)", "participant_id": "1081707114848460702" }, "type": "message" @@ -320,7 +412,6 @@ int tmain(bool f, int a) { "from": { "activity_id": "2032167997122548080", - "activity_name": "clanguml::t20030::A::operator+=(int)", "participant_id": "1081707114848460702" }, "name": "add(int)", @@ -334,7 +425,6 @@ int tmain(bool f, int a) }, "to": { "activity_id": "2174827432067616124", - "activity_name": "clanguml::t20030::A::add(int)", "participant_id": "1081707114848460702" }, "type": "message" @@ -342,9 +432,7 @@ int tmain(bool f, int a) { "from": { "activity_id": "36090614888670483", - "activity_name": "clanguml::t20030::tmain(bool,int)", - "participant_id": "36090614888670483", - "participant_name": "clanguml::t20030::tmain(bool,int)" + "participant_id": "36090614888670483" }, "name": "operator=(const A &)", "return_type": "A &", @@ -357,7 +445,6 @@ int tmain(bool f, int a) }, "to": { "activity_id": "1796303685088700396", - "activity_name": "clanguml::t20030::A::operator=(const A &)", "participant_id": "1081707114848460702" }, "type": "message" @@ -365,7 +452,6 @@ int tmain(bool f, int a) { "from": { "activity_id": "1796303685088700396", - "activity_name": "clanguml::t20030::A::operator=(const A &)", "participant_id": "1081707114848460702" }, "name": "set(int)", @@ -379,7 +465,6 @@ int tmain(bool f, int a) }, "to": { "activity_id": "2212978510776223413", - "activity_name": "clanguml::t20030::A::set(int)", "participant_id": "1081707114848460702" }, "type": "message" @@ -387,9 +472,7 @@ int tmain(bool f, int a) { "from": { "activity_id": "36090614888670483", - "activity_name": "clanguml::t20030::tmain(bool,int)", - "participant_id": "36090614888670483", - "participant_name": "clanguml::t20030::tmain(bool,int)" + "participant_id": "36090614888670483" }, "name": "value() const", "return_type": "int", @@ -402,7 +485,6 @@ int tmain(bool f, int a) }, "to": { "activity_id": "1754957340376276968", - "activity_name": "clanguml::t20030::A::value() const", "participant_id": "1081707114848460702" }, "type": "message" diff --git a/docs/test_cases/t20030_sequence.svg b/docs/test_cases/t20030_sequence.svg index 79bc502d..9bb0ff87 100644 --- a/docs/test_cases/t20030_sequence.svg +++ b/docs/test_cases/t20030_sequence.svg @@ -1,149 +1,155 @@ - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - tmain(int) - - tmain(int) + + + + + + + + + + + + + + + + + + + + + + tmain(int) + + tmain(int) - - - magic() - - magic() + + + magic() + + magic() - - - A - - A + + + A + + A - - - tmain(bool,int) - - tmain(bool,int) + + + tmain(bool,int) + + tmain(bool,int) - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - A(int) + + + + + + A(int) - - - - operator+=(int) + + + + operator+=(int) - - - - - - add(int) + + + + + + add(int) - - - - - - A() + + + + + + A() - - - - - - create() + + + + + + create() - - - - A() + + + + A() - - - - - - create() + + + + + + create() - - - - operator+=(int) + + + + operator+=(int) - - - - - - add(int) + + + + + + add(int) - - - - - - operator=(const A &) + + + + + + operator=(const A &) - - - - - - set(int) + + + + + + set(int) - - - - - - value() const + + + + + + value() const - - + + diff --git a/docs/test_cases/t20030_sequence_mermaid.svg b/docs/test_cases/t20030_sequence_mermaid.svg index 5fd85c74..13ec0fcc 100644 --- a/docs/test_cases/t20030_sequence_mermaid.svg +++ b/docs/test_cases/t20030_sequence_mermaid.svg @@ -78,17 +78,17 @@ - + - + - + @@ -142,40 +142,40 @@ - ​ - - ​ - - A(int) - - operator+=(int) - + ​ + + ​ + + A(int) + + operator+=(int) + add(int) - ​ - - A() - + ​ + + A() + create() - A() - + A() + create() - operator+=(int) - + operator+=(int) + add(int) - ​ - - operator=(const A &) - + ​ + + operator=(const A &) + set(int) - ​ - - value() const - - ​ - + ​ + + value() const + + ​ + diff --git a/docs/test_cases/t20031.md b/docs/test_cases/t20031.md index 87b24b2c..90ac6d95 100644 --- a/docs/test_cases/t20031.md +++ b/docs/test_cases/t20031.md @@ -96,8 +96,10 @@ int tmain(bool f, int a) "name": "t20031_sequence", "participants": [ { + "display_name": "tmain(int)", "id": "1045973591033429178", - "name": "clanguml::t20031::tmain(int)", + "name": "tmain", + "namespace": "clanguml::t20031", "source_location": { "column": 6, "file": "t20031.cc", @@ -107,8 +109,10 @@ int tmain(bool f, int a) "type": "function" }, { + "display_name": "magic()", "id": "2265790048300959619", - "name": "clanguml::t20031::magic()", + "name": "magic", + "namespace": "clanguml::t20031", "source_location": { "column": 5, "file": "t20031.cc", @@ -118,8 +122,10 @@ int tmain(bool f, int a) "type": "function" }, { + "display_name": "tmain(bool,int)", "id": "2189754495514350927", - "name": "clanguml::t20031::tmain(bool,int)", + "name": "tmain", + "namespace": "clanguml::t20031", "source_location": { "column": 5, "file": "t20031.cc", @@ -129,8 +135,10 @@ int tmain(bool f, int a) "type": "function" }, { + "display_name": "execute(std::function)", "id": "2230160420908832598", - "name": "clanguml::t20031::execute(std::function)", + "name": "execute", + "namespace": "clanguml::t20031", "source_location": { "column": 5, "file": "t20031.cc", @@ -140,8 +148,25 @@ int tmain(bool f, int a) "type": "function" }, { + "activities": [ + { + "display_name": "value() const", + "id": "1089278431155817348", + "name": "value", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20031.cc", + "line": 28, + "translation_unit": "t20031.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "1081580052625775404", - "name": "clanguml::t20031::A", + "name": "A", + "namespace": "clanguml::t20031", "source_location": { "column": 7, "file": "t20031.cc", @@ -157,9 +182,7 @@ int tmain(bool f, int a) { "from": { "activity_id": "1045973591033429178", - "activity_name": "clanguml::t20031::tmain(int)", - "participant_id": "1045973591033429178", - "participant_name": "clanguml::t20031::tmain(int)" + "participant_id": "1045973591033429178" }, "name": "", "return_type": "int", @@ -172,7 +195,6 @@ int tmain(bool f, int a) }, "to": { "activity_id": "2265790048300959619", - "activity_name": "clanguml::t20031::magic()", "participant_id": "2265790048300959619" }, "type": "message" @@ -188,9 +210,7 @@ int tmain(bool f, int a) { "from": { "activity_id": "2189754495514350927", - "activity_name": "clanguml::t20031::tmain(bool,int)", - "participant_id": "2189754495514350927", - "participant_name": "clanguml::t20031::tmain(bool,int)" + "participant_id": "2189754495514350927" }, "name": "", "return_type": "int", @@ -203,7 +223,6 @@ int tmain(bool f, int a) }, "to": { "activity_id": "2230160420908832598", - "activity_name": "clanguml::t20031::execute(std::function)", "participant_id": "2230160420908832598" }, "type": "message" @@ -211,9 +230,7 @@ int tmain(bool f, int a) { "from": { "activity_id": "2189754495514350927", - "activity_name": "clanguml::t20031::tmain(bool,int)", - "participant_id": "2189754495514350927", - "participant_name": "clanguml::t20031::tmain(bool,int)" + "participant_id": "2189754495514350927" }, "name": "value() const", "return_type": "int", @@ -226,7 +243,6 @@ int tmain(bool f, int a) }, "to": { "activity_id": "1089278431155817348", - "activity_name": "clanguml::t20031::A::value() const", "participant_id": "1081580052625775404" }, "type": "message" diff --git a/docs/test_cases/t20031_sequence.svg b/docs/test_cases/t20031_sequence.svg index 14adda5a..6b4f7e6a 100644 --- a/docs/test_cases/t20031_sequence.svg +++ b/docs/test_cases/t20031_sequence.svg @@ -1,71 +1,77 @@ - + + + + + + + - - - - - - - - - - - - - tmain(int) - - tmain(int) + + + + + + + + + + + + + tmain(int) + + tmain(int) - - - magic() - - magic() + + + magic() + + magic() - - - tmain(bool,int) - - tmain(bool,int) + + + tmain(bool,int) + + tmain(bool,int) - - - execute(std::function<int ()>) - - execute(std::function<int ()>) + + + execute(std::function<int ()>) + + execute(std::function<int ()>) - - - A - - A + + + A + + A - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - - - value() const + + + + + + value() const - - + + diff --git a/docs/test_cases/t20031_sequence_mermaid.svg b/docs/test_cases/t20031_sequence_mermaid.svg index 7bf65719..c6200e3a 100644 --- a/docs/test_cases/t20031_sequence_mermaid.svg +++ b/docs/test_cases/t20031_sequence_mermaid.svg @@ -93,17 +93,17 @@ - + - + - + @@ -127,16 +127,16 @@ - ​ - - ​ - - ​ - - ​ - - value() const - - ​ - + ​ + + ​ + + ​ + + ​ + + value() const + + ​ + diff --git a/docs/test_cases/t20032.md b/docs/test_cases/t20032.md index 5bfad6bc..2692af8c 100644 --- a/docs/test_cases/t20032.md +++ b/docs/test_cases/t20032.md @@ -56,8 +56,10 @@ void tmain(int argc, char **argv) "name": "t20032_sequence", "participants": [ { + "display_name": "tmain(int,char **)", "id": "2159371207846335450", - "name": "clanguml::t20032::tmain(int,char **)", + "name": "tmain", + "namespace": "clanguml::t20032", "source_location": { "column": 6, "file": "t20032.cc", @@ -67,8 +69,51 @@ void tmain(int argc, char **argv) "type": "function" }, { + "activities": [ + { + "display_name": "b(int)", + "id": "1775727925274471949", + "name": "b", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20032.cc", + "line": 11, + "translation_unit": "t20032.cc" + }, + "type": "method" + }, + { + "display_name": "b(double)", + "id": "404223226092650061", + "name": "b", + "namespace": "", + "source_location": { + "column": 12, + "file": "t20032.cc", + "line": 12, + "translation_unit": "t20032.cc" + }, + "type": "method" + }, + { + "display_name": "b(const char *)", + "id": "1676684483397143166", + "name": "b", + "namespace": "", + "source_location": { + "column": 17, + "file": "t20032.cc", + "line": 13, + "translation_unit": "t20032.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "775765108342558014", - "name": "clanguml::t20032::B", + "name": "B", + "namespace": "clanguml::t20032", "source_location": { "column": 8, "file": "t20032.cc", @@ -78,8 +123,51 @@ void tmain(int argc, char **argv) "type": "class" }, { + "activities": [ + { + "display_name": "a1(int)", + "id": "913842443932719355", + "name": "a1", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20032.cc", + "line": 5, + "translation_unit": "t20032.cc" + }, + "type": "method" + }, + { + "display_name": "a2(double)", + "id": "1293114170675037977", + "name": "a2", + "namespace": "", + "source_location": { + "column": 12, + "file": "t20032.cc", + "line": 6, + "translation_unit": "t20032.cc" + }, + "type": "method" + }, + { + "display_name": "a3(const char *)", + "id": "2099821524363509275", + "name": "a3", + "namespace": "", + "source_location": { + "column": 17, + "file": "t20032.cc", + "line": 7, + "translation_unit": "t20032.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "1674177120713592616", - "name": "clanguml::t20032::A", + "name": "A", + "namespace": "clanguml::t20032", "source_location": { "column": 8, "file": "t20032.cc", @@ -95,9 +183,7 @@ void tmain(int argc, char **argv) { "from": { "activity_id": "2159371207846335450", - "activity_name": "clanguml::t20032::tmain(int,char **)", - "participant_id": "2159371207846335450", - "participant_name": "clanguml::t20032::tmain(int,char **)" + "participant_id": "2159371207846335450" }, "name": "b(int)", "return_type": "int", @@ -110,7 +196,6 @@ void tmain(int argc, char **argv) }, "to": { "activity_id": "1775727925274471949", - "activity_name": "clanguml::t20032::B::b(int)", "participant_id": "775765108342558014" }, "type": "message" @@ -118,7 +203,6 @@ void tmain(int argc, char **argv) { "from": { "activity_id": "1775727925274471949", - "activity_name": "clanguml::t20032::B::b(int)", "participant_id": "775765108342558014" }, "name": "a1(int)", @@ -132,7 +216,6 @@ void tmain(int argc, char **argv) }, "to": { "activity_id": "913842443932719355", - "activity_name": "clanguml::t20032::A::a1(int)", "participant_id": "1674177120713592616" }, "type": "message" @@ -140,9 +223,7 @@ void tmain(int argc, char **argv) { "from": { "activity_id": "2159371207846335450", - "activity_name": "clanguml::t20032::tmain(int,char **)", - "participant_id": "2159371207846335450", - "participant_name": "clanguml::t20032::tmain(int,char **)" + "participant_id": "2159371207846335450" }, "name": "b(double)", "return_type": "double", @@ -155,7 +236,6 @@ void tmain(int argc, char **argv) }, "to": { "activity_id": "404223226092650061", - "activity_name": "clanguml::t20032::B::b(double)", "participant_id": "775765108342558014" }, "type": "message" @@ -163,7 +243,6 @@ void tmain(int argc, char **argv) { "from": { "activity_id": "404223226092650061", - "activity_name": "clanguml::t20032::B::b(double)", "participant_id": "775765108342558014" }, "name": "a2(double)", @@ -177,7 +256,6 @@ void tmain(int argc, char **argv) }, "to": { "activity_id": "1293114170675037977", - "activity_name": "clanguml::t20032::A::a2(double)", "participant_id": "1674177120713592616" }, "type": "message" @@ -185,9 +263,7 @@ void tmain(int argc, char **argv) { "from": { "activity_id": "2159371207846335450", - "activity_name": "clanguml::t20032::tmain(int,char **)", - "participant_id": "2159371207846335450", - "participant_name": "clanguml::t20032::tmain(int,char **)" + "participant_id": "2159371207846335450" }, "name": "b(const char *)", "return_type": "const char *", @@ -200,7 +276,6 @@ void tmain(int argc, char **argv) }, "to": { "activity_id": "1676684483397143166", - "activity_name": "clanguml::t20032::B::b(const char *)", "participant_id": "775765108342558014" }, "type": "message" @@ -208,7 +283,6 @@ void tmain(int argc, char **argv) { "from": { "activity_id": "1676684483397143166", - "activity_name": "clanguml::t20032::B::b(const char *)", "participant_id": "775765108342558014" }, "name": "a3(const char *)", @@ -222,7 +296,6 @@ void tmain(int argc, char **argv) }, "to": { "activity_id": "2099821524363509275", - "activity_name": "clanguml::t20032::A::a3(const char *)", "participant_id": "1674177120713592616" }, "type": "message" diff --git a/docs/test_cases/t20032_sequence.svg b/docs/test_cases/t20032_sequence.svg index fb258bd5..c39fd82c 100644 --- a/docs/test_cases/t20032_sequence.svg +++ b/docs/test_cases/t20032_sequence.svg @@ -1,90 +1,96 @@ - + + + + + + + - - - - - - - - - - - - - tmain(int,char **) - - tmain(int,char **) + + + + + + + + + + + + + tmain(int,char **) + + tmain(int,char **) - - - B - - B + + + B + + B - - - A - - A + + + A + + A - - - - - - - - - - - b(int) + + + + + + + + + + + b(int) - - - - a1(int) + + + + a1(int) - - - int - - - int - - - - b(double) + + + int + + + int + + + + b(double) - - - - a2(double) + + + + a2(double) - - - double - - - double - - - - b(const char *) + + + double + + + double + + + + b(const char *) - - - - a3(const char *) + + + + a3(const char *) - - - const char * - - - const char * + + + const char * + + + const char * diff --git a/docs/test_cases/t20032_sequence_mermaid.svg b/docs/test_cases/t20032_sequence_mermaid.svg index 8e19e3e6..86fd4f5a 100644 --- a/docs/test_cases/t20032_sequence_mermaid.svg +++ b/docs/test_cases/t20032_sequence_mermaid.svg @@ -63,17 +63,17 @@ - + - + - + @@ -103,28 +103,28 @@ - b(int) - - a1(int) - - int - - int - - b(double) - - a2(double) - - double - - double - - b(const char *) - - a3(const char *) - - const char * - - const char * - + b(int) + + a1(int) + + int + + int + + b(double) + + a2(double) + + double + + double + + b(const char *) + + a3(const char *) + + const char * + + const char * + diff --git a/docs/test_cases/t20033.md b/docs/test_cases/t20033.md index 213cd2bf..1c01220c 100644 --- a/docs/test_cases/t20033.md +++ b/docs/test_cases/t20033.md @@ -94,8 +94,10 @@ int tmain() "name": "t20033_sequence", "participants": [ { + "display_name": "tmain()", "id": "2284981553733959328", - "name": "clanguml::t20033::tmain()", + "name": "tmain", + "namespace": "clanguml::t20033", "source_location": { "column": 5, "file": "t20033.cc", @@ -105,8 +107,64 @@ int tmain() "type": "function" }, { + "activities": [ + { + "display_name": "a1()", + "id": "558885502745634115", + "name": "a1", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20033.cc", + "line": 8, + "translation_unit": "t20033.cc" + }, + "type": "method" + }, + { + "display_name": "a2()", + "id": "748502947476611794", + "name": "a2", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20033.cc", + "line": 9, + "translation_unit": "t20033.cc" + }, + "type": "method" + }, + { + "display_name": "a3()", + "id": "55903385814245839", + "name": "a3", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20033.cc", + "line": 10, + "translation_unit": "t20033.cc" + }, + "type": "method" + }, + { + "display_name": "a4()", + "id": "1686426476339443579", + "name": "a4", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20033.cc", + "line": 11, + "translation_unit": "t20033.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "615995652843962691", - "name": "clanguml::t20033::A", + "name": "A", + "namespace": "clanguml::t20033", "source_location": { "column": 8, "file": "t20033.cc", @@ -130,9 +188,7 @@ int tmain() { "from": { "activity_id": "2284981553733959328", - "activity_name": "clanguml::t20033::tmain()", - "participant_id": "2284981553733959328", - "participant_name": "clanguml::t20033::tmain()" + "participant_id": "2284981553733959328" }, "name": "a1()", "return_type": "int", @@ -145,7 +201,6 @@ int tmain() }, "to": { "activity_id": "558885502745634115", - "activity_name": "clanguml::t20033::A::a1()", "participant_id": "615995652843962691" }, "type": "message" @@ -158,9 +213,7 @@ int tmain() { "from": { "activity_id": "2284981553733959328", - "activity_name": "clanguml::t20033::tmain()", - "participant_id": "2284981553733959328", - "participant_name": "clanguml::t20033::tmain()" + "participant_id": "2284981553733959328" }, "name": "a2()", "return_type": "int", @@ -173,7 +226,6 @@ int tmain() }, "to": { "activity_id": "748502947476611794", - "activity_name": "clanguml::t20033::A::a2()", "participant_id": "615995652843962691" }, "type": "message" @@ -186,9 +238,7 @@ int tmain() { "from": { "activity_id": "2284981553733959328", - "activity_name": "clanguml::t20033::tmain()", - "participant_id": "2284981553733959328", - "participant_name": "clanguml::t20033::tmain()" + "participant_id": "2284981553733959328" }, "name": "a2()", "return_type": "int", @@ -201,7 +251,6 @@ int tmain() }, "to": { "activity_id": "748502947476611794", - "activity_name": "clanguml::t20033::A::a2()", "participant_id": "615995652843962691" }, "type": "message" @@ -209,9 +258,7 @@ int tmain() { "from": { "activity_id": "2284981553733959328", - "activity_name": "clanguml::t20033::tmain()", - "participant_id": "2284981553733959328", - "participant_name": "clanguml::t20033::tmain()" + "participant_id": "2284981553733959328" }, "name": "a3()", "return_type": "int", @@ -224,7 +271,6 @@ int tmain() }, "to": { "activity_id": "55903385814245839", - "activity_name": "clanguml::t20033::A::a3()", "participant_id": "615995652843962691" }, "type": "message" @@ -232,9 +278,7 @@ int tmain() { "from": { "activity_id": "2284981553733959328", - "activity_name": "clanguml::t20033::tmain()", - "participant_id": "2284981553733959328", - "participant_name": "clanguml::t20033::tmain()" + "participant_id": "2284981553733959328" }, "name": "a3()", "return_type": "int", @@ -247,7 +291,6 @@ int tmain() }, "to": { "activity_id": "55903385814245839", - "activity_name": "clanguml::t20033::A::a3()", "participant_id": "615995652843962691" }, "type": "message" @@ -260,9 +303,7 @@ int tmain() { "from": { "activity_id": "2284981553733959328", - "activity_name": "clanguml::t20033::tmain()", - "participant_id": "2284981553733959328", - "participant_name": "clanguml::t20033::tmain()" + "participant_id": "2284981553733959328" }, "name": "a4()", "return_type": "int", @@ -275,7 +316,6 @@ int tmain() }, "to": { "activity_id": "1686426476339443579", - "activity_name": "clanguml::t20033::A::a4()", "participant_id": "615995652843962691" }, "type": "message" @@ -296,9 +336,7 @@ int tmain() { "from": { "activity_id": "2284981553733959328", - "activity_name": "clanguml::t20033::tmain()", - "participant_id": "2284981553733959328", - "participant_name": "clanguml::t20033::tmain()" + "participant_id": "2284981553733959328" }, "name": "a2()", "return_type": "int", @@ -311,7 +349,6 @@ int tmain() }, "to": { "activity_id": "748502947476611794", - "activity_name": "clanguml::t20033::A::a2()", "participant_id": "615995652843962691" }, "type": "message" @@ -319,9 +356,7 @@ int tmain() { "from": { "activity_id": "2284981553733959328", - "activity_name": "clanguml::t20033::tmain()", - "participant_id": "2284981553733959328", - "participant_name": "clanguml::t20033::tmain()" + "participant_id": "2284981553733959328" }, "name": "a3()", "return_type": "int", @@ -334,7 +369,6 @@ int tmain() }, "to": { "activity_id": "55903385814245839", - "activity_name": "clanguml::t20033::A::a3()", "participant_id": "615995652843962691" }, "type": "message" @@ -354,9 +388,7 @@ int tmain() { "from": { "activity_id": "2284981553733959328", - "activity_name": "clanguml::t20033::tmain()", - "participant_id": "2284981553733959328", - "participant_name": "clanguml::t20033::tmain()" + "participant_id": "2284981553733959328" }, "name": "a2()", "return_type": "int", @@ -369,7 +401,6 @@ int tmain() }, "to": { "activity_id": "748502947476611794", - "activity_name": "clanguml::t20033::A::a2()", "participant_id": "615995652843962691" }, "type": "message" @@ -377,9 +408,7 @@ int tmain() { "from": { "activity_id": "2284981553733959328", - "activity_name": "clanguml::t20033::tmain()", - "participant_id": "2284981553733959328", - "participant_name": "clanguml::t20033::tmain()" + "participant_id": "2284981553733959328" }, "name": "a3()", "return_type": "int", @@ -392,7 +421,6 @@ int tmain() }, "to": { "activity_id": "55903385814245839", - "activity_name": "clanguml::t20033::A::a3()", "participant_id": "615995652843962691" }, "type": "message" @@ -404,9 +432,7 @@ int tmain() { "from": { "activity_id": "2284981553733959328", - "activity_name": "clanguml::t20033::tmain()", - "participant_id": "2284981553733959328", - "participant_name": "clanguml::t20033::tmain()" + "participant_id": "2284981553733959328" }, "name": "a3()", "return_type": "int", @@ -419,7 +445,6 @@ int tmain() }, "to": { "activity_id": "55903385814245839", - "activity_name": "clanguml::t20033::A::a3()", "participant_id": "615995652843962691" }, "type": "message" @@ -431,9 +456,7 @@ int tmain() { "from": { "activity_id": "2284981553733959328", - "activity_name": "clanguml::t20033::tmain()", - "participant_id": "2284981553733959328", - "participant_name": "clanguml::t20033::tmain()" + "participant_id": "2284981553733959328" }, "name": "a2()", "return_type": "int", @@ -446,7 +469,6 @@ int tmain() }, "to": { "activity_id": "748502947476611794", - "activity_name": "clanguml::t20033::A::a2()", "participant_id": "615995652843962691" }, "type": "message" @@ -462,9 +484,7 @@ int tmain() { "from": { "activity_id": "2284981553733959328", - "activity_name": "clanguml::t20033::tmain()", - "participant_id": "2284981553733959328", - "participant_name": "clanguml::t20033::tmain()" + "participant_id": "2284981553733959328" }, "name": "a4()", "return_type": "int", @@ -477,7 +497,6 @@ int tmain() }, "to": { "activity_id": "1686426476339443579", - "activity_name": "clanguml::t20033::A::a4()", "participant_id": "615995652843962691" }, "type": "message" @@ -485,9 +504,7 @@ int tmain() { "from": { "activity_id": "2284981553733959328", - "activity_name": "clanguml::t20033::tmain()", - "participant_id": "2284981553733959328", - "participant_name": "clanguml::t20033::tmain()" + "participant_id": "2284981553733959328" }, "name": "a3()", "return_type": "int", @@ -500,7 +517,6 @@ int tmain() }, "to": { "activity_id": "55903385814245839", - "activity_name": "clanguml::t20033::A::a3()", "participant_id": "615995652843962691" }, "type": "message" @@ -517,9 +533,7 @@ int tmain() { "from": { "activity_id": "2284981553733959328", - "activity_name": "clanguml::t20033::tmain()", - "participant_id": "2284981553733959328", - "participant_name": "clanguml::t20033::tmain()" + "participant_id": "2284981553733959328" }, "name": "a4()", "return_type": "int", @@ -532,7 +546,6 @@ int tmain() }, "to": { "activity_id": "1686426476339443579", - "activity_name": "clanguml::t20033::A::a4()", "participant_id": "615995652843962691" }, "type": "message" @@ -555,9 +568,7 @@ int tmain() { "from": { "activity_id": "2284981553733959328", - "activity_name": "clanguml::t20033::tmain()", - "participant_id": "2284981553733959328", - "participant_name": "clanguml::t20033::tmain()" + "participant_id": "2284981553733959328" }, "name": "a4()", "return_type": "int", @@ -570,7 +581,6 @@ int tmain() }, "to": { "activity_id": "1686426476339443579", - "activity_name": "clanguml::t20033::A::a4()", "participant_id": "615995652843962691" }, "type": "message" diff --git a/docs/test_cases/t20033_sequence.svg b/docs/test_cases/t20033_sequence.svg index b2757a42..27567f15 100644 --- a/docs/test_cases/t20033_sequence.svg +++ b/docs/test_cases/t20033_sequence.svg @@ -1,222 +1,233 @@ - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - tmain() - - tmain() + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + tmain() + + tmain() - - - A - - A + + + A + + A - - - - - - - - - - - - - - - - - - - - alt - [false] - - [reinterpret_cast<uint64_t>(&a) % 100 == 0ULL] - - - - a1() + + + + + + + + + + + + + + + + + + + + alt + [false] + + [reinterpret_cast<uint64_t>(&a) % 100 == 0ULL] + + + + a1() - - - - [reinterpret_cast<uint64_t>(&a) % 64 == 0ULL] - - - - a2() + + + + [reinterpret_cast<uint64_t>(&a) % 64 == 0ULL] + + + + a2() - - - - [a.a2() == 2 && a.a3() == 3] - - - - [ - a2() - ] + + + + [a.a2() == 2 && a.a3() == 3] + + + + [ + a2() + ] - - - - - - [ - a3() - ] + + + + + + [ + a3() + ] - - - - - - a3() + + + + + + a3() - - - - - - - a4() + + + + + + + a4() - - - - - alt - [int i = a.a2(); i != 2] - - - - [ - a2() - ] + + + + + alt + [int i = a.a2(); i != 2] + + + + [ + a2() + ] - - - - - - a3() + + + + + + a3() - - - - - loop - [int i = 0; i < a.a2(); i++] - - - - [ - a2() - ] + + + + + loop + [int i = 0; i < a.a2(); i++] + + + + [ + a2() + ] - - - - - - a3() + + + + + + a3() - - - - - - a3() + + + + + + a3() - - - - - loop - [retry_count--] - - - - a2() + + + + + loop + [retry_count--] + + + + a2() - - - - - loop - [retry_count++ < a.a3()] - - - - a4() + + + + + loop + [retry_count++ < a.a3()] + + + + a4() - - - - - - [ - a3() - ] + + + + + + [ + a3() + ] - - - - - alt - [a.a4() % 6] - - - - [ - a4() - ] + + + + + alt + [a.a4() % 6] + + + + [ + a4() + ] - - - - - - loop - [ints] - - - - a4() + + + + + + loop + [ints] + + + + a4() - - + + diff --git a/docs/test_cases/t20033_sequence_mermaid.svg b/docs/test_cases/t20033_sequence_mermaid.svg index da3436dd..95d14083 100644 --- a/docs/test_cases/t20033_sequence_mermaid.svg +++ b/docs/test_cases/t20033_sequence_mermaid.svg @@ -48,17 +48,17 @@ - + - + - + @@ -102,11 +102,11 @@ [false] - [reinterpret_cast<uint- - 64_t>(&a) % 100 == + [reinterpret_cast<uint6- + 4_t>(&a) % 100 == 0ULL] - [reinterpret_cast<uint- - 64_t>(&a) % 64 == + [reinterpret_cast<uint6- + 4_t>(&a) % 64 == 0ULL] [a.a2() == 2 && a.a3() == 3] @@ -217,68 +217,68 @@ [ints] - a1() - - ​ - - a2() - - ​ - - [a2()] - - ​ - - [a3()] - - ​ - - a3() - - ​ - - a4() - - ​ - - [a2()] - - ​ - - a3() - - ​ - - [a2()] - - ​ - - a3() - - ​ - - a3() - - ​ - - a2() - - ​ - - a4() - - ​ - - [a3()] - - ​ - - [a4()] - - ​ - - a4() - - ​ - + a1() + + ​ + + a2() + + ​ + + [a2()] + + ​ + + [a3()] + + ​ + + a3() + + ​ + + a4() + + ​ + + [a2()] + + ​ + + a3() + + ​ + + [a2()] + + ​ + + a3() + + ​ + + a3() + + ​ + + a2() + + ​ + + a4() + + ​ + + [a3()] + + ​ + + [a4()] + + ​ + + a4() + + ​ + diff --git a/docs/test_cases/t20034.md b/docs/test_cases/t20034.md index 5eab7fee..39cb673b 100644 --- a/docs/test_cases/t20034.md +++ b/docs/test_cases/t20034.md @@ -100,8 +100,25 @@ void B::b4() "name": "t20034_sequence", "participants": [ { + "activities": [ + { + "display_name": "d2()", + "id": "1707514178726476738", + "name": "d2", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20034.cc", + "line": 46, + "translation_unit": "t20034.cc" + }, + "type": "method" + } + ], + "display_name": "D", "id": "272777525372220260", - "name": "clanguml::t20034::D", + "name": "D", + "namespace": "clanguml::t20034", "source_location": { "column": 8, "file": "t20034.cc", @@ -111,8 +128,64 @@ void B::b4() "type": "class" }, { + "activities": [ + { + "display_name": "c2()", + "id": "472904899982022039", + "name": "c2", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20034.cc", + "line": 30, + "translation_unit": "t20034.cc" + }, + "type": "method" + }, + { + "display_name": "c4()", + "id": "395720534444062628", + "name": "c4", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20034.cc", + "line": 39, + "translation_unit": "t20034.cc" + }, + "type": "method" + }, + { + "display_name": "c1()", + "id": "148530508384958711", + "name": "c1", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20034.cc", + "line": 29, + "translation_unit": "t20034.cc" + }, + "type": "method" + }, + { + "display_name": "c3()", + "id": "2116989777037608337", + "name": "c3", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20034.cc", + "line": 31, + "translation_unit": "t20034.cc" + }, + "type": "method" + } + ], + "display_name": "C", "id": "2153793652884753477", - "name": "clanguml::t20034::C", + "name": "C", + "namespace": "clanguml::t20034", "source_location": { "column": 8, "file": "t20034.cc", @@ -122,8 +195,51 @@ void B::b4() "type": "class" }, { + "activities": [ + { + "display_name": "b2()", + "id": "1034410188120190919", + "name": "b2", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20034.cc", + "line": 19, + "translation_unit": "t20034.cc" + }, + "type": "method" + }, + { + "display_name": "b4()", + "id": "1774155279072101253", + "name": "b4", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20034.cc", + "line": 65, + "translation_unit": "t20034.cc" + }, + "type": "method" + }, + { + "display_name": "b1()", + "id": "289899516984058785", + "name": "b1", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20034.cc", + "line": 14, + "translation_unit": "t20034.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "1214895773389400008", - "name": "clanguml::t20034::B", + "name": "B", + "namespace": "clanguml::t20034", "source_location": { "column": 8, "file": "t20034.cc", @@ -133,8 +249,25 @@ void B::b4() "type": "class" }, { + "activities": [ + { + "display_name": "a2()", + "id": "1307188853155365430", + "name": "a2", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20034.cc", + "line": 7, + "translation_unit": "t20034.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "1029414747563549012", - "name": "clanguml::t20034::A", + "name": "A", + "namespace": "clanguml::t20034", "source_location": { "column": 8, "file": "t20034.cc", @@ -144,15 +277,26 @@ void B::b4() "type": "class" }, { + "activities": [ + { + "display_name": "operator()()", + "id": "1996671438591925718", + "name": "operator()", + "namespace": "", + "type": "method" + } + ], + "display_name": "D::d2()::(lambda t20034.cc:56:18)", "id": "1026588549514900751", - "name": "clanguml::t20034::D::d2()::(lambda t20034.cc:56:18)", + "name": "D::d2()::(lambda t20034.cc:56:18)", + "namespace": "clanguml::t20034", "source_location": { "column": 18, "file": "t20034.cc", "line": 56, "translation_unit": "t20034.cc" }, - "type": "class" + "type": "lambda" } ], "sequences": [ @@ -173,7 +317,6 @@ void B::b4() { "from": { "activity_id": "1707514178726476738", - "activity_name": "clanguml::t20034::D::d2()", "participant_id": "272777525372220260" }, "name": "c2()", @@ -187,7 +330,6 @@ void B::b4() }, "to": { "activity_id": "472904899982022039", - "activity_name": "clanguml::t20034::C::c2()", "participant_id": "2153793652884753477" }, "type": "message" @@ -195,7 +337,6 @@ void B::b4() { "from": { "activity_id": "472904899982022039", - "activity_name": "clanguml::t20034::C::c2()", "participant_id": "2153793652884753477" }, "name": "b2()", @@ -209,7 +350,6 @@ void B::b4() }, "to": { "activity_id": "1034410188120190919", - "activity_name": "clanguml::t20034::B::b2()", "participant_id": "1214895773389400008" }, "type": "message" @@ -217,7 +357,6 @@ void B::b4() { "from": { "activity_id": "1034410188120190919", - "activity_name": "clanguml::t20034::B::b2()", "participant_id": "1214895773389400008" }, "name": "a2()", @@ -231,7 +370,6 @@ void B::b4() }, "to": { "activity_id": "1307188853155365430", - "activity_name": "clanguml::t20034::A::a2()", "participant_id": "1029414747563549012" }, "type": "message" @@ -243,7 +381,6 @@ void B::b4() { "from": { "activity_id": "1707514178726476738", - "activity_name": "clanguml::t20034::D::d2()", "participant_id": "272777525372220260" }, "name": "a2()", @@ -257,7 +394,6 @@ void B::b4() }, "to": { "activity_id": "1307188853155365430", - "activity_name": "clanguml::t20034::A::a2()", "participant_id": "1029414747563549012" }, "type": "message" @@ -269,7 +405,6 @@ void B::b4() { "from": { "activity_id": "1707514178726476738", - "activity_name": "clanguml::t20034::D::d2()", "participant_id": "272777525372220260" }, "name": "operator()()", @@ -283,7 +418,6 @@ void B::b4() }, "to": { "activity_id": "1996671438591925718", - "activity_name": "clanguml::t20034::D::d2()##(lambda t20034.cc:56:18)::operator()()", "participant_id": "1026588549514900751" }, "type": "message" @@ -291,7 +425,6 @@ void B::b4() { "from": { "activity_id": "1996671438591925718", - "activity_name": "clanguml::t20034::D::d2()::(lambda t20034.cc:56:18)::operator()()", "participant_id": "1026588549514900751" }, "name": "a2()", @@ -305,7 +438,6 @@ void B::b4() }, "to": { "activity_id": "1307188853155365430", - "activity_name": "clanguml::t20034::A::a2()", "participant_id": "1029414747563549012" }, "type": "message" @@ -317,7 +449,6 @@ void B::b4() { "from": { "activity_id": "1707514178726476738", - "activity_name": "clanguml::t20034::D::d2()", "participant_id": "272777525372220260" }, "name": "c4()", @@ -331,7 +462,6 @@ void B::b4() }, "to": { "activity_id": "395720534444062628", - "activity_name": "clanguml::t20034::C::c4()", "participant_id": "2153793652884753477" }, "type": "message" @@ -339,7 +469,6 @@ void B::b4() { "from": { "activity_id": "395720534444062628", - "activity_name": "clanguml::t20034::C::c4()", "participant_id": "2153793652884753477" }, "name": "b4()", @@ -353,7 +482,6 @@ void B::b4() }, "to": { "activity_id": "1774155279072101253", - "activity_name": "clanguml::t20034::B::b4()", "participant_id": "1214895773389400008" }, "type": "message" @@ -361,7 +489,6 @@ void B::b4() { "from": { "activity_id": "1774155279072101253", - "activity_name": "clanguml::t20034::B::b4()", "participant_id": "1214895773389400008" }, "name": "b2()", @@ -375,7 +502,6 @@ void B::b4() }, "to": { "activity_id": "1034410188120190919", - "activity_name": "clanguml::t20034::B::b2()", "participant_id": "1214895773389400008" }, "type": "message" @@ -383,7 +509,6 @@ void B::b4() { "from": { "activity_id": "1034410188120190919", - "activity_name": "clanguml::t20034::B::b2()", "participant_id": "1214895773389400008" }, "name": "a2()", @@ -397,7 +522,6 @@ void B::b4() }, "to": { "activity_id": "1307188853155365430", - "activity_name": "clanguml::t20034::A::a2()", "participant_id": "1029414747563549012" }, "type": "message" @@ -409,7 +533,6 @@ void B::b4() { "from": { "activity_id": "1707514178726476738", - "activity_name": "clanguml::t20034::D::d2()", "participant_id": "272777525372220260" }, "name": "c1()", @@ -423,7 +546,6 @@ void B::b4() }, "to": { "activity_id": "148530508384958711", - "activity_name": "clanguml::t20034::C::c1()", "participant_id": "2153793652884753477" }, "type": "message" @@ -431,7 +553,6 @@ void B::b4() { "from": { "activity_id": "148530508384958711", - "activity_name": "clanguml::t20034::C::c1()", "participant_id": "2153793652884753477" }, "name": "b1()", @@ -445,7 +566,6 @@ void B::b4() }, "to": { "activity_id": "289899516984058785", - "activity_name": "clanguml::t20034::B::b1()", "participant_id": "1214895773389400008" }, "type": "message" @@ -453,7 +573,6 @@ void B::b4() { "from": { "activity_id": "289899516984058785", - "activity_name": "clanguml::t20034::B::b1()", "participant_id": "1214895773389400008" }, "name": "a2()", @@ -467,7 +586,6 @@ void B::b4() }, "to": { "activity_id": "1307188853155365430", - "activity_name": "clanguml::t20034::A::a2()", "participant_id": "1029414747563549012" }, "type": "message" @@ -479,7 +597,6 @@ void B::b4() { "from": { "activity_id": "1707514178726476738", - "activity_name": "clanguml::t20034::D::d2()", "participant_id": "272777525372220260" }, "name": "c3()", @@ -493,7 +610,6 @@ void B::b4() }, "to": { "activity_id": "2116989777037608337", - "activity_name": "clanguml::t20034::C::c3()", "participant_id": "2153793652884753477" }, "type": "message" @@ -501,7 +617,6 @@ void B::b4() { "from": { "activity_id": "2116989777037608337", - "activity_name": "clanguml::t20034::C::c3()", "participant_id": "2153793652884753477" }, "name": "c2()", @@ -515,7 +630,6 @@ void B::b4() }, "to": { "activity_id": "472904899982022039", - "activity_name": "clanguml::t20034::C::c2()", "participant_id": "2153793652884753477" }, "type": "message" @@ -523,7 +637,6 @@ void B::b4() { "from": { "activity_id": "472904899982022039", - "activity_name": "clanguml::t20034::C::c2()", "participant_id": "2153793652884753477" }, "name": "b2()", @@ -537,7 +650,6 @@ void B::b4() }, "to": { "activity_id": "1034410188120190919", - "activity_name": "clanguml::t20034::B::b2()", "participant_id": "1214895773389400008" }, "type": "message" @@ -545,7 +657,6 @@ void B::b4() { "from": { "activity_id": "1034410188120190919", - "activity_name": "clanguml::t20034::B::b2()", "participant_id": "1214895773389400008" }, "name": "a2()", @@ -559,7 +670,6 @@ void B::b4() }, "to": { "activity_id": "1307188853155365430", - "activity_name": "clanguml::t20034::A::a2()", "participant_id": "1029414747563549012" }, "type": "message" diff --git a/docs/test_cases/t20034_sequence.svg b/docs/test_cases/t20034_sequence.svg index d12a4ac2..e640f39c 100644 --- a/docs/test_cases/t20034_sequence.svg +++ b/docs/test_cases/t20034_sequence.svg @@ -1,164 +1,170 @@ - + + + + + + + - - - - - - - - D - - D + + + + + + + + D + + D - - - C - - C + + + C + + C - - - B - - B + + + B + + B - - - A - - A + + + A + + A - - - D::d2()::(lambda t20034.cc:56:18) - - D::d2()::(lambda t20034.cc:56:18) + + + D::d2()::(lambda t20034.cc:56:18) + + D::d2()::(lambda t20034.cc:56:18) - - - d2() - - - - c2() + + + d2() + + + + c2() - - - - b2() + + + + b2() - - - - a2() + + + + a2() - - - - - - d2() - - - - a2() + + + + + + d2() + + + + a2() - - - - - - d2() - - - - operator()() + + + + + + d2() + + + + operator()() - - - - a2() + + + + a2() - - - - - - d2() - - - - c4() + + + + + + d2() + + + + c4() - - - - b4() + + + + b4() - - - - - - b2() + + + + + + b2() - - - - a2() + + + + a2() - - - - - - d2() - - - - c1() + + + + + + d2() + + + + c1() - - - - b1() + + + + b1() - - - - a2() + + + + a2() - - - - - - d2() - - - - c3() + + + + + + d2() + + + + c3() - - - - - - c2() + + + + + + c2() - - - - b2() + + + + b2() - - - - a2() + + + + a2() diff --git a/docs/test_cases/t20034_sequence_mermaid.svg b/docs/test_cases/t20034_sequence_mermaid.svg index 50735c40..e8db8167 100644 --- a/docs/test_cases/t20034_sequence_mermaid.svg +++ b/docs/test_cases/t20034_sequence_mermaid.svg @@ -108,17 +108,17 @@ - + - + - + @@ -127,50 +127,50 @@ - d2() - - c2() - - b2() - - a2() - - d2() - - a2() - - d2() - - operator()() - - a2() - - d2() - - c4() - - b4() - - b2() - - a2() - - d2() - - c1() - - b1() - - a2() - - d2() - - c3() - - c2() - - b2() - - a2() - + d2() + + c2() + + b2() + + a2() + + d2() + + a2() + + d2() + + operator()() + + a2() + + d2() + + c4() + + b4() + + b2() + + a2() + + d2() + + c1() + + b1() + + a2() + + d2() + + c3() + + c2() + + b2() + + a2() + diff --git a/docs/test_cases/t20035.md b/docs/test_cases/t20035.md index 65eb29c0..a9d791df 100644 --- a/docs/test_cases/t20035.md +++ b/docs/test_cases/t20035.md @@ -43,8 +43,10 @@ int tmain(int argc, char **argv) { return a(argc); } "name": "t20035_sequence", "participants": [ { + "display_name": "tmain(int,char **)", "id": "1380099746477810520", - "name": "clanguml::t20035::tmain(int,char **)", + "name": "tmain", + "namespace": "clanguml::t20035", "source_location": { "column": 5, "file": "t20035.cc", @@ -54,8 +56,10 @@ int tmain(int argc, char **argv) { return a(argc); } "type": "function" }, { + "display_name": "a(int)", "id": "1503144831959453736", - "name": "clanguml::t20035::a(int)", + "name": "a", + "namespace": "clanguml::t20035", "source_location": { "column": 5, "file": "t20035.cc", @@ -65,8 +69,10 @@ int tmain(int argc, char **argv) { return a(argc); } "type": "function" }, { + "display_name": "b1(int)", "id": "440199113909747659", - "name": "clanguml::t20035::b1(int)", + "name": "b1", + "namespace": "clanguml::t20035", "source_location": { "column": 5, "file": "t20035.cc", @@ -76,8 +82,10 @@ int tmain(int argc, char **argv) { return a(argc); } "type": "function" }, { + "display_name": "c(int)", "id": "709102392181022891", - "name": "clanguml::t20035::c(int)", + "name": "c", + "namespace": "clanguml::t20035", "source_location": { "column": 5, "file": "t20035.cc", @@ -105,9 +113,7 @@ int tmain(int argc, char **argv) { return a(argc); } { "from": { "activity_id": "1380099746477810520", - "activity_name": "clanguml::t20035::tmain(int,char **)", - "participant_id": "1380099746477810520", - "participant_name": "clanguml::t20035::tmain(int,char **)" + "participant_id": "1380099746477810520" }, "name": "", "return_type": "int", @@ -120,7 +126,6 @@ int tmain(int argc, char **argv) { return a(argc); } }, "to": { "activity_id": "1503144831959453736", - "activity_name": "clanguml::t20035::a(int)", "participant_id": "1503144831959453736" }, "type": "message" @@ -128,9 +133,7 @@ int tmain(int argc, char **argv) { return a(argc); } { "from": { "activity_id": "1503144831959453736", - "activity_name": "clanguml::t20035::a(int)", - "participant_id": "1503144831959453736", - "participant_name": "clanguml::t20035::a(int)" + "participant_id": "1503144831959453736" }, "name": "", "return_type": "int", @@ -143,7 +146,6 @@ int tmain(int argc, char **argv) { return a(argc); } }, "to": { "activity_id": "440199113909747659", - "activity_name": "clanguml::t20035::b1(int)", "participant_id": "440199113909747659" }, "type": "message" @@ -151,9 +153,7 @@ int tmain(int argc, char **argv) { return a(argc); } { "from": { "activity_id": "440199113909747659", - "activity_name": "clanguml::t20035::b1(int)", - "participant_id": "440199113909747659", - "participant_name": "clanguml::t20035::b1(int)" + "participant_id": "440199113909747659" }, "name": "", "return_type": "int", @@ -166,7 +166,6 @@ int tmain(int argc, char **argv) { return a(argc); } }, "to": { "activity_id": "709102392181022891", - "activity_name": "clanguml::t20035::c(int)", "participant_id": "709102392181022891" }, "type": "message" diff --git a/docs/test_cases/t20035_sequence.svg b/docs/test_cases/t20035_sequence.svg index 3a9db5a3..524d34bc 100644 --- a/docs/test_cases/t20035_sequence.svg +++ b/docs/test_cases/t20035_sequence.svg @@ -1,47 +1,53 @@ - + + + + + + + - - - - - - - tmain(int,char **) - - tmain(int,char **) + + + + + + + tmain(int,char **) + + tmain(int,char **) - - - a(int) - - a(int) + + + a(int) + + a(int) - - - b1(int) - - b1(int) + + + b1(int) + + b1(int) - - - c(int) - - c(int) + + + c(int) + + c(int) - - - + + + - - - + + + - - - + + + diff --git a/docs/test_cases/t20035_sequence_mermaid.svg b/docs/test_cases/t20035_sequence_mermaid.svg index f0b89c98..dbd1dab4 100644 --- a/docs/test_cases/t20035_sequence_mermaid.svg +++ b/docs/test_cases/t20035_sequence_mermaid.svg @@ -78,17 +78,17 @@ - + - + - + @@ -97,10 +97,10 @@ - ​ - - ​ - - ​ - + ​ + + ​ + + ​ + diff --git a/docs/test_cases/t20036.md b/docs/test_cases/t20036.md index 0c56f2a7..9b3e4dae 100644 --- a/docs/test_cases/t20036.md +++ b/docs/test_cases/t20036.md @@ -72,8 +72,64 @@ struct D { "name": "t20036_sequence", "participants": [ { + "activities": [ + { + "display_name": "c1()", + "id": "1742507735898803374", + "name": "c1", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20036.cc", + "line": 20, + "translation_unit": "t20036.cc" + }, + "type": "method" + }, + { + "display_name": "c2()", + "id": "128745191811378037", + "name": "c2", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20036.cc", + "line": 21, + "translation_unit": "t20036.cc" + }, + "type": "method" + }, + { + "display_name": "c4()", + "id": "1735839766717973272", + "name": "c4", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20036.cc", + "line": 30, + "translation_unit": "t20036.cc" + }, + "type": "method" + }, + { + "display_name": "c3()", + "id": "1523531372012294984", + "name": "c3", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20036.cc", + "line": 22, + "translation_unit": "t20036.cc" + }, + "type": "method" + } + ], + "display_name": "C", "id": "589458700000736705", - "name": "clanguml::t20036::C", + "name": "C", + "namespace": "clanguml::t20036", "source_location": { "column": 8, "file": "t20036.cc", @@ -83,8 +139,38 @@ struct D { "type": "class" }, { + "activities": [ + { + "display_name": "b1()", + "id": "203660950902052846", + "name": "b1", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20036.cc", + "line": 12, + "translation_unit": "t20036.cc" + }, + "type": "method" + }, + { + "display_name": "b2()", + "id": "1726094580455938498", + "name": "b2", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20036.cc", + "line": 13, + "translation_unit": "t20036.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "607147607288902300", - "name": "clanguml::t20036::B", + "name": "B", + "namespace": "clanguml::t20036", "source_location": { "column": 8, "file": "t20036.cc", @@ -94,8 +180,25 @@ struct D { "type": "class" }, { + "activities": [ + { + "display_name": "a2()", + "id": "2124074228514438863", + "name": "a2", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20036.cc", + "line": 7, + "translation_unit": "t20036.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "399722216848214287", - "name": "clanguml::t20036::A", + "name": "A", + "namespace": "clanguml::t20036", "source_location": { "column": 8, "file": "t20036.cc", @@ -105,8 +208,51 @@ struct D { "type": "class" }, { + "activities": [ + { + "display_name": "d1()", + "id": "701488875613014930", + "name": "d1", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20036.cc", + "line": 36, + "translation_unit": "t20036.cc" + }, + "type": "method" + }, + { + "display_name": "d3()", + "id": "1897648539724183065", + "name": "d3", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20036.cc", + "line": 38, + "translation_unit": "t20036.cc" + }, + "type": "method" + }, + { + "display_name": "d2()", + "id": "1534436779969087203", + "name": "d2", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20036.cc", + "line": 37, + "translation_unit": "t20036.cc" + }, + "type": "method" + } + ], + "display_name": "D", "id": "847434467114564641", - "name": "clanguml::t20036::D", + "name": "D", + "namespace": "clanguml::t20036", "source_location": { "column": 8, "file": "t20036.cc", @@ -124,7 +270,6 @@ struct D { { "from": { "activity_id": "1742507735898803374", - "activity_name": "clanguml::t20036::C::c1()", "participant_id": "589458700000736705" }, "name": "b1()", @@ -138,7 +283,6 @@ struct D { }, "to": { "activity_id": "203660950902052846", - "activity_name": "clanguml::t20036::B::b1()", "participant_id": "607147607288902300" }, "type": "message" @@ -146,7 +290,6 @@ struct D { { "from": { "activity_id": "203660950902052846", - "activity_name": "clanguml::t20036::B::b1()", "participant_id": "607147607288902300" }, "name": "a2()", @@ -160,7 +303,6 @@ struct D { }, "to": { "activity_id": "2124074228514438863", - "activity_name": "clanguml::t20036::A::a2()", "participant_id": "399722216848214287" }, "type": "message" @@ -172,7 +314,6 @@ struct D { { "from": { "activity_id": "701488875613014930", - "activity_name": "clanguml::t20036::D::d1()", "participant_id": "847434467114564641" }, "name": "c2()", @@ -186,7 +327,6 @@ struct D { }, "to": { "activity_id": "128745191811378037", - "activity_name": "clanguml::t20036::C::c2()", "participant_id": "589458700000736705" }, "type": "message" @@ -194,7 +334,6 @@ struct D { { "from": { "activity_id": "128745191811378037", - "activity_name": "clanguml::t20036::C::c2()", "participant_id": "589458700000736705" }, "name": "b2()", @@ -208,7 +347,6 @@ struct D { }, "to": { "activity_id": "1726094580455938498", - "activity_name": "clanguml::t20036::B::b2()", "participant_id": "607147607288902300" }, "type": "message" @@ -216,7 +354,6 @@ struct D { { "from": { "activity_id": "1726094580455938498", - "activity_name": "clanguml::t20036::B::b2()", "participant_id": "607147607288902300" }, "name": "a2()", @@ -230,7 +367,6 @@ struct D { }, "to": { "activity_id": "2124074228514438863", - "activity_name": "clanguml::t20036::A::a2()", "participant_id": "399722216848214287" }, "type": "message" @@ -242,7 +378,6 @@ struct D { { "from": { "activity_id": "1897648539724183065", - "activity_name": "clanguml::t20036::D::d3()", "participant_id": "847434467114564641" }, "name": "a2()", @@ -256,7 +391,6 @@ struct D { }, "to": { "activity_id": "2124074228514438863", - "activity_name": "clanguml::t20036::A::a2()", "participant_id": "399722216848214287" }, "type": "message" @@ -268,7 +402,6 @@ struct D { { "from": { "activity_id": "1735839766717973272", - "activity_name": "clanguml::t20036::C::c4()", "participant_id": "589458700000736705" }, "name": "b2()", @@ -282,7 +415,6 @@ struct D { }, "to": { "activity_id": "1726094580455938498", - "activity_name": "clanguml::t20036::B::b2()", "participant_id": "607147607288902300" }, "type": "message" @@ -290,7 +422,6 @@ struct D { { "from": { "activity_id": "1726094580455938498", - "activity_name": "clanguml::t20036::B::b2()", "participant_id": "607147607288902300" }, "name": "a2()", @@ -304,7 +435,6 @@ struct D { }, "to": { "activity_id": "2124074228514438863", - "activity_name": "clanguml::t20036::A::a2()", "participant_id": "399722216848214287" }, "type": "message" @@ -316,7 +446,6 @@ struct D { { "from": { "activity_id": "1523531372012294984", - "activity_name": "clanguml::t20036::C::c3()", "participant_id": "589458700000736705" }, "name": "c2()", @@ -330,7 +459,6 @@ struct D { }, "to": { "activity_id": "128745191811378037", - "activity_name": "clanguml::t20036::C::c2()", "participant_id": "589458700000736705" }, "type": "message" @@ -338,7 +466,6 @@ struct D { { "from": { "activity_id": "128745191811378037", - "activity_name": "clanguml::t20036::C::c2()", "participant_id": "589458700000736705" }, "name": "b2()", @@ -352,7 +479,6 @@ struct D { }, "to": { "activity_id": "1726094580455938498", - "activity_name": "clanguml::t20036::B::b2()", "participant_id": "607147607288902300" }, "type": "message" @@ -360,7 +486,6 @@ struct D { { "from": { "activity_id": "1726094580455938498", - "activity_name": "clanguml::t20036::B::b2()", "participant_id": "607147607288902300" }, "name": "a2()", @@ -374,7 +499,6 @@ struct D { }, "to": { "activity_id": "2124074228514438863", - "activity_name": "clanguml::t20036::A::a2()", "participant_id": "399722216848214287" }, "type": "message" @@ -386,7 +510,6 @@ struct D { { "from": { "activity_id": "1534436779969087203", - "activity_name": "clanguml::t20036::D::d2()", "participant_id": "847434467114564641" }, "name": "c2()", @@ -400,7 +523,6 @@ struct D { }, "to": { "activity_id": "128745191811378037", - "activity_name": "clanguml::t20036::C::c2()", "participant_id": "589458700000736705" }, "type": "message" @@ -408,7 +530,6 @@ struct D { { "from": { "activity_id": "128745191811378037", - "activity_name": "clanguml::t20036::C::c2()", "participant_id": "589458700000736705" }, "name": "b2()", @@ -422,7 +543,6 @@ struct D { }, "to": { "activity_id": "1726094580455938498", - "activity_name": "clanguml::t20036::B::b2()", "participant_id": "607147607288902300" }, "type": "message" @@ -430,7 +550,6 @@ struct D { { "from": { "activity_id": "1726094580455938498", - "activity_name": "clanguml::t20036::B::b2()", "participant_id": "607147607288902300" }, "name": "a2()", @@ -444,7 +563,6 @@ struct D { }, "to": { "activity_id": "2124074228514438863", - "activity_name": "clanguml::t20036::A::a2()", "participant_id": "399722216848214287" }, "type": "message" diff --git a/docs/test_cases/t20036_sequence.svg b/docs/test_cases/t20036_sequence.svg index e4b965f7..25f29695 100644 --- a/docs/test_cases/t20036_sequence.svg +++ b/docs/test_cases/t20036_sequence.svg @@ -1,140 +1,146 @@ - + + + + + + + - - - - - - - C - - C + + + + + + + C + + C - - - B - - B + + + B + + B - - - A - - A + + + A + + A - - - D - - D + + + D + + D - - - c1() - - - - b1() + + + c1() + + + + b1() - - - - a2() + + + + a2() - - - - - - d1() - - - - c2() + + + + + + d1() + + + + c2() - - - - b2() + + + + b2() - - - - a2() + + + + a2() - - - - - - d3() - - - - a2() + + + + + + d3() + + + + a2() - - - - - - c4() - - - - b2() + + + + + + c4() + + + + b2() - - - - a2() + + + + a2() - - - - - - c3() - - - - - - c2() + + + + + + c3() + + + + + + c2() - - - - b2() + + + + b2() - - - - a2() + + + + a2() - - - - - - d2() - - - - c2() + + + + + + d2() + + + + c2() - - - - b2() + + + + b2() - - - - a2() + + + + a2() diff --git a/docs/test_cases/t20036_sequence_mermaid.svg b/docs/test_cases/t20036_sequence_mermaid.svg index 8614a6c3..cd661d11 100644 --- a/docs/test_cases/t20036_sequence_mermaid.svg +++ b/docs/test_cases/t20036_sequence_mermaid.svg @@ -93,17 +93,17 @@ - + - + - + @@ -112,44 +112,44 @@ - c1() - - b1() - - a2() - - d1() - - c2() - - b2() - - a2() - - d3() - - a2() - - c4() - - b2() - - a2() - - c3() - - c2() - - b2() - - a2() - - d2() - - c2() - - b2() - - a2() - + c1() + + b1() + + a2() + + d1() + + c2() + + b2() + + a2() + + d3() + + a2() + + c4() + + b2() + + a2() + + c3() + + c2() + + b2() + + a2() + + d2() + + c2() + + b2() + + a2() + diff --git a/docs/test_cases/t20037.md b/docs/test_cases/t20037.md index 92392e02..216ef07c 100644 --- a/docs/test_cases/t20037.md +++ b/docs/test_cases/t20037.md @@ -66,8 +66,10 @@ void tmain(int argc, char **argv) "name": "t20037_sequence", "participants": [ { + "display_name": "tmain(int,char **)", "id": "1676651465274088148", - "name": "clanguml::t20037::tmain(int,char **)", + "name": "tmain", + "namespace": "clanguml::t20037", "source_location": { "column": 6, "file": "t20037.cc", @@ -77,8 +79,10 @@ void tmain(int argc, char **argv) "type": "function" }, { + "display_name": "a()", "id": "150460916850164805", - "name": "clanguml::t20037::a()", + "name": "a", + "namespace": "clanguml::t20037", "source_location": { "column": 5, "file": "t20037.cc", @@ -88,8 +92,25 @@ void tmain(int argc, char **argv) "type": "function" }, { + "activities": [ + { + "display_name": "A()", + "id": "1135451191676888496", + "name": "A", + "namespace": "", + "source_location": { + "column": 5, + "file": "t20037.cc", + "line": 5, + "translation_unit": "t20037.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "1329920824155530080", - "name": "clanguml::t20037::A", + "name": "A", + "namespace": "clanguml::t20037", "source_location": { "column": 8, "file": "t20037.cc", @@ -99,8 +120,10 @@ void tmain(int argc, char **argv) "type": "class" }, { + "display_name": "initb()", "id": "1303264946914255327", - "name": "clanguml::t20037::initb()", + "name": "initb", + "namespace": "clanguml::t20037", "source_location": { "column": 3, "file": "t20037.cc", @@ -110,8 +133,25 @@ void tmain(int argc, char **argv) "type": "function" }, { + "activities": [ + { + "display_name": "get()", + "id": "107877908217538137", + "name": "get", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20037.cc", + "line": 14, + "translation_unit": "t20037.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "1746900845528413124", - "name": "clanguml::t20037::B", + "name": "B", + "namespace": "clanguml::t20037", "source_location": { "column": 8, "file": "t20037.cc", @@ -121,8 +161,10 @@ void tmain(int argc, char **argv) "type": "class" }, { + "display_name": "c()", "id": "1349992361928784583", - "name": "clanguml::t20037::c()", + "name": "c", + "namespace": "clanguml::t20037", "source_location": { "column": 5, "file": "t20037.cc", @@ -138,9 +180,7 @@ void tmain(int argc, char **argv) { "from": { "activity_id": "1676651465274088148", - "activity_name": "clanguml::t20037::tmain(int,char **)", - "participant_id": "1676651465274088148", - "participant_name": "clanguml::t20037::tmain(int,char **)" + "participant_id": "1676651465274088148" }, "name": "", "return_type": "int", @@ -153,7 +193,6 @@ void tmain(int argc, char **argv) }, "to": { "activity_id": "150460916850164805", - "activity_name": "clanguml::t20037::a()", "participant_id": "150460916850164805" }, "type": "message" @@ -161,9 +200,7 @@ void tmain(int argc, char **argv) { "from": { "activity_id": "150460916850164805", - "activity_name": "clanguml::t20037::a()", - "participant_id": "150460916850164805", - "participant_name": "clanguml::t20037::a()" + "participant_id": "150460916850164805" }, "name": "A()", "return_type": "void", @@ -176,7 +213,6 @@ void tmain(int argc, char **argv) }, "to": { "activity_id": "1135451191676888496", - "activity_name": "clanguml::t20037::A::A()", "participant_id": "1329920824155530080" }, "type": "message" @@ -184,9 +220,7 @@ void tmain(int argc, char **argv) { "from": { "activity_id": "150460916850164805", - "activity_name": "clanguml::t20037::a()", - "participant_id": "150460916850164805", - "participant_name": "clanguml::t20037::a()" + "participant_id": "150460916850164805" }, "name": "", "return_type": "B", @@ -199,7 +233,6 @@ void tmain(int argc, char **argv) }, "to": { "activity_id": "1303264946914255327", - "activity_name": "clanguml::t20037::initb()", "participant_id": "1303264946914255327" }, "type": "message" @@ -207,9 +240,7 @@ void tmain(int argc, char **argv) { "from": { "activity_id": "150460916850164805", - "activity_name": "clanguml::t20037::a()", - "participant_id": "150460916850164805", - "participant_name": "clanguml::t20037::a()" + "participant_id": "150460916850164805" }, "name": "get()", "return_type": "int", @@ -222,7 +253,6 @@ void tmain(int argc, char **argv) }, "to": { "activity_id": "107877908217538137", - "activity_name": "clanguml::t20037::B::get()", "participant_id": "1746900845528413124" }, "type": "message" @@ -230,9 +260,7 @@ void tmain(int argc, char **argv) { "from": { "activity_id": "150460916850164805", - "activity_name": "clanguml::t20037::a()", - "participant_id": "150460916850164805", - "participant_name": "clanguml::t20037::a()" + "participant_id": "150460916850164805" }, "name": "", "return_type": "int", @@ -245,7 +273,6 @@ void tmain(int argc, char **argv) }, "to": { "activity_id": "1349992361928784583", - "activity_name": "clanguml::t20037::c()", "participant_id": "1349992361928784583" }, "type": "message" @@ -253,9 +280,7 @@ void tmain(int argc, char **argv) { "from": { "activity_id": "1676651465274088148", - "activity_name": "clanguml::t20037::tmain(int,char **)", - "participant_id": "1676651465274088148", - "participant_name": "clanguml::t20037::tmain(int,char **)" + "participant_id": "1676651465274088148" }, "name": "", "return_type": "int", @@ -268,7 +293,6 @@ void tmain(int argc, char **argv) }, "to": { "activity_id": "150460916850164805", - "activity_name": "clanguml::t20037::a()", "participant_id": "150460916850164805" }, "type": "message" @@ -276,9 +300,7 @@ void tmain(int argc, char **argv) { "from": { "activity_id": "1676651465274088148", - "activity_name": "clanguml::t20037::tmain(int,char **)", - "participant_id": "1676651465274088148", - "participant_name": "clanguml::t20037::tmain(int,char **)" + "participant_id": "1676651465274088148" }, "name": "", "return_type": "int", @@ -291,7 +313,6 @@ void tmain(int argc, char **argv) }, "to": { "activity_id": "150460916850164805", - "activity_name": "clanguml::t20037::a()", "participant_id": "150460916850164805" }, "type": "message" diff --git a/docs/test_cases/t20037_sequence.svg b/docs/test_cases/t20037_sequence.svg index 14f65d44..fcece6cb 100644 --- a/docs/test_cases/t20037_sequence.svg +++ b/docs/test_cases/t20037_sequence.svg @@ -1,141 +1,147 @@ - + + + + + + + - - - - - - - - - - - - - - - - - - - - - tmain(int,char **) - - tmain(int,char **) + + + + + + + + + + + + + + + + + + + + + tmain(int,char **) + + tmain(int,char **) - - - a() - - a() + + + a() + + a() - - - A - - A + + + A + + A - - - initb() - - initb() + + + initb() + + initb() - - - B - - B + + + B + + B - - - c() - - c() + + + c() + + c() - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - A() + + + + A() - - - + + + - - - - - - get() + + + + + + get() - - - - - + + + + + - - - - - - - + + + + + + + - - - - get() + + + + get() - - - - - + + + + + - - - - - - - + + + + + + + - - - - get() + + + + get() - - - - - + + + + + - - - - + + + + diff --git a/docs/test_cases/t20037_sequence_mermaid.svg b/docs/test_cases/t20037_sequence_mermaid.svg index 531e44ec..eaf8a91c 100644 --- a/docs/test_cases/t20037_sequence_mermaid.svg +++ b/docs/test_cases/t20037_sequence_mermaid.svg @@ -108,17 +108,17 @@ - + - + - + @@ -163,46 +163,46 @@ - ​ - - A() - - ​ - - ​ - - get() - - ​ - - ​ - - ​ - - ​ - - ​ - - get() - - ​ - - ​ - - ​ - - ​ - - ​ - - get() - - ​ - - ​ - - ​ - - ​ - + ​ + + A() + + ​ + + ​ + + get() + + ​ + + ​ + + ​ + + ​ + + ​ + + get() + + ​ + + ​ + + ​ + + ​ + + ​ + + get() + + ​ + + ​ + + ​ + + ​ + diff --git a/docs/test_cases/t20038.md b/docs/test_cases/t20038.md index 681ad014..f6ffab1e 100644 --- a/docs/test_cases/t20038.md +++ b/docs/test_cases/t20038.md @@ -140,8 +140,10 @@ template T add(T a, T b) "name": "t20038_sequence", "participants": [ { + "display_name": "tmain()", "id": "1013610625329227974", - "name": "clanguml::t20038::tmain()", + "name": "tmain", + "namespace": "clanguml::t20038", "source_location": { "column": 5, "file": "t20038.cc", @@ -151,8 +153,77 @@ template T add(T a, T b) "type": "function" }, { + "activities": [ + { + "display_name": "b()", + "id": "690314603725772987", + "name": "b", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20038.cc", + "line": 29, + "translation_unit": "t20038.cc" + }, + "type": "method" + }, + { + "display_name": "bbb()", + "id": "1902331999195245434", + "name": "bbb", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20038.cc", + "line": 33, + "translation_unit": "t20038.cc" + }, + "type": "method" + }, + { + "display_name": "bbbb()", + "id": "57189865474209187", + "name": "bbbb", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20038.cc", + "line": 35, + "translation_unit": "t20038.cc" + }, + "type": "method" + }, + { + "display_name": "wrap(int)", + "id": "732774941205637034", + "name": "wrap", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20038.cc", + "line": 39, + "translation_unit": "t20038.cc" + }, + "type": "method" + }, + { + "display_name": "bbbbb()", + "id": "726295067786650864", + "name": "bbbbb", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20038.cc", + "line": 37, + "translation_unit": "t20038.cc" + }, + "type": "method" + } + ], + "display_name": "B", "id": "1040787777721396414", - "name": "clanguml::t20038::B", + "name": "B", + "namespace": "clanguml::t20038", "source_location": { "column": 8, "file": "t20038.cc", @@ -162,8 +233,51 @@ template T add(T a, T b) "type": "class" }, { + "activities": [ + { + "display_name": "a()", + "id": "1311298747919334371", + "name": "a", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20038.cc", + "line": 9, + "translation_unit": "t20038.cc" + }, + "type": "method" + }, + { + "display_name": "aaa()", + "id": "2157208254318041144", + "name": "aaa", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20038.cc", + "line": 21, + "translation_unit": "t20038.cc" + }, + "type": "method" + }, + { + "display_name": "aaaa()", + "id": "1370854824770046153", + "name": "aaaa", + "namespace": "", + "source_location": { + "column": 9, + "file": "t20038.cc", + "line": 23, + "translation_unit": "t20038.cc" + }, + "type": "method" + } + ], + "display_name": "A", "id": "2022724814881480995", - "name": "clanguml::t20038::A", + "name": "A", + "namespace": "clanguml::t20038", "source_location": { "column": 8, "file": "t20038.cc", @@ -173,8 +287,10 @@ template T add(T a, T b) "type": "class" }, { + "display_name": "add(int,int)", "id": "2008308445790932614", - "name": "clanguml::t20038::add(int,int)", + "name": "add", + "namespace": "clanguml::t20038", "source_location": { "column": 25, "file": "include/t20038.h", @@ -184,8 +300,10 @@ template T add(T a, T b) "type": "function_template" }, { + "display_name": "add_impl(int,int)", "id": "1863007445376981099", - "name": "clanguml::t20038::add_impl(int,int)", + "name": "add_impl", + "namespace": "clanguml::t20038", "source_location": { "column": 25, "file": "include/t20038.h", @@ -195,8 +313,10 @@ template T add(T a, T b) "type": "function_template" }, { + "display_name": "add_impl(double,double)", "id": "1722521509166427875", - "name": "clanguml::t20038::add_impl(double,double)", + "name": "add_impl", + "namespace": "clanguml::t20038", "source_location": { "column": 25, "file": "include/t20038.h", @@ -220,9 +340,7 @@ template T add(T a, T b) { "from": { "activity_id": "1013610625329227974", - "activity_name": "clanguml::t20038::tmain()", - "participant_id": "1013610625329227974", - "participant_name": "clanguml::t20038::tmain()" + "participant_id": "1013610625329227974" }, "name": "b()", "return_type": "int", @@ -235,7 +353,6 @@ template T add(T a, T b) }, "to": { "activity_id": "690314603725772987", - "activity_name": "clanguml::t20038::B::b()", "participant_id": "1040787777721396414" }, "type": "message" @@ -243,7 +360,6 @@ template T add(T a, T b) { "from": { "activity_id": "690314603725772987", - "activity_name": "clanguml::t20038::B::b()", "participant_id": "1040787777721396414" }, "name": "a()", @@ -257,7 +373,6 @@ template T add(T a, T b) }, "to": { "activity_id": "1311298747919334371", - "activity_name": "clanguml::t20038::A::a()", "participant_id": "2022724814881480995" }, "type": "message" @@ -275,9 +390,7 @@ template T add(T a, T b) "comment": "... or just once", "from": { "activity_id": "1013610625329227974", - "activity_name": "clanguml::t20038::tmain()", - "participant_id": "1013610625329227974", - "participant_name": "clanguml::t20038::tmain()" + "participant_id": "1013610625329227974" }, "name": "b()", "return_type": "int", @@ -290,7 +403,6 @@ template T add(T a, T b) }, "to": { "activity_id": "690314603725772987", - "activity_name": "clanguml::t20038::B::b()", "participant_id": "1040787777721396414" }, "type": "message" @@ -305,9 +417,7 @@ template T add(T a, T b) { "from": { "activity_id": "1013610625329227974", - "activity_name": "clanguml::t20038::tmain()", - "participant_id": "1013610625329227974", - "participant_name": "clanguml::t20038::tmain()" + "participant_id": "1013610625329227974" }, "name": "bbb()", "return_type": "int", @@ -320,7 +430,6 @@ template T add(T a, T b) }, "to": { "activity_id": "1902331999195245434", - "activity_name": "clanguml::t20038::B::bbb()", "participant_id": "1040787777721396414" }, "type": "message" @@ -328,7 +437,6 @@ template T add(T a, T b) { "from": { "activity_id": "1902331999195245434", - "activity_name": "clanguml::t20038::B::bbb()", "participant_id": "1040787777721396414" }, "name": "aaa()", @@ -342,7 +450,6 @@ template T add(T a, T b) }, "to": { "activity_id": "2157208254318041144", - "activity_name": "clanguml::t20038::A::aaa()", "participant_id": "2022724814881480995" }, "type": "message" @@ -350,9 +457,7 @@ template T add(T a, T b) { "from": { "activity_id": "1013610625329227974", - "activity_name": "clanguml::t20038::tmain()", - "participant_id": "1013610625329227974", - "participant_name": "clanguml::t20038::tmain()" + "participant_id": "1013610625329227974" }, "name": "bbbb()", "return_type": "int", @@ -365,7 +470,6 @@ template T add(T a, T b) }, "to": { "activity_id": "57189865474209187", - "activity_name": "clanguml::t20038::B::bbbb()", "participant_id": "1040787777721396414" }, "type": "message" @@ -373,7 +477,6 @@ template T add(T a, T b) { "from": { "activity_id": "57189865474209187", - "activity_name": "clanguml::t20038::B::bbbb()", "participant_id": "1040787777721396414" }, "name": "aaaa()", @@ -387,7 +490,6 @@ template T add(T a, T b) }, "to": { "activity_id": "1370854824770046153", - "activity_name": "clanguml::t20038::A::aaaa()", "participant_id": "2022724814881480995" }, "type": "message" @@ -395,7 +497,6 @@ template T add(T a, T b) { "from": { "activity_id": "1370854824770046153", - "activity_name": "clanguml::t20038::A::aaaa()", "participant_id": "2022724814881480995" }, "name": "", @@ -409,7 +510,6 @@ template T add(T a, T b) }, "to": { "activity_id": "2008308445790932614", - "activity_name": "clanguml::t20038::add(int,int)", "participant_id": "2008308445790932614" }, "type": "message" @@ -418,9 +518,7 @@ template T add(T a, T b) "comment": "Invoke 'add' implementation", "from": { "activity_id": "2008308445790932614", - "activity_name": "clanguml::t20038::add(int,int)", - "participant_id": "2008308445790932614", - "participant_name": "clanguml::t20038::add(int,int)" + "participant_id": "2008308445790932614" }, "name": "", "return_type": "", @@ -433,7 +531,6 @@ template T add(T a, T b) }, "to": { "activity_id": "1863007445376981099", - "activity_name": "clanguml::t20038::add_impl(int,int)", "participant_id": "1863007445376981099" }, "type": "message" @@ -442,9 +539,7 @@ template T add(T a, T b) "comment": "This comment should be rendered only once", "from": { "activity_id": "1013610625329227974", - "activity_name": "clanguml::t20038::tmain()", - "participant_id": "1013610625329227974", - "participant_name": "clanguml::t20038::tmain()" + "participant_id": "1013610625329227974" }, "name": "wrap(int)", "return_type": "int", @@ -457,7 +552,6 @@ template T add(T a, T b) }, "to": { "activity_id": "732774941205637034", - "activity_name": "clanguml::t20038::B::wrap(int)", "participant_id": "1040787777721396414" }, "type": "message" @@ -466,9 +560,7 @@ template T add(T a, T b) "comment": "What is 2 + 2?", "from": { "activity_id": "1013610625329227974", - "activity_name": "clanguml::t20038::tmain()", - "participant_id": "1013610625329227974", - "participant_name": "clanguml::t20038::tmain()" + "participant_id": "1013610625329227974" }, "name": "", "return_type": "", @@ -481,7 +573,6 @@ template T add(T a, T b) }, "to": { "activity_id": "1722521509166427875", - "activity_name": "clanguml::t20038::add_impl(double,double)", "participant_id": "1722521509166427875" }, "type": "message" @@ -490,9 +581,7 @@ template T add(T a, T b) "comment": "This is a generic comment about calling bbbbb()\n\n\\uml{note:some_other_diagram[] This is specific for some_other_diagram}\n\\uml{note:t20038_sequence[] Calling B::bbbbb()}", "from": { "activity_id": "1013610625329227974", - "activity_name": "clanguml::t20038::tmain()", - "participant_id": "1013610625329227974", - "participant_name": "clanguml::t20038::tmain()" + "participant_id": "1013610625329227974" }, "name": "bbbbb()", "return_type": "int", @@ -505,7 +594,6 @@ template T add(T a, T b) }, "to": { "activity_id": "726295067786650864", - "activity_name": "clanguml::t20038::B::bbbbb()", "participant_id": "1040787777721396414" }, "type": "message" @@ -513,7 +601,6 @@ template T add(T a, T b) { "from": { "activity_id": "726295067786650864", - "activity_name": "clanguml::t20038::B::bbbbb()", "participant_id": "1040787777721396414" }, "name": "aaaa()", @@ -527,7 +614,6 @@ template T add(T a, T b) }, "to": { "activity_id": "1370854824770046153", - "activity_name": "clanguml::t20038::A::aaaa()", "participant_id": "2022724814881480995" }, "type": "message" @@ -540,9 +626,7 @@ template T add(T a, T b) { "from": { "activity_id": "1013610625329227974", - "activity_name": "clanguml::t20038::tmain()", - "participant_id": "1013610625329227974", - "participant_name": "clanguml::t20038::tmain()" + "participant_id": "1013610625329227974" }, "name": "bbb()", "return_type": "int", @@ -555,7 +639,6 @@ template T add(T a, T b) }, "to": { "activity_id": "1902331999195245434", - "activity_name": "clanguml::t20038::B::bbb()", "participant_id": "1040787777721396414" }, "type": "message" diff --git a/docs/test_cases/t20038_sequence.svg b/docs/test_cases/t20038_sequence.svg index 193c7e9a..51bd9f06 100644 --- a/docs/test_cases/t20038_sequence.svg +++ b/docs/test_cases/t20038_sequence.svg @@ -1,263 +1,271 @@ - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - tmain() - - tmain() + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + tmain() + + tmain() - - - B - - B + + + B + + B - - - A - - A + + + A + + A - - - add<int>(int,int) - - add<int>(int,int) + + + add<int>(int,int) + + add<int>(int,int) - - - add_impl<int>(int,int) - - add_impl<int>(int,int) + + + add_impl<int>(int,int) + + add_impl<int>(int,int) - - - add_impl<double>(double,double) - - add_impl<double>(double,double) + + + add_impl<double>(double,double) + + add_impl<double>(double,double) - - - - - - - - - - - - - - - - - - - - - - Nisl purus in mollis nunc sed id semper. - Varius vel pharetra vel turpis. Arcu - cursus vitae congue mauris rhoncus. - Risus feugiat in ante metus dictum - at tempor. Lacus vel facilisis volutpat - est. Auctor urna nunc id cursus metus - aliquam. Diam sit amet nisl suscipit - adipiscing. Potenti nullam ac tortor - vitae purus faucibus ornare suspendisse - sed. Lobortis feugiat vivamus at augue - eget arcu dictum varius. Non tellus - orci ac auctor. - - - alt - - - Repeat 5 times... - - - loop - - - - b() + + + + + + + + + + + + + + + + + + + + + + Nisl purus in mollis nunc sed id semper. + Varius vel pharetra vel turpis. Arcu + cursus vitae congue mauris rhoncus. + Risus feugiat in ante metus dictum + at tempor. Lacus vel facilisis volutpat + est. Auctor urna nunc id cursus metus + aliquam. Diam sit amet nisl suscipit + adipiscing. Potenti nullam ac tortor + vitae purus faucibus ornare suspendisse + sed. Lobortis feugiat vivamus at augue + eget arcu dictum varius. Non tellus + orci ac auctor. + + + alt + + + Repeat 5 times... + + + loop + + + + b() - - - - a() + + + + a() - - - - - - - - ... or just once - - - - b() + + + + + + + + ... or just once + + + + b() - - - - a() + + + + a() - - - - - - - - bbb() + + + + + + + + bbb() - - - - aaa() + + + + aaa() - - - - - - - - bbbb() + + + + + + + + bbbb() - - - - aaaa() + + + + aaaa() - - - + + + - - - Invoke 'add' implementation - - - + + + Invoke 'add' implementation + + + - - - - - - - - - - - This comment should be rendered only - once - - - - wrap(int) + + + + + + + + + + + This comment should be rendered only + once + + + + wrap(int) - - - - - What is 2 + 2? - - - + + + + + What is 2 + 2? + + + - - - - - Calling B::bbbbb() - - - - bbbbb() + + + + + Calling B::bbbbb() + + + + bbbbb() - - - - aaaa() + + + + aaaa() - - - + + + - - - Invoke 'add' implementation - - - + + + Invoke 'add' implementation + + + - - - - - - - - - - - This is a conditional operator - - - alt - - - - [ - bbb() - ] + + + + + + + + + + + This is a conditional operator + + + alt + + + + [ + bbb() + ] - - - - aaa() + + + + aaa() - - - - - + + + + + diff --git a/docs/test_cases/t20038_sequence_mermaid.svg b/docs/test_cases/t20038_sequence_mermaid.svg index 25f5c352..91eb0a95 100644 --- a/docs/test_cases/t20038_sequence_mermaid.svg +++ b/docs/test_cases/t20038_sequence_mermaid.svg @@ -108,17 +108,17 @@ - + - + - + @@ -309,76 +309,76 @@ ​ - b() - - a() - - ​ - - ​ - - b() - - a() - - ​ - - ​ - - bbb() - - aaa() - - ​ - - ​ - - bbbb() - - aaaa() - - ​ - - ​ - - ​ - - ​ - - ​ - - ​ - - wrap(int) - - ​ - - ​ - - ​ - - bbbbb() - - aaaa() - - ​ - - ​ - - ​ - - ​ - - ​ - - ​ - - [bbb()] - - aaa() - - ​ - - ​ - + b() + + a() + + ​ + + ​ + + b() + + a() + + ​ + + ​ + + bbb() + + aaa() + + ​ + + ​ + + bbbb() + + aaaa() + + ​ + + ​ + + ​ + + ​ + + ​ + + ​ + + wrap(int) + + ​ + + ​ + + ​ + + bbbbb() + + aaaa() + + ​ + + ​ + + ​ + + ​ + + ​ + + ​ + + [bbb()] + + aaa() + + ​ + + ​ + diff --git a/docs/test_cases/t30001.md b/docs/test_cases/t30001.md index 911cfd67..a827202e 100644 --- a/docs/test_cases/t30001.md +++ b/docs/test_cases/t30001.md @@ -76,48 +76,21 @@ namespace BB { "diagram_type": "package", "elements": [ { - "display_name": "clanguml", - "elements": [ - { - "display_name": "clanguml::t30001", - "id": "1807513669798383046", - "is_deprecated": false, - "name": "t30001", - "source_location": { - "column": 11, - "file": "t30001.cc", - "line": 2, - "translation_unit": "t30001.cc" - }, - "type": "namespace" - } - ], - "id": "2174271399507040339", - "is_deprecated": false, - "name": "clanguml", - "source_location": { - "column": 11, - "file": "t30001.cc", - "line": 1, - "translation_unit": "t30001.cc" - }, - "type": "namespace" - }, - { - "display_name": "clanguml::t30001::A", + "display_name": "A", "elements": [ { "comment": { "formatted": "This is namespace AA in namespace A", "raw": "/// This is namespace AA in namespace A" }, - "display_name": "clanguml::t30001::A::AA", + "display_name": "AA", "elements": [ { - "display_name": "clanguml::t30001::A::AA::AAA", + "display_name": "AAA", "id": "274638237740249424", "is_deprecated": false, "name": "AAA", + "namespace": "clanguml::t30001::A::AA", "source_location": { "column": 11, "file": "t30001.cc", @@ -127,10 +100,11 @@ namespace BB { "type": "namespace" }, { - "display_name": "clanguml::t30001::A::AA::BBB", + "display_name": "BBB", "id": "2129154382024012563", "is_deprecated": false, "name": "BBB", + "namespace": "clanguml::t30001::A::AA", "source_location": { "column": 11, "file": "t30001.cc", @@ -143,6 +117,7 @@ namespace BB { "id": "1528517990989164155", "is_deprecated": false, "name": "AA", + "namespace": "clanguml::t30001::A", "source_location": { "column": 11, "file": "t30001.cc", @@ -152,10 +127,11 @@ namespace BB { "type": "namespace" }, { - "display_name": "clanguml::t30001::A::BB", + "display_name": "BB", "id": "983199564524723281", "is_deprecated": false, "name": "BB", + "namespace": "clanguml::t30001::A", "source_location": { "column": 11, "file": "t30001.cc", @@ -168,6 +144,7 @@ namespace BB { "id": "1184614645531659789", "is_deprecated": false, "name": "A", + "namespace": "clanguml::t30001", "source_location": { "column": 11, "file": "t30001.cc", @@ -177,20 +154,21 @@ namespace BB { "type": "namespace" }, { - "display_name": "clanguml::t30001::B", + "display_name": "B", "elements": [ { "comment": { "formatted": "This is namespace AA in namespace B", "raw": "/// This is namespace AA in namespace B" }, - "display_name": "clanguml::t30001::B::AA", + "display_name": "AA", "elements": [ { - "display_name": "clanguml::t30001::B::AA::AAA", + "display_name": "AAA", "id": "262162485307734028", "is_deprecated": false, "name": "AAA", + "namespace": "clanguml::t30001::B::AA", "source_location": { "column": 11, "file": "t30001.cc", @@ -200,10 +178,11 @@ namespace BB { "type": "namespace" }, { - "display_name": "clanguml::t30001::B::AA::BBB", + "display_name": "BBB", "id": "18542334992237803", "is_deprecated": false, "name": "BBB", + "namespace": "clanguml::t30001::B::AA", "source_location": { "column": 11, "file": "t30001.cc", @@ -216,6 +195,7 @@ namespace BB { "id": "895913707182089871", "is_deprecated": false, "name": "AA", + "namespace": "clanguml::t30001::B", "source_location": { "column": 11, "file": "t30001.cc", @@ -225,10 +205,11 @@ namespace BB { "type": "namespace" }, { - "display_name": "clanguml::t30001::B::BB", + "display_name": "BB", "id": "2230464321696304488", "is_deprecated": false, "name": "BB", + "namespace": "clanguml::t30001::B", "source_location": { "column": 11, "file": "t30001.cc", @@ -241,6 +222,7 @@ namespace BB { "id": "1931735210112054430", "is_deprecated": false, "name": "B", + "namespace": "clanguml::t30001", "source_location": { "column": 11, "file": "t30001.cc", @@ -251,6 +233,7 @@ namespace BB { } ], "name": "t30001_package", + "package_type": "namespace", "relationships": [], "title": "Basic package diagram example", "using_namespace": "clanguml::t30001" diff --git a/docs/test_cases/t30001_package.svg b/docs/test_cases/t30001_package.svg index b33ae30d..36e8b100 100644 --- a/docs/test_cases/t30001_package.svg +++ b/docs/test_cases/t30001_package.svg @@ -1,87 +1,76 @@ - + + + + + + + - Basic package diagram example - - - - - A - - - - - - - AA - - - - - - - B - - - - - - - AA - - - - - - AAA + Basic package diagram example + + + + A - - - - BBB + + + + AA - - - - BB + + + + B - - - - AAA + + + + AA - - - - BBB + + + + AAA - - - - BB + + + + BBB - - - - A AAA note... - - - - - This is namespace AA in namespace A - - - - - This is namespace AA in namespace B - - - - - - - + + + + BB + + + + + AAA + + + + + BBB + + + + + BB + + + + A AAA note... + + + This is namespace AA in namespace A + + + This is namespace AA in namespace B + + + diff --git a/docs/test_cases/t30001_package_mermaid.svg b/docs/test_cases/t30001_package_mermaid.svg index 93264eee..a1082ce0 100644 --- a/docs/test_cases/t30001_package_mermaid.svg +++ b/docs/test_cases/t30001_package_mermaid.svg @@ -1,22 +1,23 @@ - + + Basic package diagram example - + - + - + - + - + - + diff --git a/docs/test_cases/t30002.md b/docs/test_cases/t30002.md index 30880dce..f3e95fdb 100644 --- a/docs/test_cases/t30002.md +++ b/docs/test_cases/t30002.md @@ -150,44 +150,17 @@ template std::map> cm() "diagram_type": "package", "elements": [ { - "display_name": "clanguml", + "display_name": "A", "elements": [ { - "display_name": "clanguml::t30002", - "id": "1283027613970360489", - "is_deprecated": false, - "name": "t30002", - "source_location": { - "column": 11, - "file": "t30002.cc", - "line": 8, - "translation_unit": "t30002.cc" - }, - "type": "namespace" - } - ], - "id": "2174271399507040339", - "is_deprecated": false, - "name": "clanguml", - "source_location": { - "column": 11, - "file": "t30002.cc", - "line": 7, - "translation_unit": "t30002.cc" - }, - "type": "namespace" - }, - { - "display_name": "clanguml::t30002::A", - "elements": [ - { - "display_name": "clanguml::t30002::A::AA", + "display_name": "AA", "elements": [ { - "display_name": "clanguml::t30002::A::AA::A1", + "display_name": "A1", "id": "1164966689017271053", "is_deprecated": false, "name": "A1", + "namespace": "clanguml::t30002::A::AA", "source_location": { "column": 11, "file": "t30002.cc", @@ -197,10 +170,11 @@ template std::map> cm() "type": "namespace" }, { - "display_name": "clanguml::t30002::A::AA::A2", + "display_name": "A2", "id": "695366113361481509", "is_deprecated": false, "name": "A2", + "namespace": "clanguml::t30002::A::AA", "source_location": { "column": 11, "file": "t30002.cc", @@ -210,10 +184,11 @@ template std::map> cm() "type": "namespace" }, { - "display_name": "clanguml::t30002::A::AA::A3", + "display_name": "A3", "id": "1267709074800873528", "is_deprecated": false, "name": "A3", + "namespace": "clanguml::t30002::A::AA", "source_location": { "column": 11, "file": "t30002.cc", @@ -223,10 +198,11 @@ template std::map> cm() "type": "namespace" }, { - "display_name": "clanguml::t30002::A::AA::A4", + "display_name": "A4", "id": "299262817531370604", "is_deprecated": false, "name": "A4", + "namespace": "clanguml::t30002::A::AA", "source_location": { "column": 11, "file": "t30002.cc", @@ -236,10 +212,11 @@ template std::map> cm() "type": "namespace" }, { - "display_name": "clanguml::t30002::A::AA::A5", + "display_name": "A5", "id": "1207764290216680521", "is_deprecated": false, "name": "A5", + "namespace": "clanguml::t30002::A::AA", "source_location": { "column": 11, "file": "t30002.cc", @@ -249,10 +226,11 @@ template std::map> cm() "type": "namespace" }, { - "display_name": "clanguml::t30002::A::AA::A6", + "display_name": "A6", "id": "899091126727901939", "is_deprecated": false, "name": "A6", + "namespace": "clanguml::t30002::A::AA", "source_location": { "column": 11, "file": "t30002.cc", @@ -262,10 +240,11 @@ template std::map> cm() "type": "namespace" }, { - "display_name": "clanguml::t30002::A::AA::A7", + "display_name": "A7", "id": "563861734550555261", "is_deprecated": false, "name": "A7", + "namespace": "clanguml::t30002::A::AA", "source_location": { "column": 11, "file": "t30002.cc", @@ -275,10 +254,11 @@ template std::map> cm() "type": "namespace" }, { - "display_name": "clanguml::t30002::A::AA::A8", + "display_name": "A8", "id": "839146342143718390", "is_deprecated": false, "name": "A8", + "namespace": "clanguml::t30002::A::AA", "source_location": { "column": 11, "file": "t30002.cc", @@ -288,10 +268,11 @@ template std::map> cm() "type": "namespace" }, { - "display_name": "clanguml::t30002::A::AA::A9", + "display_name": "A9", "id": "1650835159458422245", "is_deprecated": false, "name": "A9", + "namespace": "clanguml::t30002::A::AA", "source_location": { "column": 11, "file": "t30002.cc", @@ -301,10 +282,11 @@ template std::map> cm() "type": "namespace" }, { - "display_name": "clanguml::t30002::A::AA::A10", + "display_name": "A10", "id": "1453242941322376182", "is_deprecated": false, "name": "A10", + "namespace": "clanguml::t30002::A::AA", "source_location": { "column": 11, "file": "t30002.cc", @@ -314,10 +296,11 @@ template std::map> cm() "type": "namespace" }, { - "display_name": "clanguml::t30002::A::AA::A11", + "display_name": "A11", "id": "384833776371876986", "is_deprecated": false, "name": "A11", + "namespace": "clanguml::t30002::A::AA", "source_location": { "column": 11, "file": "t30002.cc", @@ -327,10 +310,11 @@ template std::map> cm() "type": "namespace" }, { - "display_name": "clanguml::t30002::A::AA::A12", + "display_name": "A12", "id": "1199527037490355138", "is_deprecated": false, "name": "A12", + "namespace": "clanguml::t30002::A::AA", "source_location": { "column": 11, "file": "t30002.cc", @@ -340,10 +324,11 @@ template std::map> cm() "type": "namespace" }, { - "display_name": "clanguml::t30002::A::AA::A13", + "display_name": "A13", "id": "620689743711615190", "is_deprecated": false, "name": "A13", + "namespace": "clanguml::t30002::A::AA", "source_location": { "column": 11, "file": "t30002.cc", @@ -353,10 +338,11 @@ template std::map> cm() "type": "namespace" }, { - "display_name": "clanguml::t30002::A::AA::A14", + "display_name": "A14", "id": "301858476377711436", "is_deprecated": false, "name": "A14", + "namespace": "clanguml::t30002::A::AA", "source_location": { "column": 11, "file": "t30002.cc", @@ -366,10 +352,11 @@ template std::map> cm() "type": "namespace" }, { - "display_name": "clanguml::t30002::A::AA::A15", + "display_name": "A15", "id": "561239706327729436", "is_deprecated": false, "name": "A15", + "namespace": "clanguml::t30002::A::AA", "source_location": { "column": 11, "file": "t30002.cc", @@ -379,10 +366,11 @@ template std::map> cm() "type": "namespace" }, { - "display_name": "clanguml::t30002::A::AA::A16", + "display_name": "A16", "id": "1415398383158410524", "is_deprecated": false, "name": "A16", + "namespace": "clanguml::t30002::A::AA", "source_location": { "column": 11, "file": "t30002.cc", @@ -392,10 +380,11 @@ template std::map> cm() "type": "namespace" }, { - "display_name": "clanguml::t30002::A::AA::A17", + "display_name": "A17", "id": "532437874530119999", "is_deprecated": false, "name": "A17", + "namespace": "clanguml::t30002::A::AA", "source_location": { "column": 11, "file": "t30002.cc", @@ -405,10 +394,11 @@ template std::map> cm() "type": "namespace" }, { - "display_name": "clanguml::t30002::A::AA::A18", + "display_name": "A18", "id": "405712335116487393", "is_deprecated": false, "name": "A18", + "namespace": "clanguml::t30002::A::AA", "source_location": { "column": 11, "file": "t30002.cc", @@ -421,6 +411,7 @@ template std::map> cm() "id": "1669745471968085401", "is_deprecated": false, "name": "AA", + "namespace": "clanguml::t30002::A", "source_location": { "column": 14, "file": "t30002.cc", @@ -433,6 +424,7 @@ template std::map> cm() "id": "1543480715632256641", "is_deprecated": false, "name": "A", + "namespace": "clanguml::t30002", "source_location": { "column": 11, "file": "t30002.cc", @@ -442,16 +434,17 @@ template std::map> cm() "type": "namespace" }, { - "display_name": "clanguml::t30002::B", + "display_name": "B", "elements": [ { - "display_name": "clanguml::t30002::B::BB", + "display_name": "BB", "elements": [ { - "display_name": "clanguml::t30002::B::BB::BBB", + "display_name": "BBB", "id": "2255521339657425355", "is_deprecated": false, "name": "BBB", + "namespace": "clanguml::t30002::B::BB", "source_location": { "column": 18, "file": "t30002.cc", @@ -464,6 +457,7 @@ template std::map> cm() "id": "1938861639623819235", "is_deprecated": false, "name": "BB", + "namespace": "clanguml::t30002::B", "source_location": { "column": 14, "file": "t30002.cc", @@ -476,6 +470,7 @@ template std::map> cm() "id": "145302773464360955", "is_deprecated": false, "name": "B", + "namespace": "clanguml::t30002", "source_location": { "column": 11, "file": "t30002.cc", @@ -486,6 +481,7 @@ template std::map> cm() } ], "name": "t30002_package", + "package_type": "namespace", "relationships": [ { "destination": "839146342143718390", diff --git a/docs/test_cases/t30002_package.svg b/docs/test_cases/t30002_package.svg index 679b9d8f..abcb8eb2 100644 --- a/docs/test_cases/t30002_package.svg +++ b/docs/test_cases/t30002_package.svg @@ -1,202 +1,164 @@ - + + + + + + + - - - - - A - - - - - - - AA - - - - - - - B - - - - - - - BB - - - - - - A1 + + + + A - - - - A2 + + + + AA - - - - A3 + + + + B - - - - A4 + + + + BB - - - - A5 + + + + A1 - - - - A6 + + + + A2 - - - - A7 + + + + A3 - - - - A8 + + + + A4 - - - - A9 + + + + A5 - - - - A10 + + + + A6 - - - - A11 + + + + A7 - - - - A12 + + + + A8 - - - - A13 + + + + A9 - - - - A14 + + + + A10 - - - - A15 + + + + A11 - - - - A16 + + + + A12 - - - - A17 + + + + A13 - - - - A18 + + + + A14 - - - - BBB + + + + A15 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + A16 + + + + + A17 + + + + + A18 + + + + + BBB + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/test_cases/t30002_package_mermaid.svg b/docs/test_cases/t30002_package_mermaid.svg index 7f16d003..652965df 100644 --- a/docs/test_cases/t30002_package_mermaid.svg +++ b/docs/test_cases/t30002_package_mermaid.svg @@ -1,22 +1,22 @@ - + - + - + - + - + - + @@ -63,24 +63,24 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/docs/test_cases/t30003.md b/docs/test_cases/t30003.md index 8d45e2e6..87edcc38 100644 --- a/docs/test_cases/t30003.md +++ b/docs/test_cases/t30003.md @@ -55,41 +55,14 @@ class B : public ns1::ns2::Anon { }; "diagram_type": "package", "elements": [ { - "display_name": "clanguml", + "display_name": "ns1", "elements": [ { - "display_name": "clanguml::t30003", - "id": "1288549465151585544", - "is_deprecated": false, - "name": "t30003", - "source_location": { - "column": 11, - "file": "t30003.cc", - "line": 2, - "translation_unit": "t30003.cc" - }, - "type": "namespace" - } - ], - "id": "2174271399507040339", - "is_deprecated": false, - "name": "clanguml", - "source_location": { - "column": 11, - "file": "t30003.cc", - "line": 1, - "translation_unit": "t30003.cc" - }, - "type": "namespace" - }, - { - "display_name": "clanguml::t30003::ns1", - "elements": [ - { - "display_name": "clanguml::t30003::ns1::ns2_v1_0_0", + "display_name": "ns2_v1_0_0", "id": "647755950450743637", "is_deprecated": false, "name": "ns2_v1_0_0", + "namespace": "clanguml::t30003::ns1", "source_location": { "column": 11, "file": "t30003.cc", @@ -99,10 +72,11 @@ class B : public ns1::ns2::Anon { }; "type": "namespace" }, { - "display_name": "clanguml::t30003::ns1::ns2_v0_9_0", + "display_name": "ns2_v0_9_0", "id": "1013406647495422406", "is_deprecated": true, "name": "ns2_v0_9_0", + "namespace": "clanguml::t30003::ns1", "source_location": { "column": 26, "file": "t30003.cc", @@ -115,6 +89,7 @@ class B : public ns1::ns2::Anon { }; "id": "600452871069546589", "is_deprecated": false, "name": "ns1", + "namespace": "clanguml::t30003", "source_location": { "column": 11, "file": "t30003.cc", @@ -124,16 +99,17 @@ class B : public ns1::ns2::Anon { }; "type": "namespace" }, { - "display_name": "clanguml::t30003::ns3", + "display_name": "ns3", "elements": [ { - "display_name": "clanguml::t30003::ns3::ns1", + "display_name": "ns1", "elements": [ { - "display_name": "clanguml::t30003::ns3::ns1::ns2", + "display_name": "ns2", "id": "820462660523726751", "is_deprecated": false, "name": "ns2", + "namespace": "clanguml::t30003::ns3::ns1", "source_location": { "column": 16, "file": "t30003.cc", @@ -146,6 +122,7 @@ class B : public ns1::ns2::Anon { }; "id": "1209144861141334061", "is_deprecated": false, "name": "ns1", + "namespace": "clanguml::t30003::ns3", "source_location": { "column": 11, "file": "t30003.cc", @@ -158,6 +135,7 @@ class B : public ns1::ns2::Anon { }; "id": "427104404739526818", "is_deprecated": true, "name": "ns3", + "namespace": "clanguml::t30003", "source_location": { "column": 26, "file": "t30003.cc", @@ -168,6 +146,7 @@ class B : public ns1::ns2::Anon { }; } ], "name": "t30003_package", + "package_type": "namespace", "relationships": [ { "destination": "647755950450743637", diff --git a/docs/test_cases/t30003_package.svg b/docs/test_cases/t30003_package.svg index a50afa51..6c6fbe95 100644 --- a/docs/test_cases/t30003_package.svg +++ b/docs/test_cases/t30003_package.svg @@ -1,49 +1,47 @@ - + + + + + + + - - - - - ns1 - - - - - - - ns3 - «deprecated» - - - - - - - ns1 - - - - - - ns2_v1_0_0 + + + + ns1 - - - - ns2_v0_9_0 - «deprecated» + + + + ns3 + «deprecated» - - - - ns2 + + + + ns1 - - - - + + + + ns2_v1_0_0 + + + + + ns2_v0_9_0 + «deprecated» + + + + + ns2 + + + diff --git a/docs/test_cases/t30003_package_mermaid.svg b/docs/test_cases/t30003_package_mermaid.svg index a33de6b3..0a3b23e0 100644 --- a/docs/test_cases/t30003_package_mermaid.svg +++ b/docs/test_cases/t30003_package_mermaid.svg @@ -1,22 +1,22 @@ - + - + - + - + - + - + @@ -48,7 +48,7 @@ - + diff --git a/docs/test_cases/t30004.md b/docs/test_cases/t30004.md index 20c609f3..19712438 100644 --- a/docs/test_cases/t30004.md +++ b/docs/test_cases/t30004.md @@ -62,50 +62,23 @@ namespace CCC { { "diagram_type": "package", "elements": [ - { - "display_name": "clanguml", - "elements": [ - { - "display_name": "clanguml::t30004", - "id": "678274068594347618", - "is_deprecated": false, - "name": "t30004", - "source_location": { - "column": 11, - "file": "t30004.cc", - "line": 2, - "translation_unit": "t30004.cc" - }, - "type": "namespace" - } - ], - "id": "2174271399507040339", - "is_deprecated": false, - "name": "clanguml", - "source_location": { - "column": 11, - "file": "t30004.cc", - "line": 1, - "translation_unit": "t30004.cc" - }, - "type": "namespace" - }, { "comment": { "formatted": "@uml{style[#green]}", "raw": "/// @uml{style[#green]}" }, - "display_name": "clanguml::t30004::A", + "display_name": "A", "elements": [ { "comment": { "formatted": "@uml{note[ bottom ] Package AAA.}", "raw": "/// @uml{note[ bottom ] Package AAA.}" }, - "display_name": "clanguml::t30004::A::AAA", + "display_name": "AAA", "id": "1517185300862579159", "is_deprecated": false, "name": "AAA", + "namespace": "clanguml::t30004::A", "source_location": { "column": 11, "file": "t30004.cc", @@ -119,10 +92,11 @@ namespace CCC { "formatted": "\\uml{note[right] Package BBB.}", "raw": "/// \\uml{note[right] Package BBB.}" }, - "display_name": "clanguml::t30004::A::BBB", + "display_name": "BBB", "id": "1982379087062354928", "is_deprecated": false, "name": "BBB", + "namespace": "clanguml::t30004::A", "source_location": { "column": 11, "file": "t30004.cc", @@ -136,10 +110,11 @@ namespace CCC { "formatted": "\n @uml{note:t30004_package[bottom] CCCC package note.}\n This is package CCC.", "raw": "///\n/// @uml{note:t30004_package[bottom] CCCC package note.}\n/// This is package CCC." }, - "display_name": "clanguml::t30004::A::CCC", + "display_name": "CCC", "id": "2304726195556701567", "is_deprecated": false, "name": "CCC", + "namespace": "clanguml::t30004::A", "source_location": { "column": 11, "file": "t30004.cc", @@ -153,10 +128,11 @@ namespace CCC { "formatted": "@uml{style[#pink;line:red;line.bold;text:red]}\n\\uml{note[top] We skipped DDD.}", "raw": "/// @uml{style[#pink;line:red;line.bold;text:red]}\n/// \\uml{note[top] We skipped DDD.}" }, - "display_name": "clanguml::t30004::A::EEE", + "display_name": "EEE", "id": "1084924732216290779", "is_deprecated": false, "name": "EEE", + "namespace": "clanguml::t30004::A", "source_location": { "column": 11, "file": "t30004.cc", @@ -169,6 +145,7 @@ namespace CCC { "id": "33410665874039845", "is_deprecated": false, "name": "A", + "namespace": "clanguml::t30004", "source_location": { "column": 11, "file": "t30004.cc", @@ -179,6 +156,7 @@ namespace CCC { } ], "name": "t30004_package", + "package_type": "namespace", "relationships": [], "using_namespace": "clanguml::t30004" } diff --git a/docs/test_cases/t30004_package.svg b/docs/test_cases/t30004_package.svg index 46b98bef..b4898de0 100644 --- a/docs/test_cases/t30004_package.svg +++ b/docs/test_cases/t30004_package.svg @@ -1,54 +1,54 @@ - + + + + + + + - - - - - A - - - - - - Package AAA. - - - - - Package BBB. - - - - - CCCC package note. - - - - - We skipped DDD. - - - - - AAA + + + + A - - - - BBB + + + Package AAA. + + + Package BBB. + + + CCCC package note. + + + We skipped DDD. + + + + AAA - - - - CCC + + + + BBB - - - - EEE + + + + CCC + + + + EEE + + + + + diff --git a/docs/test_cases/t30004_package_mermaid.svg b/docs/test_cases/t30004_package_mermaid.svg index 1a3774e1..b3da38b3 100644 --- a/docs/test_cases/t30004_package_mermaid.svg +++ b/docs/test_cases/t30004_package_mermaid.svg @@ -1,22 +1,22 @@ - + - + - + - + - + - + diff --git a/docs/test_cases/t30005.md b/docs/test_cases/t30005.md index ce2481b6..3fccc9a0 100644 --- a/docs/test_cases/t30005.md +++ b/docs/test_cases/t30005.md @@ -55,44 +55,17 @@ struct C2 { "diagram_type": "package", "elements": [ { - "display_name": "clanguml", + "display_name": "A", "elements": [ { - "display_name": "clanguml::t30005", - "id": "1344350061092822214", - "is_deprecated": false, - "name": "t30005", - "source_location": { - "column": 11, - "file": "t30005.cc", - "line": 2, - "translation_unit": "t30005.cc" - }, - "type": "namespace" - } - ], - "id": "2174271399507040339", - "is_deprecated": false, - "name": "clanguml", - "source_location": { - "column": 11, - "file": "t30005.cc", - "line": 1, - "translation_unit": "t30005.cc" - }, - "type": "namespace" - }, - { - "display_name": "clanguml::t30005::A", - "elements": [ - { - "display_name": "clanguml::t30005::A::AA", + "display_name": "AA", "elements": [ { - "display_name": "clanguml::t30005::A::AA::AAA", + "display_name": "AAA", "id": "914090901927655181", "is_deprecated": false, "name": "AAA", + "namespace": "clanguml::t30005::A::AA", "source_location": { "column": 18, "file": "t30005.cc", @@ -105,6 +78,7 @@ struct C2 { "id": "1777547159021391040", "is_deprecated": false, "name": "AA", + "namespace": "clanguml::t30005::A", "source_location": { "column": 14, "file": "t30005.cc", @@ -117,6 +91,7 @@ struct C2 { "id": "1768303675686131578", "is_deprecated": false, "name": "A", + "namespace": "clanguml::t30005", "source_location": { "column": 11, "file": "t30005.cc", @@ -126,16 +101,17 @@ struct C2 { "type": "namespace" }, { - "display_name": "clanguml::t30005::B", + "display_name": "B", "elements": [ { - "display_name": "clanguml::t30005::B::BB", + "display_name": "BB", "elements": [ { - "display_name": "clanguml::t30005::B::BB::BBB", + "display_name": "BBB", "id": "1871026935460001668", "is_deprecated": false, "name": "BBB", + "namespace": "clanguml::t30005::B::BB", "source_location": { "column": 18, "file": "t30005.cc", @@ -148,6 +124,7 @@ struct C2 { "id": "1696631362104244809", "is_deprecated": false, "name": "BB", + "namespace": "clanguml::t30005::B", "source_location": { "column": 14, "file": "t30005.cc", @@ -160,6 +137,7 @@ struct C2 { "id": "378529216628023051", "is_deprecated": false, "name": "B", + "namespace": "clanguml::t30005", "source_location": { "column": 11, "file": "t30005.cc", @@ -169,16 +147,17 @@ struct C2 { "type": "namespace" }, { - "display_name": "clanguml::t30005::C", + "display_name": "C", "elements": [ { - "display_name": "clanguml::t30005::C::CC", + "display_name": "CC", "elements": [ { - "display_name": "clanguml::t30005::C::CC::CCC", + "display_name": "CCC", "id": "1763279540133487999", "is_deprecated": false, "name": "CCC", + "namespace": "clanguml::t30005::C::CC", "source_location": { "column": 18, "file": "t30005.cc", @@ -191,6 +170,7 @@ struct C2 { "id": "2134234141727442046", "is_deprecated": false, "name": "CC", + "namespace": "clanguml::t30005::C", "source_location": { "column": 14, "file": "t30005.cc", @@ -203,6 +183,7 @@ struct C2 { "id": "1041076320925403190", "is_deprecated": false, "name": "C", + "namespace": "clanguml::t30005", "source_location": { "column": 11, "file": "t30005.cc", @@ -213,6 +194,7 @@ struct C2 { } ], "name": "t30005_package", + "package_type": "namespace", "relationships": [ { "destination": "914090901927655181", diff --git a/docs/test_cases/t30005_package.svg b/docs/test_cases/t30005_package.svg index 41a8bca1..45299bae 100644 --- a/docs/test_cases/t30005_package.svg +++ b/docs/test_cases/t30005_package.svg @@ -1,72 +1,62 @@ - + + + + + + + - - - - - A - - - - - - - AA - - - - - - - B - - - - - - - BB - - - - - - - C - - - - - - - CC - - - - - - AAA + + + + A - - - - BBB + + + + AA - - - - CCC + + + + B - - - - - - - - + + + + BB + + + + + C + + + + + CC + + + + + AAA + + + + + BBB + + + + + CCC + + + + + diff --git a/docs/test_cases/t30005_package_mermaid.svg b/docs/test_cases/t30005_package_mermaid.svg index 5cf8401d..f97615b4 100644 --- a/docs/test_cases/t30005_package_mermaid.svg +++ b/docs/test_cases/t30005_package_mermaid.svg @@ -1,22 +1,22 @@ - + - + - + - + - + - + @@ -83,8 +83,8 @@ - - + + diff --git a/docs/test_cases/t30006.md b/docs/test_cases/t30006.md index 52d45f23..22b46edc 100644 --- a/docs/test_cases/t30006.md +++ b/docs/test_cases/t30006.md @@ -55,38 +55,11 @@ struct A2 { "diagram_type": "package", "elements": [ { - "display_name": "clanguml", - "elements": [ - { - "display_name": "clanguml::t30006", - "id": "1391231216610531704", - "is_deprecated": false, - "name": "t30006", - "source_location": { - "column": 11, - "file": "t30006.cc", - "line": 2, - "translation_unit": "t30006.cc" - }, - "type": "namespace" - } - ], - "id": "2174271399507040339", - "is_deprecated": false, - "name": "clanguml", - "source_location": { - "column": 11, - "file": "t30006.cc", - "line": 1, - "translation_unit": "t30006.cc" - }, - "type": "namespace" - }, - { - "display_name": "clanguml::t30006::B", + "display_name": "B", "id": "1659090172211944144", "is_deprecated": false, "name": "B", + "namespace": "clanguml::t30006", "source_location": { "column": 11, "file": "t30006.cc", @@ -100,10 +73,11 @@ struct A2 { "formatted": "\\uml{note[top] Top A note.}", "raw": "/// \\uml{note[top] Top A note.}" }, - "display_name": "clanguml::t30006::A", + "display_name": "A", "id": "1499919423527579699", "is_deprecated": false, "name": "A", + "namespace": "clanguml::t30006", "source_location": { "column": 11, "file": "t30006.cc", @@ -113,10 +87,11 @@ struct A2 { "type": "namespace" }, { - "display_name": "clanguml::t30006::C", + "display_name": "C", "id": "1380567463986115369", "is_deprecated": false, "name": "C", + "namespace": "clanguml::t30006", "source_location": { "column": 11, "file": "t30006.cc", @@ -127,6 +102,7 @@ struct A2 { } ], "name": "t30006_package", + "package_type": "namespace", "relationships": [ { "destination": "1659090172211944144", diff --git a/docs/test_cases/t30006_package.svg b/docs/test_cases/t30006_package.svg index b66473a9..c7957dbd 100644 --- a/docs/test_cases/t30006_package.svg +++ b/docs/test_cases/t30006_package.svg @@ -1,35 +1,36 @@ - + + + + + + + - - - - B + + + + B - - - - A + + + + A - - - - C + + + + C - - - - Top A note. - - - - - - - - - + + + Top A note. + + + + + diff --git a/docs/test_cases/t30006_package_mermaid.svg b/docs/test_cases/t30006_package_mermaid.svg index 525d94bd..6bc8f006 100644 --- a/docs/test_cases/t30006_package_mermaid.svg +++ b/docs/test_cases/t30006_package_mermaid.svg @@ -1,30 +1,30 @@ - + - + - + - + - + - + - - + + diff --git a/docs/test_cases/t30007.md b/docs/test_cases/t30007.md index b252925c..4255fa0e 100644 --- a/docs/test_cases/t30007.md +++ b/docs/test_cases/t30007.md @@ -63,38 +63,11 @@ struct A2 { "diagram_type": "package", "elements": [ { - "display_name": "clanguml", - "elements": [ - { - "display_name": "clanguml::t30007", - "id": "279529588091010017", - "is_deprecated": false, - "name": "t30007", - "source_location": { - "column": 11, - "file": "t30007.cc", - "line": 2, - "translation_unit": "t30007.cc" - }, - "type": "namespace" - } - ], - "id": "2174271399507040339", - "is_deprecated": false, - "name": "clanguml", - "source_location": { - "column": 11, - "file": "t30007.cc", - "line": 1, - "translation_unit": "t30007.cc" - }, - "type": "namespace" - }, - { - "display_name": "clanguml::t30007::B", + "display_name": "B", "id": "1852704221005355550", "is_deprecated": false, "name": "B", + "namespace": "clanguml::t30007", "source_location": { "column": 11, "file": "t30007.cc", @@ -108,13 +81,14 @@ struct A2 { "formatted": "\\uml{note[top] Compare layout with t30006.}", "raw": "/// \\uml{note[top] Compare layout with t30006.}" }, - "display_name": "clanguml::t30007::A", + "display_name": "A", "elements": [ { - "display_name": "clanguml::t30007::A::AA", + "display_name": "AA", "id": "357722505818238170", "is_deprecated": false, "name": "AA", + "namespace": "clanguml::t30007::A", "source_location": { "column": 11, "file": "t30007.cc", @@ -127,6 +101,7 @@ struct A2 { "id": "870874615388866345", "is_deprecated": false, "name": "A", + "namespace": "clanguml::t30007", "source_location": { "column": 11, "file": "t30007.cc", @@ -136,10 +111,11 @@ struct A2 { "type": "namespace" }, { - "display_name": "clanguml::t30007::C", + "display_name": "C", "id": "937791537887318363", "is_deprecated": false, "name": "C", + "namespace": "clanguml::t30007", "source_location": { "column": 11, "file": "t30007.cc", @@ -150,6 +126,7 @@ struct A2 { } ], "name": "t30007_package", + "package_type": "namespace", "relationships": [ { "destination": "1852704221005355550", diff --git a/docs/test_cases/t30007_package.svg b/docs/test_cases/t30007_package.svg index 9d0544ab..72cbcfcb 100644 --- a/docs/test_cases/t30007_package.svg +++ b/docs/test_cases/t30007_package.svg @@ -1,45 +1,41 @@ - + + + + + + + - - - - - A - - - - - - B + + + + A - - - - AA + + + + B - - - - C + + + + AA - - - - Compare layout with t30006. - - - - - - - - - - - - + + + + C + + + + Compare layout with t30006. + + + + + diff --git a/docs/test_cases/t30007_package_mermaid.svg b/docs/test_cases/t30007_package_mermaid.svg index 2422f95b..bb0c362d 100644 --- a/docs/test_cases/t30007_package_mermaid.svg +++ b/docs/test_cases/t30007_package_mermaid.svg @@ -1,22 +1,22 @@ - + - + - + - + - + - + @@ -33,8 +33,8 @@ - - + + diff --git a/docs/test_cases/t30008.md b/docs/test_cases/t30008.md index ddde9f23..dabb9b6b 100644 --- a/docs/test_cases/t30008.md +++ b/docs/test_cases/t30008.md @@ -73,41 +73,14 @@ struct FF { "diagram_type": "package", "elements": [ { - "display_name": "clanguml", + "display_name": "dependants", "elements": [ { - "display_name": "clanguml::t30008", - "id": "588296309731944574", - "is_deprecated": false, - "name": "t30008", - "source_location": { - "column": 11, - "file": "t30008.cc", - "line": 2, - "translation_unit": "t30008.cc" - }, - "type": "namespace" - } - ], - "id": "2174271399507040339", - "is_deprecated": false, - "name": "clanguml", - "source_location": { - "column": 11, - "file": "t30008.cc", - "line": 1, - "translation_unit": "t30008.cc" - }, - "type": "namespace" - }, - { - "display_name": "clanguml::t30008::dependants", - "elements": [ - { - "display_name": "clanguml::t30008::dependants::A", + "display_name": "A", "id": "2096441629244782012", "is_deprecated": false, "name": "A", + "namespace": "clanguml::t30008::dependants", "source_location": { "column": 11, "file": "t30008.cc", @@ -117,10 +90,11 @@ struct FF { "type": "namespace" }, { - "display_name": "clanguml::t30008::dependants::B", + "display_name": "B", "id": "500208250168931957", "is_deprecated": false, "name": "B", + "namespace": "clanguml::t30008::dependants", "source_location": { "column": 11, "file": "t30008.cc", @@ -130,10 +104,11 @@ struct FF { "type": "namespace" }, { - "display_name": "clanguml::t30008::dependants::C", + "display_name": "C", "id": "1095841247154575825", "is_deprecated": false, "name": "C", + "namespace": "clanguml::t30008::dependants", "source_location": { "column": 11, "file": "t30008.cc", @@ -146,6 +121,7 @@ struct FF { "id": "1601960042765615222", "is_deprecated": false, "name": "dependants", + "namespace": "clanguml::t30008", "source_location": { "column": 11, "file": "t30008.cc", @@ -155,13 +131,14 @@ struct FF { "type": "namespace" }, { - "display_name": "clanguml::t30008::dependencies", + "display_name": "dependencies", "elements": [ { - "display_name": "clanguml::t30008::dependencies::D", + "display_name": "D", "id": "912387297717034254", "is_deprecated": false, "name": "D", + "namespace": "clanguml::t30008::dependencies", "source_location": { "column": 11, "file": "t30008.cc", @@ -171,10 +148,11 @@ struct FF { "type": "namespace" }, { - "display_name": "clanguml::t30008::dependencies::E", + "display_name": "E", "id": "1114997990364518938", "is_deprecated": false, "name": "E", + "namespace": "clanguml::t30008::dependencies", "source_location": { "column": 11, "file": "t30008.cc", @@ -184,10 +162,11 @@ struct FF { "type": "namespace" }, { - "display_name": "clanguml::t30008::dependencies::F", + "display_name": "F", "id": "1062827161678172094", "is_deprecated": false, "name": "F", + "namespace": "clanguml::t30008::dependencies", "source_location": { "column": 11, "file": "t30008.cc", @@ -200,6 +179,7 @@ struct FF { "id": "2103969167872217960", "is_deprecated": false, "name": "dependencies", + "namespace": "clanguml::t30008", "source_location": { "column": 11, "file": "t30008.cc", @@ -210,6 +190,7 @@ struct FF { } ], "name": "t30008_package", + "package_type": "namespace", "relationships": [ { "destination": "2096441629244782012", diff --git a/docs/test_cases/t30008_package.svg b/docs/test_cases/t30008_package.svg index 96487672..8649cdb3 100644 --- a/docs/test_cases/t30008_package.svg +++ b/docs/test_cases/t30008_package.svg @@ -1,67 +1,61 @@ - + + + + + + + - - - - - dependants - - - - - - - dependencies - - - - - - A + + + + dependants - - - - B + + + + dependencies - - - - C + + + + A - - - - D + + + + B - - - - E + + + + C - - - - F + + + + D - - - - - - - - - - - - - - - - + + + + E + + + + + F + + + + + + + + + diff --git a/docs/test_cases/t30008_package_mermaid.svg b/docs/test_cases/t30008_package_mermaid.svg index 7acd7df5..6d9fc16a 100644 --- a/docs/test_cases/t30008_package_mermaid.svg +++ b/docs/test_cases/t30008_package_mermaid.svg @@ -1,22 +1,22 @@ - + - + - + - + - + - + @@ -38,8 +38,8 @@ - - + + @@ -111,8 +111,8 @@ - - + + diff --git a/docs/test_cases/t30009.md b/docs/test_cases/t30009.md index c74c63b4..cafa282e 100644 --- a/docs/test_cases/t30009.md +++ b/docs/test_cases/t30009.md @@ -53,41 +53,14 @@ namespace D { "diagram_type": "package", "elements": [ { - "display_name": "clanguml", + "display_name": "One", "elements": [ { - "display_name": "clanguml::t30009", - "id": "1266799397652663064", - "is_deprecated": false, - "name": "t30009", - "source_location": { - "column": 21, - "file": "t30009.cc", - "line": 1, - "translation_unit": "t30009.cc" - }, - "type": "namespace" - } - ], - "id": "2174271399507040339", - "is_deprecated": false, - "name": "clanguml", - "source_location": { - "column": 11, - "file": "t30009.cc", - "line": 1, - "translation_unit": "t30009.cc" - }, - "type": "namespace" - }, - { - "display_name": "clanguml::t30009::One", - "elements": [ - { - "display_name": "clanguml::t30009::One::A", + "display_name": "A", "id": "1189741240939898414", "is_deprecated": false, "name": "A", + "namespace": "clanguml::t30009::One", "source_location": { "column": 11, "file": "t30009.cc", @@ -97,10 +70,11 @@ namespace D { "type": "namespace" }, { - "display_name": "clanguml::t30009::One::B", + "display_name": "B", "id": "209763670816643341", "is_deprecated": false, "name": "B", + "namespace": "clanguml::t30009::One", "source_location": { "column": 11, "file": "t30009.cc", @@ -110,10 +84,11 @@ namespace D { "type": "namespace" }, { - "display_name": "clanguml::t30009::One::C", + "display_name": "C", "id": "946522260503371974", "is_deprecated": false, "name": "C", + "namespace": "clanguml::t30009::One", "source_location": { "column": 11, "file": "t30009.cc", @@ -123,10 +98,11 @@ namespace D { "type": "namespace" }, { - "display_name": "clanguml::t30009::One::D", + "display_name": "D", "id": "1181245940399690936", "is_deprecated": false, "name": "D", + "namespace": "clanguml::t30009::One", "source_location": { "column": 11, "file": "t30009.cc", @@ -139,6 +115,7 @@ namespace D { "id": "1187941209208108244", "is_deprecated": false, "name": "One", + "namespace": "clanguml::t30009", "source_location": { "column": 11, "file": "t30009.cc", @@ -148,13 +125,14 @@ namespace D { "type": "namespace" }, { - "display_name": "clanguml::t30009::Two", + "display_name": "Two", "elements": [ { - "display_name": "clanguml::t30009::Two::A", + "display_name": "A", "id": "986505573514384282", "is_deprecated": false, "name": "A", + "namespace": "clanguml::t30009::Two", "source_location": { "column": 11, "file": "t30009.cc", @@ -164,10 +142,11 @@ namespace D { "type": "namespace" }, { - "display_name": "clanguml::t30009::Two::B", + "display_name": "B", "id": "2156827588463114203", "is_deprecated": false, "name": "B", + "namespace": "clanguml::t30009::Two", "source_location": { "column": 11, "file": "t30009.cc", @@ -177,10 +156,11 @@ namespace D { "type": "namespace" }, { - "display_name": "clanguml::t30009::Two::C", + "display_name": "C", "id": "1653274432960093632", "is_deprecated": false, "name": "C", + "namespace": "clanguml::t30009::Two", "source_location": { "column": 11, "file": "t30009.cc", @@ -190,10 +170,11 @@ namespace D { "type": "namespace" }, { - "display_name": "clanguml::t30009::Two::D", + "display_name": "D", "id": "263095551354153183", "is_deprecated": false, "name": "D", + "namespace": "clanguml::t30009::Two", "source_location": { "column": 11, "file": "t30009.cc", @@ -206,6 +187,7 @@ namespace D { "id": "1940839474792549233", "is_deprecated": false, "name": "Two", + "namespace": "clanguml::t30009", "source_location": { "column": 11, "file": "t30009.cc", @@ -216,6 +198,7 @@ namespace D { } ], "name": "t30009_package", + "package_type": "namespace", "relationships": [], "using_namespace": "clanguml::t30009" } diff --git a/docs/test_cases/t30009_package.svg b/docs/test_cases/t30009_package.svg index 82a6186e..339e3526 100644 --- a/docs/test_cases/t30009_package.svg +++ b/docs/test_cases/t30009_package.svg @@ -1,61 +1,63 @@ - + + + + + + + - - - - - One - - - - - - - Two - - - - - - B + + + + One - - - - D + + + + Two - - - - A + + + + B - - - - C + + + + D - - - - A + + + + A - - - - B + + + + C - - - - C + + + + A - - - - D + + + + B + + + + + C + + + + + D diff --git a/docs/test_cases/t30009_package_mermaid.svg b/docs/test_cases/t30009_package_mermaid.svg index 96147c29..903c6979 100644 --- a/docs/test_cases/t30009_package_mermaid.svg +++ b/docs/test_cases/t30009_package_mermaid.svg @@ -1,22 +1,22 @@ - + - + - + - + - + - + diff --git a/docs/test_cases/t30010.md b/docs/test_cases/t30010.md index c15a4e41..c2b5e03a 100644 --- a/docs/test_cases/t30010.md +++ b/docs/test_cases/t30010.md @@ -27,34 +27,6 @@ App app; } // namespace t30002 } // namespace clanguml -``` -File `tests/t30010/libraries/lib3/lib3.h` -```cpp -#pragma once - -namespace clanguml { -namespace t30010 { -namespace library3 { - -enum E { e1, e2, e3 }; - -} -} -} -``` -File `tests/t30010/libraries/lib4/lib4.h` -```cpp -#pragma once - -namespace clanguml { -namespace t30010 { -namespace library4 { - -struct C { }; - -} -} -} ``` File `tests/t30010/libraries/lib1/lib1.h` ```cpp @@ -82,6 +54,34 @@ template struct B { T b; }; +} +} +} +``` +File `tests/t30010/libraries/lib3/lib3.h` +```cpp +#pragma once + +namespace clanguml { +namespace t30010 { +namespace library3 { + +enum E { e1, e2, e3 }; + +} +} +} +``` +File `tests/t30010/libraries/lib4/lib4.h` +```cpp +#pragma once + +namespace clanguml { +namespace t30010 { +namespace library4 { + +struct C { }; + } } } @@ -126,74 +126,81 @@ struct App { "id": "879212264535378961", "is_deprecated": false, "name": "lib1", + "path": "", "source_location": { "column": 8, "file": "libraries/lib1/lib1.h", "line": 7, "translation_unit": "t30010.cc" }, - "type": "namespace" + "type": "directory" }, { "display_name": "lib2", "id": "1522606219626203424", "is_deprecated": false, "name": "lib2", + "path": "", "source_location": { "column": 30, "file": "libraries/lib2/lib2.h", "line": 7, "translation_unit": "t30010.cc" }, - "type": "namespace" + "type": "directory" }, { "display_name": "lib3", "id": "2263709579652581325", "is_deprecated": false, "name": "lib3", + "path": "", "source_location": { "column": 6, "file": "libraries/lib3/lib3.h", "line": 7, "translation_unit": "t30010.cc" }, - "type": "namespace" + "type": "directory" }, { "display_name": "lib4", "id": "1103453030023410219", "is_deprecated": false, "name": "lib4", + "path": "", "source_location": { "column": 8, "file": "libraries/lib4/lib4.h", "line": 7, "translation_unit": "t30010.cc" }, - "type": "namespace" + "type": "directory" } ], "id": "879401191375500756", "is_deprecated": false, "name": "libraries", - "type": "namespace" + "path": "", + "type": "directory" }, { "display_name": "app", "id": "2001320261642080149", "is_deprecated": false, "name": "app", + "path": "", "source_location": { "column": 8, "file": "app/app.h", "line": 11, "translation_unit": "t30010.cc" }, - "type": "namespace" + "type": "directory" } ], "name": "t30010_package", + "package_type": "directory", "relationships": [ { "destination": "879212264535378961", diff --git a/docs/test_cases/t30010_package.svg b/docs/test_cases/t30010_package.svg index c9d07b64..659cb5bd 100644 --- a/docs/test_cases/t30010_package.svg +++ b/docs/test_cases/t30010_package.svg @@ -1,53 +1,49 @@ - + + + + + + + - - - - libraries - - - - - lib1 + + + libraries + + + + lib1 - - - - lib2 + + + + lib2 - - - - lib3 + + + + lib3 - - - - lib4 + + + + lib4 - - - - app + + + + app - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/docs/test_cases/t30010_package_mermaid.svg b/docs/test_cases/t30010_package_mermaid.svg index 8b12ecd0..897b1799 100644 --- a/docs/test_cases/t30010_package_mermaid.svg +++ b/docs/test_cases/t30010_package_mermaid.svg @@ -1,22 +1,22 @@ - + - + - + - + - + - + @@ -33,10 +33,10 @@ - - - - + + + + diff --git a/docs/test_cases/t30011.md b/docs/test_cases/t30011.md index e158714f..bec2152a 100644 --- a/docs/test_cases/t30011.md +++ b/docs/test_cases/t30011.md @@ -18,22 +18,6 @@ File `tests/t30011/t30011.c` struct t30011_App app; -``` -File `tests/t30011/libraries/lib3/lib3.h` -```cpp -#pragma once - -enum t30011_E { e1, e2, e3 }; - -``` -File `tests/t30011/libraries/lib4/lib4.h` -```cpp -#pragma once - -struct t30011_C { - int c; -}; - ``` File `tests/t30011/libraries/lib1/lib1.h` ```cpp @@ -52,6 +36,22 @@ struct t30011_B { int b; }; +``` +File `tests/t30011/libraries/lib3/lib3.h` +```cpp +#pragma once + +enum t30011_E { e1, e2, e3 }; + +``` +File `tests/t30011/libraries/lib4/lib4.h` +```cpp +#pragma once + +struct t30011_C { + int c; +}; + ``` File `tests/t30011/app/app.h` ```cpp @@ -88,74 +88,81 @@ void c(struct t30011_App *app, struct t30011_C *c) { } "id": "879212264535378961", "is_deprecated": false, "name": "lib1", + "path": "", "source_location": { "column": 8, "file": "libraries/lib1/lib1.h", "line": 3, "translation_unit": "t30011.c" }, - "type": "namespace" + "type": "directory" }, { "display_name": "lib2", "id": "1522606219626203424", "is_deprecated": false, "name": "lib2", + "path": "", "source_location": { "column": 8, "file": "libraries/lib2/lib2.h", "line": 3, "translation_unit": "t30011.c" }, - "type": "namespace" + "type": "directory" }, { "display_name": "lib3", "id": "2263709579652581325", "is_deprecated": false, "name": "lib3", + "path": "", "source_location": { "column": 6, "file": "libraries/lib3/lib3.h", "line": 3, "translation_unit": "t30011.c" }, - "type": "namespace" + "type": "directory" }, { "display_name": "lib4", "id": "1103453030023410219", "is_deprecated": false, "name": "lib4", + "path": "", "source_location": { "column": 8, "file": "libraries/lib4/lib4.h", "line": 3, "translation_unit": "t30011.c" }, - "type": "namespace" + "type": "directory" } ], "id": "879401191375500756", "is_deprecated": false, "name": "libraries", - "type": "namespace" + "path": "", + "type": "directory" }, { "display_name": "app", "id": "2001320261642080149", "is_deprecated": false, "name": "app", + "path": "", "source_location": { "column": 8, "file": "app/app.h", "line": 8, "translation_unit": "t30011.c" }, - "type": "namespace" + "type": "directory" } ], "name": "t30011_package", + "package_type": "directory", "relationships": [ { "destination": "879212264535378961", diff --git a/docs/test_cases/t30011_package.svg b/docs/test_cases/t30011_package.svg index 8af66c7a..3cde2fcb 100644 --- a/docs/test_cases/t30011_package.svg +++ b/docs/test_cases/t30011_package.svg @@ -1,53 +1,49 @@ - + + + + + + + - - - - libraries - - - - - lib1 + + + libraries + + + + lib1 - - - - lib2 + + + + lib2 - - - - lib3 + + + + lib3 - - - - lib4 + + + + lib4 - - - - app + + + + app - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/docs/test_cases/t30011_package_mermaid.svg b/docs/test_cases/t30011_package_mermaid.svg index 8b12ecd0..897b1799 100644 --- a/docs/test_cases/t30011_package_mermaid.svg +++ b/docs/test_cases/t30011_package_mermaid.svg @@ -1,22 +1,22 @@ - + - + - + - + - + - + @@ -33,10 +33,10 @@ - - - - + + + + diff --git a/docs/test_cases/t30012.md b/docs/test_cases/t30012.md index c0933708..30f3695c 100644 --- a/docs/test_cases/t30012.md +++ b/docs/test_cases/t30012.md @@ -31,20 +31,12 @@ class R { } } ``` -File `tests/t30012/src/lib1.cppm` +File `tests/t30012/src/lib1mod2.cppm` ```cpp -export module t30012.app.lib1; +export module t30012.app.lib1.mod2; export namespace clanguml::t30012 { -class B { }; - -template class BB { - T t; -}; - -namespace detail { -enum class BBB { bbb1, bbb2 }; -} // namespace detail +class E { }; } ``` File `tests/t30012/src/lib2.cppm` @@ -63,12 +55,20 @@ enum class CCC { ccc1, ccc2 }; } } ``` -File `tests/t30012/src/lib1mod1.cppm` +File `tests/t30012/src/lib1.cppm` ```cpp -export module t30012.app.lib1.mod1; +export module t30012.app.lib1; export namespace clanguml::t30012 { -class D { }; +class B { }; + +template class BB { + T t; +}; + +namespace detail { +enum class BBB { bbb1, bbb2 }; +} // namespace detail } ``` File `tests/t30012/src/t30012_mod.cppm` @@ -85,12 +85,12 @@ class A { }; } ``` -File `tests/t30012/src/lib1mod2.cppm` +File `tests/t30012/src/lib1mod1.cppm` ```cpp -export module t30012.app.lib1.mod2; +export module t30012.app.lib1.mod1; export namespace clanguml::t30012 { -class E { }; +class D { }; } ``` ## Generated PlantUML diagrams @@ -106,67 +106,74 @@ class E { }; "display_name": "app", "elements": [ { - "display_name": "app.lib1", + "display_name": "lib1", "elements": [ { - "display_name": "app.lib1.mod1", + "display_name": "mod1", "id": "1890617159212924206", "is_deprecated": false, "name": "mod1", + "namespace": "t30012.app.lib1", "source_location": { "column": 7, "file": "src/lib1mod1.cppm", "line": 4, "translation_unit": "t30012.cc" }, - "type": "namespace" + "type": "module" }, { - "display_name": "app.lib1.mod2", + "display_name": "mod2", "id": "206451677325228178", "is_deprecated": false, "name": "mod2", + "namespace": "t30012.app.lib1", "source_location": { "column": 7, "file": "src/lib1mod2.cppm", "line": 4, "translation_unit": "t30012.cc" }, - "type": "namespace" + "type": "module" } ], "id": "2078388864960203240", "is_deprecated": false, "name": "lib1", + "namespace": "t30012.app", "source_location": { "column": 7, "file": "src/lib1.cppm", "line": 4, "translation_unit": "t30012.cc" }, - "type": "namespace" + "type": "module" }, { - "display_name": "app.lib2", + "display_name": "lib2", "id": "765684581621927632", "is_deprecated": false, "name": "lib2", + "namespace": "t30012.app", "source_location": { "column": 7, "file": "src/lib2.cppm", "line": 4, "translation_unit": "t30012.cc" }, - "type": "namespace" + "type": "module" } ], "id": "381866731754697815", "is_deprecated": false, "name": "app", - "type": "namespace" + "namespace": "t30012", + "type": "module" } ], "name": "t30012_package", - "relationships": [] + "package_type": "module", + "relationships": [], + "using_module": "t30012" } ``` diff --git a/docs/test_cases/t30012_package.svg b/docs/test_cases/t30012_package.svg index c8c27bbb..94271210 100644 --- a/docs/test_cases/t30012_package.svg +++ b/docs/test_cases/t30012_package.svg @@ -1,34 +1,36 @@ - + + + + + + + - - - - app - - - - - - lib1 - - - - - - mod1 + + + app + + + + lib1 - - - - mod2 + + + + mod1 - - - - lib2 + + + + mod2 + + + + + lib2 diff --git a/docs/test_cases/t30012_package_mermaid.svg b/docs/test_cases/t30012_package_mermaid.svg index bb6e2a9d..62b5da66 100644 --- a/docs/test_cases/t30012_package_mermaid.svg +++ b/docs/test_cases/t30012_package_mermaid.svg @@ -1,22 +1,22 @@ - + - + - + - + - + - + diff --git a/docs/test_cases/t30013.md b/docs/test_cases/t30013.md index 21727a0a..b38523b4 100644 --- a/docs/test_cases/t30013.md +++ b/docs/test_cases/t30013.md @@ -16,6 +16,7 @@ diagrams: File `tests/t30013/t30013.cc` ```cpp import t30013.app; +import t30013.mod1; import t30013.mod2; import t30013.mod3; import t30013.mod4; @@ -40,6 +41,62 @@ class R { }; } // namespace clanguml::t30013 ``` +File `tests/t30013/src/mod7.cppm` +```cpp +export module t30013.mod7; + +export namespace clanguml::t30013 { +struct CG { }; +} +``` +File `tests/t30013/src/mod11.cppm` +```cpp +export module t30013.mod11; + +export namespace clanguml::t30013 { +struct CK { }; +} +``` +File `tests/t30013/src/mod17.cppm` +```cpp +export module t30013.mod17; + +export namespace clanguml::t30013 { +struct CR { }; +} +``` +File `tests/t30013/src/mod16.cppm` +```cpp +export module t30013.mod16; + +export namespace clanguml::t30013 { +struct CP { }; +} +``` +File `tests/t30013/src/mod10.cppm` +```cpp +export module t30013.mod10; + +export namespace clanguml::t30013 { +struct CJ { }; +} +``` +File `tests/t30013/src/mod4.cppm` +```cpp +export module t30013.mod4; + +export namespace clanguml::t30013 { +struct CD { }; +} +``` +File `tests/t30013/src/mod1.cppm` +```cpp +export module t30013.mod1; + +export namespace clanguml::t30013 { +struct CA { }; +} +``` File `tests/t30013/src/app.cppm` ```cpp module; @@ -114,6 +171,14 @@ template std::map> cm() { return {}; } } // namespace clanguml::t30013 ``` +File `tests/t30013/src/mod13.cppm` +```cpp +export module t30013.mod13; + +export namespace clanguml::t30013 { +struct CM { }; +} +``` File `tests/t30013/src/mod9.cppm` ```cpp export module t30013.mod9; @@ -122,12 +187,12 @@ export namespace clanguml::t30013 { struct CI { }; } ``` -File `tests/t30013/src/mod4.cppm` +File `tests/t30013/src/mod5.cppm` ```cpp -export module t30013.mod4; +export module t30013.mod5; export namespace clanguml::t30013 { -struct CD { }; +struct CE { }; } ``` File `tests/t30013/src/mod18.cppm` @@ -138,12 +203,46 @@ export namespace clanguml::t30013 { enum class S { s1, s2, s3 }; } ``` -File `tests/t30013/src/mod7.cppm` +File `tests/t30013/src/mod2.cppm` ```cpp -export module t30013.mod7; +export module t30013.mod2; export namespace clanguml::t30013 { -struct CG { }; +template struct CB { + T cb; +}; +} +``` +File `tests/t30013/src/mod14.cppm` +```cpp +export module t30013.mod14; + +export namespace clanguml::t30013 { +struct CN { }; +} +``` +File `tests/t30013/src/mod12.cppm` +```cpp +export module t30013.mod12; + +export namespace clanguml::t30013 { +struct CL { }; +} +``` +File `tests/t30013/src/mod6.cppm` +```cpp +export module t30013.mod6; + +export namespace clanguml::t30013 { +struct CF { }; +} +``` +File `tests/t30013/src/mod8.cppm` +```cpp +export module t30013.mod8; + +export namespace clanguml::t30013 { +struct CH { }; } ``` File `tests/t30013/src/mod3.cppm` @@ -162,104 +261,6 @@ export namespace clanguml::t30013 { struct CO { }; } ``` -File `tests/t30013/src/mod16.cppm` -```cpp -export module t30013.mod16; - -export namespace clanguml::t30013 { -struct CP { }; -} -``` -File `tests/t30013/src/mod11.cppm` -```cpp -export module t30013.mod11; - -export namespace clanguml::t30013 { -struct CK { }; -} -``` -File `tests/t30013/src/mod13.cppm` -```cpp -export module t30013.mod13; - -export namespace clanguml::t30013 { -struct CM { }; -} -``` -File `tests/t30013/src/mod2.cppm` -```cpp -export module t30013.mod2; - -export namespace clanguml::t30013 { -template struct CB { - T cb; -}; -} -``` -File `tests/t30013/src/mod17.cppm` -```cpp -export module t30013.mod17; - -export namespace clanguml::t30013 { -struct CR { }; -} -``` -File `tests/t30013/src/mod12.cppm` -```cpp -export module t30013.mod12; - -export namespace clanguml::t30013 { -struct CL { }; -} -``` -File `tests/t30013/src/mod8.cppm` -```cpp -export module t30013.mod8; - -export namespace clanguml::t30013 { -struct CH { }; -} -``` -File `tests/t30013/src/mod10.cppm` -```cpp -export module t30013.mod10; - -export namespace clanguml::t30013 { -struct CJ { }; -} -``` -File `tests/t30013/src/mod14.cppm` -```cpp -export module t30013.mod14; - -export namespace clanguml::t30013 { -struct CN { }; -} -``` -File `tests/t30013/src/mod1.cppm` -```cpp -export module t30013.mod1; - -export namespace clanguml::t30013 { -struct CA { }; -} -``` -File `tests/t30013/src/mod6.cppm` -```cpp -export module t30013.mod6; - -export namespace clanguml::t30013 { -struct CF { }; -} -``` -File `tests/t30013/src/mod5.cppm` -```cpp -export module t30013.mod5; - -export namespace clanguml::t30013 { -struct CE { }; -} -``` ## Generated PlantUML diagrams ![t30013_package](./t30013_package.svg "C++20 modules package dependencies diagram test") ## Generated Mermaid diagrams @@ -274,250 +275,270 @@ struct CE { }; "id": "2044296282469444594", "is_deprecated": false, "name": "mod1", + "namespace": "t30013", "source_location": { "column": 8, "file": "src/mod1.cppm", "line": 4, "translation_unit": "t30013.cc" }, - "type": "namespace" + "type": "module" }, { "display_name": "mod2", "id": "1532747677179216874", "is_deprecated": false, "name": "mod2", + "namespace": "t30013", "source_location": { "column": 30, "file": "src/mod2.cppm", "line": 4, "translation_unit": "t30013.cc" }, - "type": "namespace" + "type": "module" }, { "display_name": "mod3", "id": "2181211985644595508", "is_deprecated": false, "name": "mod3", + "namespace": "t30013", "source_location": { "column": 8, "file": "src/mod3.cppm", "line": 4, "translation_unit": "t30013.cc" }, - "type": "namespace" + "type": "module" }, { "display_name": "mod4", "id": "1994575092781206355", "is_deprecated": false, "name": "mod4", + "namespace": "t30013", "source_location": { "column": 8, "file": "src/mod4.cppm", "line": 4, "translation_unit": "t30013.cc" }, - "type": "namespace" + "type": "module" }, { "display_name": "mod5", "id": "83546849245676714", "is_deprecated": false, "name": "mod5", + "namespace": "t30013", "source_location": { "column": 8, "file": "src/mod5.cppm", "line": 4, "translation_unit": "t30013.cc" }, - "type": "namespace" + "type": "module" }, { "display_name": "mod6", "id": "441620369599169965", "is_deprecated": false, "name": "mod6", + "namespace": "t30013", "source_location": { "column": 8, "file": "src/mod6.cppm", "line": 4, "translation_unit": "t30013.cc" }, - "type": "namespace" + "type": "module" }, { "display_name": "mod7", "id": "836435135277319151", "is_deprecated": false, "name": "mod7", + "namespace": "t30013", "source_location": { "column": 8, "file": "src/mod7.cppm", "line": 4, "translation_unit": "t30013.cc" }, - "type": "namespace" + "type": "module" }, { "display_name": "mod8", "id": "420790450869221512", "is_deprecated": false, "name": "mod8", + "namespace": "t30013", "source_location": { "column": 8, "file": "src/mod8.cppm", "line": 4, "translation_unit": "t30013.cc" }, - "type": "namespace" + "type": "module" }, { "display_name": "mod9", "id": "396495954682989840", "is_deprecated": false, "name": "mod9", + "namespace": "t30013", "source_location": { "column": 8, "file": "src/mod9.cppm", "line": 4, "translation_unit": "t30013.cc" }, - "type": "namespace" + "type": "module" }, { "display_name": "mod10", "id": "2177162846045884064", "is_deprecated": false, "name": "mod10", + "namespace": "t30013", "source_location": { "column": 8, "file": "src/mod10.cppm", "line": 4, "translation_unit": "t30013.cc" }, - "type": "namespace" + "type": "module" }, { "display_name": "mod11", "id": "1414886740502603020", "is_deprecated": false, "name": "mod11", + "namespace": "t30013", "source_location": { "column": 8, "file": "src/mod11.cppm", "line": 4, "translation_unit": "t30013.cc" }, - "type": "namespace" + "type": "module" }, { "display_name": "mod12", "id": "1312439587201843275", "is_deprecated": false, "name": "mod12", + "namespace": "t30013", "source_location": { "column": 8, "file": "src/mod12.cppm", "line": 4, "translation_unit": "t30013.cc" }, - "type": "namespace" + "type": "module" }, { "display_name": "mod13", "id": "1087761784810349022", "is_deprecated": false, "name": "mod13", + "namespace": "t30013", "source_location": { "column": 8, "file": "src/mod13.cppm", "line": 4, "translation_unit": "t30013.cc" }, - "type": "namespace" + "type": "module" }, { "display_name": "mod14", "id": "613410583917815311", "is_deprecated": false, "name": "mod14", + "namespace": "t30013", "source_location": { "column": 8, "file": "src/mod14.cppm", "line": 4, "translation_unit": "t30013.cc" }, - "type": "namespace" + "type": "module" }, { "display_name": "mod15", "id": "1226951305255100636", "is_deprecated": false, "name": "mod15", + "namespace": "t30013", "source_location": { "column": 8, "file": "src/mod15.cppm", "line": 4, "translation_unit": "t30013.cc" }, - "type": "namespace" + "type": "module" }, { "display_name": "mod16", "id": "1931818205177002737", "is_deprecated": false, "name": "mod16", + "namespace": "t30013", "source_location": { "column": 8, "file": "src/mod16.cppm", "line": 4, "translation_unit": "t30013.cc" }, - "type": "namespace" + "type": "module" }, { "display_name": "mod17", "id": "1954698286919808752", "is_deprecated": false, "name": "mod17", + "namespace": "t30013", "source_location": { "column": 8, "file": "src/mod17.cppm", "line": 4, "translation_unit": "t30013.cc" }, - "type": "namespace" + "type": "module" }, { "display_name": "mod18", "id": "984386744169567889", "is_deprecated": false, "name": "mod18", + "namespace": "t30013", "source_location": { "column": 12, "file": "src/mod18.cppm", "line": 4, "translation_unit": "t30013.cc" }, - "type": "namespace" + "type": "module" }, { "display_name": "app", "id": "45223532970498010", "is_deprecated": false, "name": "app", + "namespace": "t30013", "source_location": { "column": 7, "file": "src/app.cppm", "line": 32, "translation_unit": "t30013.cc" }, - "type": "namespace" + "type": "module" } ], "name": "t30013_package", + "package_type": "module", "relationships": [ { "destination": "420790450869221512", @@ -609,6 +630,7 @@ struct CE { }; "source": "45223532970498010", "type": "dependency" } - ] + ], + "using_module": "t30013" } ``` diff --git a/docs/test_cases/t30013_package.svg b/docs/test_cases/t30013_package.svg index 2fb2f341..8ce4750f 100644 --- a/docs/test_cases/t30013_package.svg +++ b/docs/test_cases/t30013_package.svg @@ -1,174 +1,144 @@ - + + + + + + + - - - - mod1 + + + + mod1 - - - - mod2 + + + + mod2 - - - - mod3 + + + + mod3 - - - - mod4 + + + + mod4 - - - - mod5 + + + + mod5 - - - - mod6 + + + + mod6 - - - - mod7 + + + + mod7 - - - - mod8 + + + + mod8 - - - - mod9 + + + + mod9 - - - - mod10 + + + + mod10 - - - - mod11 + + + + mod11 - - - - mod12 + + + + mod12 - - - - mod13 + + + + mod13 - - - - mod14 + + + + mod14 - - - - mod15 + + + + mod15 - - - - mod16 + + + + mod16 - - - - mod17 + + + + mod17 - - - - mod18 + + + + mod18 - - - - app + + + + app - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/test_cases/t30013_package_mermaid.svg b/docs/test_cases/t30013_package_mermaid.svg index 9e88cc84..ec097879 100644 --- a/docs/test_cases/t30013_package_mermaid.svg +++ b/docs/test_cases/t30013_package_mermaid.svg @@ -1,45 +1,45 @@ - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/docs/test_cases/t30014.md b/docs/test_cases/t30014.md new file mode 100644 index 00000000..f68feaca --- /dev/null +++ b/docs/test_cases/t30014.md @@ -0,0 +1,161 @@ +# t30014 - C++20 modules package diagram test with partitions +## Config +```yaml +diagrams: + t30014_package: + type: package + glob: + - t30014.cc + package_type: module + include: + modules: + - t30014 + exclude: + modules: + - t30014.app:lib1.mod2 + using_module: t30014 +``` +## Source code +File `tests/t30014/t30014.cc` +```cpp +import t30014.app; + +namespace clanguml { +namespace t30014 { +} +} +``` +File `tests/t30014/src/lib1mod2.cppm` +```cpp +export module t30014.app:lib1.mod2; + +export namespace clanguml::t30014 { +class E { }; +} // namespace clanguml::t30014 +``` +File `tests/t30014/src/t30014_mod.cppm` +```cpp +export module t30014.app; +import :lib1; +import :lib1.mod1; +import :lib1.mod2; +import :lib2; + +export namespace clanguml::t30014 { +class A { + int get() { return a; } + + int a; +}; +} // namespace clanguml::t30014 +``` +File `tests/t30014/src/lib2.cppm` +```cpp +export module t30014.app:lib2; + +export namespace clanguml::t30014 { +class C { }; + +template class CC { + T t; +}; + +namespace detail { +enum class CCC { ccc1, ccc2 }; +} // namespace detail +} // namespace clanguml::t30014 +``` +File `tests/t30014/src/lib1.cppm` +```cpp +export module t30014.app:lib1; + +export namespace clanguml::t30014 { +class B { }; + +template class BB { + T t; +}; + +namespace detail { +enum class BBB { bbb1, bbb2 }; +} // namespace detail +} // namespace clanguml::t30014 +``` +File `tests/t30014/src/lib1mod1.cppm` +```cpp +export module t30014.app:lib1.mod1; + +export namespace clanguml::t30014 { +class D { }; +} // namespace clanguml::t30014 +``` +## Generated PlantUML diagrams +![t30014_package](./t30014_package.svg "C++20 modules package diagram test with partitions") +## Generated Mermaid diagrams +![t30014_package](./t30014_package_mermaid.svg "C++20 modules package diagram test with partitions") +## Generated JSON models +```json +{ + "diagram_type": "package", + "elements": [ + { + "display_name": "app", + "elements": [ + { + "display_name": ":lib1", + "elements": [ + { + "display_name": "mod1", + "id": "2034114360803168801", + "is_deprecated": false, + "name": "mod1", + "namespace": "t30014.app:lib1", + "source_location": { + "column": 7, + "file": "src/lib1mod1.cppm", + "line": 4, + "translation_unit": "t30014.cc" + }, + "type": "module" + } + ], + "id": "1618985722491582169", + "is_deprecated": false, + "name": ":lib1", + "namespace": "t30014.app", + "source_location": { + "column": 7, + "file": "src/lib1.cppm", + "line": 4, + "translation_unit": "t30014.cc" + }, + "type": "module" + }, + { + "display_name": ":lib2", + "id": "1569901875704270760", + "is_deprecated": false, + "name": ":lib2", + "namespace": "t30014.app", + "source_location": { + "column": 7, + "file": "src/lib2.cppm", + "line": 4, + "translation_unit": "t30014.cc" + }, + "type": "module" + } + ], + "id": "1932503454610788726", + "is_deprecated": false, + "name": "app", + "namespace": "t30014", + "type": "module" + } + ], + "name": "t30014_package", + "package_type": "module", + "relationships": [], + "using_module": "t30014" +} +``` diff --git a/docs/test_cases/t30014_package.svg b/docs/test_cases/t30014_package.svg new file mode 100644 index 00000000..fb04c4fc --- /dev/null +++ b/docs/test_cases/t30014_package.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + app + + + + :lib1 + + + + + mod1 + + + + + :lib2 + + + diff --git a/docs/test_cases/t30014_package_mermaid.svg b/docs/test_cases/t30014_package_mermaid.svg new file mode 100644 index 00000000..bf069df7 --- /dev/null +++ b/docs/test_cases/t30014_package_mermaid.svg @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ app +
+ + + + + + + + + + + + + +
+ :lib1 +
+ + + + + + + + + + + + +
+ mod1 +
+ + + + + + + + + + +
+ :lib2 +
+ + + + + + + + + diff --git a/docs/test_cases/t30015.md b/docs/test_cases/t30015.md new file mode 100644 index 00000000..d6651ad7 --- /dev/null +++ b/docs/test_cases/t30015.md @@ -0,0 +1,655 @@ +# t30015 - C++20 modules package diagram test with partition dependencies +## Config +```yaml +diagrams: + t30015_package: + type: package + glob: + - t30015.cc + package_type: module + include: + modules: + - t30015 + using_module: t30015 +``` +## Source code +File `tests/t30015/t30015.cc` +```cpp +import t30015.app; + +namespace clanguml { +namespace t30015 { +} +} +``` +File `tests/t30015/src/mod7.cppm` +```cpp +export module t30015.lib1:mod7; + +export namespace clanguml::t30015 { +struct CG { }; +} +``` +File `tests/t30015/src/mod11.cppm` +```cpp +export module t30015.lib1:mod11; + +export namespace clanguml::t30015 { +struct CK { }; +} +``` +File `tests/t30015/src/mod17.cppm` +```cpp +export module t30015.lib1:mod17; + +export namespace clanguml::t30015 { +struct CR { }; +} +``` +File `tests/t30015/src/mod16.cppm` +```cpp +export module t30015.lib1:mod16; + +export namespace clanguml::t30015 { +struct CP { }; +} +``` +File `tests/t30015/src/mod10.cppm` +```cpp +export module t30015.lib1:mod10; + +export namespace clanguml::t30015 { +struct CJ { }; +} +``` +File `tests/t30015/src/mod4.cppm` +```cpp +export module t30015.lib1:mod4; + +export namespace clanguml::t30015 { +struct CD { }; +} +``` +File `tests/t30015/src/mod1.cppm` +```cpp +export module t30015.lib1:mod1; + +export namespace clanguml::t30015 { +struct CA { }; +} +``` +File `tests/t30015/src/app.cppm` +```cpp +module; + +#include +#include +#include +#include +#include + +export module t30015.app; +import t30015.lib1; + +// import t30015.app; +// import t30015.mod2; +// import t30015.mod3; +// import t30015.mod4; +// import t30015.mod5; +// import t30015.mod6; +// import t30015.mod7; +// import t30015.mod8; +// import t30015.mod9; +// import t30015.mod10; +// import t30015.mod11; +// import t30015.mod12; +// import t30015.mod13; +// import t30015.mod14; +// import t30015.mod15; +// import t30015.mod16; +// import t30015.mod17; +// import t30015.mod18; + +export namespace clanguml::t30015 { + +class CBA : public CF { +public: + CA *ca_; + CB cb_; + std::shared_ptr cc_; + std::map> *cd_; + std::array co_; + static CP *cp_; + + CBA() = default; + + CBA(CN *cn) { } + + friend CR; + + template CBA(std::tuple &items) { } + + void ce(const std::vector /*ce_*/) { } + + std::shared_ptr cg() { return {}; } + + template void ch(std::map> &ch_) { } + + template std::map> ci(T * /*t*/) + { + return {}; + } + + S s; +}; + +void cj(std::unique_ptr /*cj_*/) { } + +std::unique_ptr ck() { return {}; } + +template void cl(std::map> & /*ch_*/) { } + +template std::map> cm() { return {}; } + +} // namespace clanguml::t30013 +``` +File `tests/t30015/src/mod13.cppm` +```cpp +export module t30015.lib1:mod13; + +export namespace clanguml::t30015 { +struct CM { }; +} +``` +File `tests/t30015/src/mod9.cppm` +```cpp +export module t30015.lib1:mod9; + +export namespace clanguml::t30015 { +struct CI { }; +} +``` +File `tests/t30015/src/mod5.cppm` +```cpp +export module t30015.lib1:mod5; + +export namespace clanguml::t30015 { +struct CE { }; +} +``` +File `tests/t30015/src/mod18.cppm` +```cpp +export module t30015.lib1:mod18; + +export namespace clanguml::t30015 { +enum class S { s1, s2, s3 }; +} +``` +File `tests/t30015/src/mod2.cppm` +```cpp +export module t30015.lib1:mod2; + +export namespace clanguml::t30015 { +template struct CB { + T cb; +}; +} +``` +File `tests/t30015/src/mod14.cppm` +```cpp +export module t30015.lib1:mod14; + +export namespace clanguml::t30015 { +struct CN { }; +} +``` +File `tests/t30015/src/mod12.cppm` +```cpp +export module t30015.lib1:mod12; + +export namespace clanguml::t30015 { +struct CL { }; +} +``` +File `tests/t30015/src/mod6.cppm` +```cpp +export module t30015.lib1:mod6; + +export namespace clanguml::t30015 { +struct CF { }; +} +``` +File `tests/t30015/src/mod8.cppm` +```cpp +export module t30015.lib1:mod8; + +export namespace clanguml::t30015 { +struct CH { }; +} +``` +File `tests/t30015/src/mod3.cppm` +```cpp +export module t30015.lib1:mod3; + +export namespace clanguml::t30015 { +struct CC { }; +} +``` +File `tests/t30015/src/lib1.cppm` +```cpp +export module t30015.lib1; + +export import :mod1; +export import :mod2; +export import :mod3; +export import :mod4; +export import :mod5; +export import :mod6; +export import :mod7; +export import :mod8; +export import :mod9; +export import :mod10; +export import :mod11; +export import :mod12; +export import :mod13; +export import :mod14; +export import :mod15; +export import :mod16; +export import :mod17; +export import :mod18; + +export namespace clanguml::t30015 { + +} +``` +File `tests/t30015/src/mod15.cppm` +```cpp +export module t30015.lib1:mod15; + +export namespace clanguml::t30015 { +struct CO { }; +} +``` +## Generated PlantUML diagrams +![t30015_package](./t30015_package.svg "C++20 modules package diagram test with partition dependencies") +## Generated Mermaid diagrams +![t30015_package](./t30015_package_mermaid.svg "C++20 modules package diagram test with partition dependencies") +## Generated JSON models +```json +{ + "diagram_type": "package", + "elements": [ + { + "display_name": "lib1", + "elements": [ + { + "display_name": ":mod1", + "id": "2078789731210233181", + "is_deprecated": false, + "name": ":mod1", + "namespace": "t30015.lib1", + "source_location": { + "column": 8, + "file": "src/mod1.cppm", + "line": 4, + "translation_unit": "t30015.cc" + }, + "type": "module" + }, + { + "display_name": ":mod2", + "id": "108157285110421434", + "is_deprecated": false, + "name": ":mod2", + "namespace": "t30015.lib1", + "source_location": { + "column": 30, + "file": "src/mod2.cppm", + "line": 4, + "translation_unit": "t30015.cc" + }, + "type": "module" + }, + { + "display_name": ":mod3", + "id": "1466337333501241721", + "is_deprecated": false, + "name": ":mod3", + "namespace": "t30015.lib1", + "source_location": { + "column": 8, + "file": "src/mod3.cppm", + "line": 4, + "translation_unit": "t30015.cc" + }, + "type": "module" + }, + { + "display_name": ":mod4", + "id": "2181077882404368936", + "is_deprecated": false, + "name": ":mod4", + "namespace": "t30015.lib1", + "source_location": { + "column": 8, + "file": "src/mod4.cppm", + "line": 4, + "translation_unit": "t30015.cc" + }, + "type": "module" + }, + { + "display_name": ":mod5", + "id": "1045004042628075747", + "is_deprecated": false, + "name": ":mod5", + "namespace": "t30015.lib1", + "source_location": { + "column": 8, + "file": "src/mod5.cppm", + "line": 4, + "translation_unit": "t30015.cc" + }, + "type": "module" + }, + { + "display_name": ":mod6", + "id": "536067780214444138", + "is_deprecated": false, + "name": ":mod6", + "namespace": "t30015.lib1", + "source_location": { + "column": 8, + "file": "src/mod6.cppm", + "line": 4, + "translation_unit": "t30015.cc" + }, + "type": "module" + }, + { + "display_name": ":mod7", + "id": "1678616733221858020", + "is_deprecated": false, + "name": ":mod7", + "namespace": "t30015.lib1", + "source_location": { + "column": 8, + "file": "src/mod7.cppm", + "line": 4, + "translation_unit": "t30015.cc" + }, + "type": "module" + }, + { + "display_name": ":mod8", + "id": "240013230569803405", + "is_deprecated": false, + "name": ":mod8", + "namespace": "t30015.lib1", + "source_location": { + "column": 8, + "file": "src/mod8.cppm", + "line": 4, + "translation_unit": "t30015.cc" + }, + "type": "module" + }, + { + "display_name": ":mod9", + "id": "179175577447017767", + "is_deprecated": false, + "name": ":mod9", + "namespace": "t30015.lib1", + "source_location": { + "column": 8, + "file": "src/mod9.cppm", + "line": 4, + "translation_unit": "t30015.cc" + }, + "type": "module" + }, + { + "display_name": ":mod10", + "id": "485628131931062884", + "is_deprecated": false, + "name": ":mod10", + "namespace": "t30015.lib1", + "source_location": { + "column": 8, + "file": "src/mod10.cppm", + "line": 4, + "translation_unit": "t30015.cc" + }, + "type": "module" + }, + { + "display_name": ":mod11", + "id": "791090113373006765", + "is_deprecated": false, + "name": ":mod11", + "namespace": "t30015.lib1", + "source_location": { + "column": 8, + "file": "src/mod11.cppm", + "line": 4, + "translation_unit": "t30015.cc" + }, + "type": "module" + }, + { + "display_name": ":mod12", + "id": "500107934060144677", + "is_deprecated": false, + "name": ":mod12", + "namespace": "t30015.lib1", + "source_location": { + "column": 8, + "file": "src/mod12.cppm", + "line": 4, + "translation_unit": "t30015.cc" + }, + "type": "module" + }, + { + "display_name": ":mod13", + "id": "1195842122299166493", + "is_deprecated": false, + "name": ":mod13", + "namespace": "t30015.lib1", + "source_location": { + "column": 8, + "file": "src/mod13.cppm", + "line": 4, + "translation_unit": "t30015.cc" + }, + "type": "module" + }, + { + "display_name": ":mod14", + "id": "581129920847850526", + "is_deprecated": false, + "name": ":mod14", + "namespace": "t30015.lib1", + "source_location": { + "column": 8, + "file": "src/mod14.cppm", + "line": 4, + "translation_unit": "t30015.cc" + }, + "type": "module" + }, + { + "display_name": ":mod15", + "id": "1715856257738182160", + "is_deprecated": false, + "name": ":mod15", + "namespace": "t30015.lib1", + "source_location": { + "column": 8, + "file": "src/mod15.cppm", + "line": 4, + "translation_unit": "t30015.cc" + }, + "type": "module" + }, + { + "display_name": ":mod16", + "id": "1435303665523039114", + "is_deprecated": false, + "name": ":mod16", + "namespace": "t30015.lib1", + "source_location": { + "column": 8, + "file": "src/mod16.cppm", + "line": 4, + "translation_unit": "t30015.cc" + }, + "type": "module" + }, + { + "display_name": ":mod17", + "id": "1327885001907982070", + "is_deprecated": false, + "name": ":mod17", + "namespace": "t30015.lib1", + "source_location": { + "column": 8, + "file": "src/mod17.cppm", + "line": 4, + "translation_unit": "t30015.cc" + }, + "type": "module" + }, + { + "display_name": ":mod18", + "id": "2193691762152553973", + "is_deprecated": false, + "name": ":mod18", + "namespace": "t30015.lib1", + "source_location": { + "column": 12, + "file": "src/mod18.cppm", + "line": 4, + "translation_unit": "t30015.cc" + }, + "type": "module" + } + ], + "id": "1208975031146850353", + "is_deprecated": false, + "name": "lib1", + "namespace": "t30015", + "type": "module" + }, + { + "display_name": "app", + "id": "1200268042616700255", + "is_deprecated": false, + "name": "app", + "namespace": "t30015", + "source_location": { + "column": 7, + "file": "src/app.cppm", + "line": 33, + "translation_unit": "t30015.cc" + }, + "type": "module" + } + ], + "name": "t30015_package", + "package_type": "module", + "relationships": [ + { + "destination": "240013230569803405", + "source": "1200268042616700255", + "type": "dependency" + }, + { + "destination": "179175577447017767", + "source": "1200268042616700255", + "type": "dependency" + }, + { + "destination": "2078789731210233181", + "source": "1200268042616700255", + "type": "dependency" + }, + { + "destination": "108157285110421434", + "source": "1200268042616700255", + "type": "dependency" + }, + { + "destination": "1466337333501241721", + "source": "1200268042616700255", + "type": "dependency" + }, + { + "destination": "2181077882404368936", + "source": "1200268042616700255", + "type": "dependency" + }, + { + "destination": "1715856257738182160", + "source": "1200268042616700255", + "type": "dependency" + }, + { + "destination": "2193691762152553973", + "source": "1200268042616700255", + "type": "dependency" + }, + { + "destination": "1435303665523039114", + "source": "1200268042616700255", + "type": "dependency" + }, + { + "destination": "581129920847850526", + "source": "1200268042616700255", + "type": "dependency" + }, + { + "destination": "1045004042628075747", + "source": "1200268042616700255", + "type": "dependency" + }, + { + "destination": "1678616733221858020", + "source": "1200268042616700255", + "type": "dependency" + }, + { + "destination": "1327885001907982070", + "source": "1200268042616700255", + "type": "dependency" + }, + { + "destination": "536067780214444138", + "source": "1200268042616700255", + "type": "dependency" + }, + { + "destination": "485628131931062884", + "source": "1200268042616700255", + "type": "dependency" + }, + { + "destination": "791090113373006765", + "source": "1200268042616700255", + "type": "dependency" + }, + { + "destination": "500107934060144677", + "source": "1200268042616700255", + "type": "dependency" + }, + { + "destination": "1195842122299166493", + "source": "1200268042616700255", + "type": "dependency" + } + ], + "using_module": "t30015" +} +``` diff --git a/docs/test_cases/t30015_package.svg b/docs/test_cases/t30015_package.svg new file mode 100644 index 00000000..77606193 --- /dev/null +++ b/docs/test_cases/t30015_package.svg @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + lib1 + + + + :mod1 + + + + + :mod2 + + + + + :mod3 + + + + + :mod4 + + + + + :mod5 + + + + + :mod6 + + + + + :mod7 + + + + + :mod8 + + + + + :mod9 + + + + + :mod10 + + + + + :mod11 + + + + + :mod12 + + + + + :mod13 + + + + + :mod14 + + + + + :mod15 + + + + + :mod16 + + + + + :mod17 + + + + + :mod18 + + + + + app + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/test_cases/t30015_package_mermaid.svg b/docs/test_cases/t30015_package_mermaid.svg new file mode 100644 index 00000000..b7cd9ad0 --- /dev/null +++ b/docs/test_cases/t30015_package_mermaid.svg @@ -0,0 +1,432 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ lib1 +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + + + + + +
+ :mod1 +
+ + + + + + + + +
+ :mod2 +
+ + + + + + + + +
+ :mod3 +
+ + + + + + + + +
+ :mod4 +
+ + + + + + + + +
+ :mod5 +
+ + + + + + + + +
+ :mod6 +
+ + + + + + + + +
+ :mod7 +
+ + + + + + + + +
+ :mod8 +
+ + + + + + + + +
+ :mod9 +
+ + + + + + + + +
+ :mod10 +
+ + + + + + + + +
+ :mod11 +
+ + + + + + + + +
+ :mod12 +
+ + + + + + + + +
+ :mod13 +
+ + + + + + + + +
+ :mod14 +
+ + + + + + + + +
+ :mod15 +
+ + + + + + + + +
+ :mod16 +
+ + + + + + + + +
+ :mod17 +
+ + + + + + + + +
+ :mod18 +
+ + + + + + + + +
+ app +
+ + + + + + + diff --git a/docs/test_cases/t40001_include.svg b/docs/test_cases/t40001_include.svg index 8899e51b..d815c4e5 100644 --- a/docs/test_cases/t40001_include.svg +++ b/docs/test_cases/t40001_include.svg @@ -1,97 +1,65 @@ - + + + + + + + - Basic include diagram example - - - - src - - - - - include - - - - - lib1 - - - - - - t40001.cc - - - - - - - t40001_include1.h - - - - - - lib1.h - - - - - string - - - - - vector - - - - - yaml-cpp/yaml.h - - - - - This is a lib1 include dir - - - - - This is a t40001_include1.h include file - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Basic include diagram example + + + src + + + include + + + lib1 + + + + t40001.cc + + + + + t40001_include1.h + + + + lib1.h + + + string + + + vector + + + yaml-cpp/yaml.h + + + This is a lib1 include dir + + + This is a t40001_include1.h include file + + + + + + + + + + + + + + diff --git a/docs/test_cases/t40001_include_mermaid.svg b/docs/test_cases/t40001_include_mermaid.svg index 672e1c65..24b9afec 100644 --- a/docs/test_cases/t40001_include_mermaid.svg +++ b/docs/test_cases/t40001_include_mermaid.svg @@ -1,22 +1,23 @@ - + + Basic include diagram example - + - + - + - + - + - + @@ -53,12 +54,12 @@ - - - - - - + + + + + + @@ -137,7 +138,7 @@ - + @@ -150,7 +151,7 @@ - + @@ -163,7 +164,7 @@ - + diff --git a/docs/test_cases/t40002.md b/docs/test_cases/t40002.md index 74882ee6..231dba9c 100644 --- a/docs/test_cases/t40002.md +++ b/docs/test_cases/t40002.md @@ -83,6 +83,16 @@ int foo1(); int foo(); +} +``` +File `tests/t40002/include/lib2/lib2_detail.h` +```cpp +#pragma once + +namespace clanguml::t40002::lib2::detail { + +int foo22(); + } ``` File `tests/t40002/include/lib2/lib2.h` @@ -99,16 +109,6 @@ int foo3(); int foo(); -} -``` -File `tests/t40002/include/lib2/lib2_detail.h` -```cpp -#pragma once - -namespace clanguml::t40002::lib2::detail { - -int foo22(); - } ``` ## Generated PlantUML diagrams diff --git a/docs/test_cases/t40002_include.svg b/docs/test_cases/t40002_include.svg index bd5f1f40..ea6052a0 100644 --- a/docs/test_cases/t40002_include.svg +++ b/docs/test_cases/t40002_include.svg @@ -1,92 +1,66 @@ - + + + + + + + - - - - src - - - - - lib1 - - - - - lib2 - - - - - include - - - - - lib1 - - - - - lib2 - - - - - - t40002.cc - - - - - - - lib1.cc - - - - - - - lib2.cc - - - - - - - lib1.h - - - - - - - lib2.h - - - - - - - - - - - - - - - - - - - - - - + + + src + + + lib1 + + + lib2 + + + include + + + lib1 + + + lib2 + + + + t40002.cc + + + + + lib1.cc + + + + + lib2.cc + + + + + lib1.h + + + + + lib2.h + + + + + + + + + + + diff --git a/docs/test_cases/t40002_include_mermaid.svg b/docs/test_cases/t40002_include_mermaid.svg index 720ccb7c..2b698312 100644 --- a/docs/test_cases/t40002_include_mermaid.svg +++ b/docs/test_cases/t40002_include_mermaid.svg @@ -1,22 +1,22 @@ - + - + - + - + - + - + @@ -83,11 +83,11 @@ - - - - - + + + + + @@ -137,7 +137,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -176,7 +176,7 @@ - + @@ -189,7 +189,7 @@ - + diff --git a/docs/test_cases/t40003.md b/docs/test_cases/t40003.md index de50c672..a8deffce 100644 --- a/docs/test_cases/t40003.md +++ b/docs/test_cases/t40003.md @@ -48,14 +48,14 @@ void t() } } ``` -File `tests/t40003/include/dependencies/t2.h` +File `tests/t40003/include/dependencies/t3.h` ```cpp #pragma once -#include "t1.h" +#include "t2.h" namespace clanguml::t40003::dependencies { -void t2() { t1(); } +void t3() { t2(); } } ``` File `tests/t40003/include/dependencies/t1.h` @@ -76,16 +76,6 @@ namespace clanguml::t40003::dependencies { void t6() { t1(); } } ``` -File `tests/t40003/include/dependencies/t3.h` -```cpp -#pragma once - -#include "t2.h" - -namespace clanguml::t40003::dependencies { -void t3() { t2(); } -} -``` File `tests/t40003/include/dependencies/t5.h` ```cpp #pragma once @@ -96,16 +86,26 @@ namespace clanguml::t40003::dependencies { void t5() { t1(); } } ``` -File `tests/t40003/include/dependants/t2.h` +File `tests/t40003/include/dependencies/t2.h` ```cpp #pragma once #include "t1.h" -namespace clanguml::t40003::dependants { +namespace clanguml::t40003::dependencies { void t2() { t1(); } } ``` +File `tests/t40003/include/dependants/t3.h` +```cpp +#pragma once + +#include "t2.h" + +namespace clanguml::t40003::dependants { +void t3() { t2(); } +} +``` File `tests/t40003/include/dependants/t4.h` ```cpp #pragma once @@ -122,14 +122,14 @@ namespace clanguml::t40003::dependants { void t1() { } } ``` -File `tests/t40003/include/dependants/t3.h` +File `tests/t40003/include/dependants/t2.h` ```cpp #pragma once -#include "t2.h" +#include "t1.h" namespace clanguml::t40003::dependants { -void t3() { t2(); } +void t2() { t1(); } } ``` ## Generated PlantUML diagrams diff --git a/docs/test_cases/t40003_include.svg b/docs/test_cases/t40003_include.svg index e4a038fc..acfdecd5 100644 --- a/docs/test_cases/t40003_include.svg +++ b/docs/test_cases/t40003_include.svg @@ -1,128 +1,88 @@ - + + + + + + + - - - - src - - - - - dependants - - - - - dependencies - - - - - include - - - - - dependants - - - - - dependencies - - - - - - t1.cc - - - - - - - t2.cc - - - - - - - t3.h - - - - - - - t2.h - - - - - - t1.h - - - - - - t3.h - - - - - - - t2.h - - - - - - t1.h - - - - - - t5.h - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + src + + + dependants + + + dependencies + + + include + + + dependants + + + dependencies + + + + t1.cc + + + + + t2.cc + + + + + t3.h + + + + + t2.h + + + + t1.h + + + + t3.h + + + + + t2.h + + + + t1.h + + + + t5.h + + + + + + + + + + + + + + + + + diff --git a/docs/test_cases/t40003_include_mermaid.svg b/docs/test_cases/t40003_include_mermaid.svg index 80ef7303..b013f46b 100644 --- a/docs/test_cases/t40003_include_mermaid.svg +++ b/docs/test_cases/t40003_include_mermaid.svg @@ -1,22 +1,22 @@ - + - + - + - + - + - + @@ -83,14 +83,14 @@ - - - - - - - - + + + + + + + + @@ -167,7 +167,7 @@ - + @@ -180,7 +180,7 @@ - + @@ -193,7 +193,7 @@ - + @@ -206,7 +206,7 @@ - + @@ -219,7 +219,7 @@ - + @@ -232,7 +232,7 @@ - + @@ -245,7 +245,7 @@ - + @@ -258,7 +258,7 @@ - + @@ -271,7 +271,7 @@ - + diff --git a/docs/test_cases/t90000.md b/docs/test_cases/t90000.md index 9fe0d645..a91ef19f 100644 --- a/docs/test_cases/t90000.md +++ b/docs/test_cases/t90000.md @@ -48,6 +48,7 @@ File `tests/t90000/t90000.cc` "diagram_type": "class", "elements": [], "name": "t90000_class", + "package_type": "namespace", "relationships": [] } ``` diff --git a/docs/test_cases/t90000_class.svg b/docs/test_cases/t90000_class.svg index 03f29593..64b6d962 100644 --- a/docs/test_cases/t90000_class.svg +++ b/docs/test_cases/t90000_class.svg @@ -1,60 +1,48 @@ - + + + + + + + - - - - - Foo - - - int value - - - - - - - ArrayList - - - - - - - This is a very important class. - - - - - This is a - floating note - - - - - This note is connected - to several objects. - - - - - - Boo - - - - - - - - - - - - - + + + + Foo + + + int value + + + + + ArrayList + + + + + This is a very important class. + + + This is a + floating note + + + This note is connected + to several objects. + + + + Boo + + + + + + diff --git a/docs/test_cases/t90000_class_mermaid.svg b/docs/test_cases/t90000_class_mermaid.svg index 11234823..ea66542d 100644 --- a/docs/test_cases/t90000_class_mermaid.svg +++ b/docs/test_cases/t90000_class_mermaid.svg @@ -1,61 +1,56 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + + - +