From 0a8292655a8ae183b434e91ee872d62a683cf53f Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Sat, 9 Dec 2023 20:16:28 +0100 Subject: [PATCH] Updated test cases documentation --- docs/test_cases/t00002.md | 72 +- docs/test_cases/t00002_class.svg | 68 +- docs/test_cases/t00002_class_mermaid.svg | 10 +- docs/test_cases/t00003.md | 133 ++-- docs/test_cases/t00003_class.svg | 126 ++-- docs/test_cases/t00003_class_mermaid.svg | 2 +- docs/test_cases/t00004.md | 98 ++- docs/test_cases/t00004_class.svg | 86 +-- docs/test_cases/t00004_class_mermaid.svg | 32 +- docs/test_cases/t00005.md | 120 ++-- docs/test_cases/t00005_class.svg | 110 +-- docs/test_cases/t00005_class_mermaid.svg | 24 +- docs/test_cases/t00006.md | 144 ++-- docs/test_cases/t00006_class.svg | 134 ++-- docs/test_cases/t00006_class_mermaid.svg | 38 +- docs/test_cases/t00007.md | 40 +- docs/test_cases/t00007_class.svg | 30 +- docs/test_cases/t00007_class_mermaid.svg | 8 +- docs/test_cases/t00008.md | 92 ++- docs/test_cases/t00008_class.svg | 82 +-- docs/test_cases/t00008_class_mermaid.svg | 16 +- docs/test_cases/t00009.md | 48 +- docs/test_cases/t00009_class.svg | 38 +- docs/test_cases/t00009_class_mermaid.svg | 10 +- docs/test_cases/t00010.md | 48 +- docs/test_cases/t00010_class.svg | 38 +- docs/test_cases/t00010_class_mermaid.svg | 10 +- docs/test_cases/t00011.md | 40 +- docs/test_cases/t00011_class.svg | 30 +- docs/test_cases/t00011_class_mermaid.svg | 6 +- docs/test_cases/t00012.md | 84 ++- docs/test_cases/t00012_class.svg | 76 +-- docs/test_cases/t00012_class_mermaid.svg | 18 +- docs/test_cases/t00013.md | 140 ++-- docs/test_cases/t00013_class.svg | 130 ++-- docs/test_cases/t00013_class_mermaid.svg | 24 +- docs/test_cases/t00014.md | 206 +++--- docs/test_cases/t00014_class.svg | 718 ++++++++++---------- docs/test_cases/t00014_class_mermaid.svg | 130 ++-- docs/test_cases/t00015.md | 32 +- docs/test_cases/t00015_class.svg | 22 +- docs/test_cases/t00015_class_mermaid.svg | 10 +- docs/test_cases/t00016.md | 36 +- docs/test_cases/t00016_class.svg | 26 +- docs/test_cases/t00016_class_mermaid.svg | 12 +- docs/test_cases/t00017.md | 124 ++-- docs/test_cases/t00017_class.svg | 70 +- docs/test_cases/t00017_class_mermaid.svg | 24 +- docs/test_cases/t00018.md | 76 +-- docs/test_cases/t00018_class.svg | 66 +- docs/test_cases/t00018_class_mermaid.svg | 4 +- docs/test_cases/t00019.md | 104 ++- docs/test_cases/t00019_class.svg | 90 +-- docs/test_cases/t00019_class_mermaid.svg | 16 +- docs/test_cases/t00020.md | 104 ++- docs/test_cases/t00020_class.svg | 94 +-- docs/test_cases/t00020_class_mermaid.svg | 18 +- docs/test_cases/t00021.md | 92 ++- docs/test_cases/t00021_class.svg | 82 +-- docs/test_cases/t00021_class_mermaid.svg | 14 +- docs/test_cases/t00022.md | 52 +- docs/test_cases/t00022_class.svg | 42 +- docs/test_cases/t00022_class_mermaid.svg | 6 +- docs/test_cases/t00023.md | 64 +- docs/test_cases/t00023_class.svg | 54 +- docs/test_cases/t00023_class_mermaid.svg | 10 +- docs/test_cases/t00024.md | 72 +- docs/test_cases/t00024_class.svg | 62 +- docs/test_cases/t00024_class_mermaid.svg | 8 +- docs/test_cases/t00025.md | 76 +-- docs/test_cases/t00025_class.svg | 66 +- docs/test_cases/t00025_class_mermaid.svg | 12 +- docs/test_cases/t00026.md | 92 ++- docs/test_cases/t00026_class.svg | 82 +-- docs/test_cases/t00026_class_mermaid.svg | 12 +- docs/test_cases/t00027.md | 108 ++- docs/test_cases/t00027_class.svg | 98 +-- docs/test_cases/t00027_class_mermaid.svg | 26 +- docs/test_cases/t00028.md | 80 +-- docs/test_cases/t00028_class.svg | 88 +-- docs/test_cases/t00028_class_mermaid.svg | 18 +- docs/test_cases/t00029.md | 68 +- docs/test_cases/t00029_class.svg | 58 +- docs/test_cases/t00029_class_mermaid.svg | 18 +- docs/test_cases/t00030.md | 56 +- docs/test_cases/t00030_class.svg | 46 +- docs/test_cases/t00030_class_mermaid.svg | 12 +- docs/test_cases/t00031.md | 60 +- docs/test_cases/t00031_class.svg | 56 +- docs/test_cases/t00031_class_mermaid.svg | 12 +- docs/test_cases/t00032.md | 64 +- docs/test_cases/t00032_class.svg | 54 +- docs/test_cases/t00032_class_mermaid.svg | 16 +- docs/test_cases/t00033.md | 68 +- docs/test_cases/t00033_class.svg | 54 +- docs/test_cases/t00033_class_mermaid.svg | 16 +- docs/test_cases/t00034.md | 56 +- docs/test_cases/t00034_class.svg | 46 +- docs/test_cases/t00034_class_mermaid.svg | 14 +- docs/test_cases/t00035.md | 32 +- docs/test_cases/t00035_class.svg | 22 +- docs/test_cases/t00035_class_mermaid.svg | 10 +- docs/test_cases/t00036.md | 40 +- docs/test_cases/t00036_class.svg | 40 +- docs/test_cases/t00036_class_mermaid.svg | 10 +- docs/test_cases/t00037.md | 68 +- docs/test_cases/t00037_class.svg | 58 +- docs/test_cases/t00037_class_mermaid.svg | 8 +- docs/test_cases/t00038.md | 64 +- docs/test_cases/t00038_class.svg | 54 +- docs/test_cases/t00038_class_mermaid.svg | 24 +- docs/test_cases/t00039.md | 88 ++- docs/test_cases/t00039_class.svg | 78 +-- docs/test_cases/t00039_class_mermaid.svg | 28 +- docs/test_cases/t00040.md | 56 +- docs/test_cases/t00040_class.svg | 38 +- docs/test_cases/t00040_class_mermaid.svg | 8 +- docs/test_cases/t00041.md | 68 +- docs/test_cases/t00041_class.svg | 58 +- docs/test_cases/t00041_class_mermaid.svg | 18 +- docs/test_cases/t00042.md | 52 +- docs/test_cases/t00042_class.svg | 42 +- docs/test_cases/t00042_class_mermaid.svg | 12 +- docs/test_cases/t00043.md | 96 ++- docs/test_cases/t00043_class.svg | 90 +-- docs/test_cases/t00043_class_mermaid.svg | 22 +- docs/test_cases/t00044.md | 52 +- docs/test_cases/t00044_class.svg | 42 +- docs/test_cases/t00044_class_mermaid.svg | 14 +- docs/test_cases/t00045.md | 81 +-- docs/test_cases/t00045_class.svg | 74 +- docs/test_cases/t00045_class_mermaid.svg | 24 +- docs/test_cases/t00046.md | 69 +- docs/test_cases/t00046_class.svg | 66 +- docs/test_cases/t00046_class_mermaid.svg | 18 +- docs/test_cases/t00047.md | 25 +- docs/test_cases/t00047_class.svg | 18 +- docs/test_cases/t00047_class_mermaid.svg | 8 +- docs/test_cases/t00048.md | 85 ++- docs/test_cases/t00048_class.svg | 74 +- docs/test_cases/t00048_class_mermaid.svg | 12 +- docs/test_cases/t00049.md | 57 +- docs/test_cases/t00049_class.svg | 50 +- docs/test_cases/t00049_class_mermaid.svg | 10 +- docs/test_cases/t00050.md | 49 +- docs/test_cases/t00050_class.svg | 72 +- docs/test_cases/t00050_class_mermaid.svg | 16 +- docs/test_cases/t00051.md | 120 ++-- docs/test_cases/t00051_class.svg | 244 +++---- docs/test_cases/t00051_class_mermaid.svg | 76 +-- docs/test_cases/t00052.md | 52 +- docs/test_cases/t00052_class.svg | 42 +- docs/test_cases/t00052_class_mermaid.svg | 12 +- docs/test_cases/t00053.md | 80 +-- docs/test_cases/t00053_class.svg | 70 +- docs/test_cases/t00053_class_mermaid.svg | 34 +- docs/test_cases/t00054.md | 80 +-- docs/test_cases/t00054_class.svg | 78 +-- docs/test_cases/t00054_class_mermaid.svg | 34 +- docs/test_cases/t00055.md | 52 +- docs/test_cases/t00055_class.svg | 42 +- docs/test_cases/t00055_class_mermaid.svg | 20 +- docs/test_cases/t00056.md | 104 ++- docs/test_cases/t00056_class.svg | 94 +-- docs/test_cases/t00056_class_mermaid.svg | 28 +- docs/test_cases/t00057.md | 135 ++-- docs/test_cases/t00057_class.svg | 126 ++-- docs/test_cases/t00057_class_mermaid.svg | 20 +- docs/test_cases/t00058.md | 64 +- docs/test_cases/t00058_class.svg | 54 +- docs/test_cases/t00058_class_mermaid.svg | 16 +- docs/test_cases/t00059.md | 104 ++- docs/test_cases/t00059_class.svg | 94 +-- docs/test_cases/t00059_class_mermaid.svg | 22 +- docs/test_cases/t00060.md | 48 +- docs/test_cases/t00060_class.svg | 38 +- docs/test_cases/t00060_class_mermaid.svg | 12 +- docs/test_cases/t00061.md | 15 +- docs/test_cases/t00061_class.svg | 6 +- docs/test_cases/t00061_class_mermaid.svg | 2 +- docs/test_cases/t00062.md | 208 +++--- docs/test_cases/t00062_class.svg | 198 +++--- docs/test_cases/t00062_class_mermaid.svg | 44 +- docs/test_cases/t00063.md | 16 +- docs/test_cases/t00063_class.svg | 6 +- docs/test_cases/t00063_class_mermaid.svg | 2 +- docs/test_cases/t00064.md | 128 ++-- docs/test_cases/t00064_class.svg | 118 ++-- docs/test_cases/t00064_class_mermaid.svg | 46 +- docs/test_cases/t00065.md | 103 ++- docs/test_cases/t00065_class.svg | 102 +-- docs/test_cases/t00065_class_mermaid.svg | 24 +- docs/test_cases/t00066.md | 136 ++-- docs/test_cases/t00066_class.svg | 126 ++-- docs/test_cases/t00066_class_mermaid.svg | 2 +- docs/test_cases/t00067.md | 96 ++- docs/test_cases/t00067_class.svg | 86 +-- docs/test_cases/t00067_class_mermaid.svg | 2 +- docs/test_cases/t00068.md | 132 ++-- docs/test_cases/t00068_r0_class.svg | 14 +- docs/test_cases/t00068_r0_class_mermaid.svg | 2 +- docs/test_cases/t00068_r1_class.svg | 38 +- docs/test_cases/t00068_r1_class_mermaid.svg | 10 +- docs/test_cases/t00068_r2_class.svg | 54 +- docs/test_cases/t00068_r2_class_mermaid.svg | 16 +- docs/test_cases/t20001.md | 56 +- docs/test_cases/t20001_sequence.svg | 78 +-- docs/test_cases/t20002.md | 40 +- docs/test_cases/t20002_sequence.svg | 48 +- docs/test_cases/t20003.md | 40 +- docs/test_cases/t20003_sequence.svg | 48 +- docs/test_cases/t20004.md | 88 ++- docs/test_cases/t20004_sequence.svg | 120 ++-- docs/test_cases/t20005.md | 32 +- docs/test_cases/t20005_sequence.svg | 36 +- docs/test_cases/t20006.md | 116 ++-- docs/test_cases/t20006_sequence.svg | 162 ++--- docs/test_cases/t20007.md | 40 +- docs/test_cases/t20007_sequence.svg | 48 +- docs/test_cases/t20008.md | 64 +- docs/test_cases/t20008_sequence.svg | 84 +-- docs/test_cases/t20009.md | 64 +- docs/test_cases/t20009_sequence.svg | 84 +-- docs/test_cases/t20010.md | 56 +- docs/test_cases/t20010_sequence.svg | 72 +- docs/test_cases/t20011.md | 48 +- docs/test_cases/t20011_sequence.svg | 72 +- docs/test_cases/t20012.md | 196 +++--- docs/test_cases/t20012_sequence.svg | 438 ++++++------ docs/test_cases/t20012_sequence_mermaid.svg | 260 +++---- docs/test_cases/t20013.md | 48 +- docs/test_cases/t20013_sequence.svg | 60 +- docs/test_cases/t20014.md | 58 +- docs/test_cases/t20014_sequence.svg | 72 +- docs/test_cases/t20015.md | 24 +- docs/test_cases/t20015_sequence.svg | 24 +- docs/test_cases/t20016.md | 40 +- docs/test_cases/t20016_sequence.svg | 48 +- docs/test_cases/t20017.md | 66 +- docs/test_cases/t20017_sequence.svg | 48 +- docs/test_cases/t20018.md | 72 +- docs/test_cases/t20018_sequence.svg | 96 +-- docs/test_cases/t20019.md | 56 +- docs/test_cases/t20019_sequence.svg | 84 +-- docs/test_cases/t20020.md | 84 ++- docs/test_cases/t20020_sequence.svg | 124 ++-- docs/test_cases/t20021.md | 72 +- docs/test_cases/t20021_sequence.svg | 106 +-- docs/test_cases/t20022.md | 36 +- docs/test_cases/t20022_sequence.svg | 42 +- docs/test_cases/t20023.md | 40 +- docs/test_cases/t20023_sequence.svg | 50 +- docs/test_cases/t20024.md | 64 +- docs/test_cases/t20024_sequence.svg | 88 +-- docs/test_cases/t20025.md | 32 +- docs/test_cases/t20025_sequence.svg | 36 +- docs/test_cases/t20026.md | 24 +- docs/test_cases/t20026_sequence.svg | 24 +- docs/test_cases/t20027.md | 24 +- docs/test_cases/t20027_sequence.svg | 24 +- docs/test_cases/t20028.md | 36 +- docs/test_cases/t20028_sequence.svg | 44 +- docs/test_cases/t20029.md | 56 +- docs/test_cases/t20029_sequence.svg | 88 +-- docs/test_cases/t20030.md | 76 +-- docs/test_cases/t20030_sequence.svg | 112 +-- docs/test_cases/t20031.md | 44 +- docs/test_cases/t20031_sequence.svg | 58 +- docs/test_cases/t20032.md | 48 +- docs/test_cases/t20032_sequence.svg | 60 +- docs/test_cases/t20033.md | 84 ++- docs/test_cases/t20033_sequence.svg | 128 ++-- docs/test_cases/t20034.md | 116 ++-- docs/test_cases/t20034_sequence.svg | 110 +-- docs/test_cases/t20034_sequence_mermaid.svg | 24 +- docs/test_cases/t20035.md | 40 +- docs/test_cases/t20035_sequence.svg | 32 +- docs/test_cases/t20036.md | 84 ++- docs/test_cases/t20036_sequence.svg | 64 +- docs/test_cases/t20037.md | 64 +- docs/test_cases/t20037_sequence.svg | 108 +-- docs/test_cases/t20038.md | 92 ++- docs/test_cases/t20038_sequence.svg | 174 ++--- docs/test_cases/t30001.md | 60 +- docs/test_cases/t30001_package.svg | 54 +- docs/test_cases/t30002.md | 112 ++- docs/test_cases/t30002_package.svg | 94 +-- docs/test_cases/t30003.md | 44 +- docs/test_cases/t30003_package.svg | 26 +- docs/test_cases/t30004.md | 40 +- docs/test_cases/t30004_package.svg | 38 +- docs/test_cases/t30005.md | 56 +- docs/test_cases/t30005_package.svg | 38 +- docs/test_cases/t30006.md | 32 +- docs/test_cases/t30006_package.svg | 18 +- docs/test_cases/t30007.md | 36 +- docs/test_cases/t30007_package.svg | 22 +- docs/test_cases/t30008.md | 52 +- docs/test_cases/t30008_package.svg | 34 +- docs/test_cases/t30009.md | 60 +- docs/test_cases/t30009_package.svg | 42 +- docs/test_cases/t30010.md | 31 +- docs/test_cases/t30010_package.svg | 24 +- docs/test_cases/t30011.md | 28 +- docs/test_cases/t30011_package.svg | 24 +- docs/test_cases/t40001.md | 11 +- docs/test_cases/t40001_include.svg | 34 +- docs/test_cases/t40001_include_mermaid.svg | 6 +- docs/test_cases/t40002.md | 15 +- docs/test_cases/t40002_include.svg | 34 +- docs/test_cases/t40002_include_mermaid.svg | 10 +- docs/test_cases/t40003.md | 12 +- docs/test_cases/t40003_include.svg | 50 +- docs/test_cases/t40003_include_mermaid.svg | 18 +- docs/test_cases/t90000.md | 7 - docs/test_cases/t90000_class.svg | 14 +- 316 files changed, 9068 insertions(+), 10010 deletions(-) diff --git a/docs/test_cases/t00002.md b/docs/test_cases/t00002.md index 12f23c3f..f7be2f21 100644 --- a/docs/test_cases/t00002.md +++ b/docs/test_cases/t00002.md @@ -1,17 +1,14 @@ # t00002 - Basic class inheritance ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00002_class: type: class title: Basic class diagram example glob: - - ../../tests/t00002/t00002.cc + - t00002.cc comment_parser: clang - using_namespace: - - clanguml::t00002 + using_namespace: clanguml::t00002 include: namespaces: - clanguml::t00002 @@ -178,9 +175,9 @@ private: "parameters": [], "source_location": { "column": 18, - "file": "../../tests/t00002/t00002.cc", + "file": "t00002.cc", "line": 10, - "translation_unit": "../../tests/t00002/t00002.cc" + "translation_unit": "t00002.cc" }, "type": "void" }, @@ -211,9 +208,9 @@ private: "parameters": [], "source_location": { "column": 18, - "file": "../../tests/t00002/t00002.cc", + "file": "t00002.cc", "line": 12, - "translation_unit": "../../tests/t00002/t00002.cc" + "translation_unit": "t00002.cc" }, "type": "void" } @@ -222,9 +219,9 @@ private: "namespace": "clanguml::t00002", "source_location": { "column": 7, - "file": "../../tests/t00002/t00002.cc", + "file": "t00002.cc", "line": 7, - "translation_unit": "../../tests/t00002/t00002.cc" + "translation_unit": "t00002.cc" }, "template_parameters": [], "type": "class" @@ -277,9 +274,9 @@ private: "parameters": [], "source_location": { "column": 18, - "file": "../../tests/t00002/t00002.cc", + "file": "t00002.cc", "line": 18, - "translation_unit": "../../tests/t00002/t00002.cc" + "translation_unit": "t00002.cc" }, "type": "void" } @@ -288,9 +285,9 @@ private: "namespace": "clanguml::t00002", "source_location": { "column": 7, - "file": "../../tests/t00002/t00002.cc", + "file": "t00002.cc", "line": 16, - "translation_unit": "../../tests/t00002/t00002.cc" + "translation_unit": "t00002.cc" }, "template_parameters": [], "type": "class" @@ -352,9 +349,9 @@ private: "parameters": [], "source_location": { "column": 18, - "file": "../../tests/t00002/t00002.cc", + "file": "t00002.cc", "line": 30, - "translation_unit": "../../tests/t00002/t00002.cc" + "translation_unit": "t00002.cc" }, "type": "void" } @@ -363,9 +360,9 @@ private: "namespace": "clanguml::t00002", "source_location": { "column": 7, - "file": "../../tests/t00002/t00002.cc", + "file": "t00002.cc", "line": 27, - "translation_unit": "../../tests/t00002/t00002.cc" + "translation_unit": "t00002.cc" }, "template_parameters": [], "type": "class" @@ -415,9 +412,9 @@ private: "name": "as", "source_location": { "column": 22, - "file": "../../tests/t00002/t00002.cc", + "file": "t00002.cc", "line": 58, - "translation_unit": "../../tests/t00002/t00002.cc" + "translation_unit": "t00002.cc" }, "type": "std::vector" } @@ -450,9 +447,9 @@ private: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00002/t00002.cc", + "file": "t00002.cc", "line": 41, - "translation_unit": "../../tests/t00002/t00002.cc" + "translation_unit": "t00002.cc" }, "type": "void" }, @@ -483,9 +480,9 @@ private: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00002/t00002.cc", + "file": "t00002.cc", "line": 50, - "translation_unit": "../../tests/t00002/t00002.cc" + "translation_unit": "t00002.cc" }, "type": "void" } @@ -494,9 +491,9 @@ private: "namespace": "clanguml::t00002", "source_location": { "column": 7, - "file": "../../tests/t00002/t00002.cc", + "file": "t00002.cc", "line": 36, - "translation_unit": "../../tests/t00002/t00002.cc" + "translation_unit": "t00002.cc" }, "template_parameters": [], "type": "class" @@ -538,9 +535,9 @@ private: "name": "as", "source_location": { "column": 22, - "file": "../../tests/t00002/t00002.cc", + "file": "t00002.cc", "line": 83, - "translation_unit": "../../tests/t00002/t00002.cc" + "translation_unit": "t00002.cc" }, "type": "std::vector" } @@ -573,9 +570,9 @@ private: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00002/t00002.cc", + "file": "t00002.cc", "line": 66, - "translation_unit": "../../tests/t00002/t00002.cc" + "translation_unit": "t00002.cc" }, "type": "void" }, @@ -606,9 +603,9 @@ private: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00002/t00002.cc", + "file": "t00002.cc", "line": 75, - "translation_unit": "../../tests/t00002/t00002.cc" + "translation_unit": "t00002.cc" }, "type": "void" } @@ -617,19 +614,14 @@ private: "namespace": "clanguml::t00002", "source_location": { "column": 7, - "file": "../../tests/t00002/t00002.cc", + "file": "t00002.cc", "line": 61, - "translation_unit": "../../tests/t00002/t00002.cc" + "translation_unit": "t00002.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00002_class", "relationships": [ { diff --git a/docs/test_cases/t00002_class.svg b/docs/test_cases/t00002_class.svg index c978b102..3ddf39c5 100644 --- a/docs/test_cases/t00002_class.svg +++ b/docs/test_cases/t00002_class.svg @@ -1,6 +1,6 @@ - + @@ -10,123 +10,123 @@ Basic class diagram example - - + + A - + - + foo_a() = 0 : void - + - + foo_c() = 0 : void - - + + 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 diff --git a/docs/test_cases/t00002_class_mermaid.svg b/docs/test_cases/t00002_class_mermaid.svg index 62085f94..9e8a1589 100644 --- a/docs/test_cases/t00002_class_mermaid.svg +++ b/docs/test_cases/t00002_class_mermaid.svg @@ -169,7 +169,7 @@ - + @@ -198,7 +198,7 @@ - + @@ -222,7 +222,7 @@ - + @@ -246,7 +246,7 @@ - + @@ -280,7 +280,7 @@ - + diff --git a/docs/test_cases/t00003.md b/docs/test_cases/t00003.md index 244faaca..1c86ff73 100644 --- a/docs/test_cases/t00003.md +++ b/docs/test_cases/t00003.md @@ -1,13 +1,11 @@ # t00003 - Class fields and methods ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00003_class: type: class glob: - - ../../tests/t00003/t00003.cc + - t00003.cc using_namespace: clanguml::t00003 include: namespaces: @@ -119,9 +117,9 @@ int A::static_int = 1; "name": "public_member", "source_location": { "column": 9, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 52, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "int" }, @@ -131,9 +129,9 @@ int A::static_int = 1; "name": "protected_member", "source_location": { "column": 9, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 60, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "int" }, @@ -143,9 +141,9 @@ int A::static_int = 1; "name": "compare", "source_location": { "column": 36, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 62, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "std::function" }, @@ -155,9 +153,9 @@ int A::static_int = 1; "name": "private_member", "source_location": { "column": 9, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 69, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "int" }, @@ -167,9 +165,9 @@ int A::static_int = 1; "name": "a_", "source_location": { "column": 9, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 70, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "int" }, @@ -179,9 +177,9 @@ int A::static_int = 1; "name": "b_", "source_location": { "column": 13, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 70, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "int" }, @@ -191,9 +189,9 @@ int A::static_int = 1; "name": "c_", "source_location": { "column": 17, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 70, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "int" }, @@ -203,9 +201,9 @@ int A::static_int = 1; "name": "static_int", "source_location": { "column": 16, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 53, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "int" }, @@ -215,9 +213,9 @@ int A::static_int = 1; "name": "static_const_int", "source_location": { "column": 22, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 54, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "const int" }, @@ -227,9 +225,9 @@ int A::static_int = 1; "name": "auto_member", "source_location": { "column": 23, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 55, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "const unsigned long" } @@ -254,9 +252,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 5, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 9, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "void" }, @@ -284,9 +282,9 @@ int A::static_int = 1; ], "source_location": { "column": 5, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 10, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "void" }, @@ -314,9 +312,9 @@ int A::static_int = 1; ], "source_location": { "column": 5, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 21, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "void" }, @@ -344,9 +342,9 @@ int A::static_int = 1; ], "source_location": { "column": 5, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 22, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "void" }, @@ -369,9 +367,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 13, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 23, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "void" }, @@ -394,9 +392,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 25, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "void" }, @@ -419,9 +417,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 16, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 26, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "int" }, @@ -444,9 +442,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 27, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "void" }, @@ -469,9 +467,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 28, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "int" }, @@ -494,9 +492,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 8, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 30, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "A &" }, @@ -524,9 +522,9 @@ int A::static_int = 1; ], "source_location": { "column": 8, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 36, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "A &" }, @@ -554,9 +552,9 @@ int A::static_int = 1; ], "source_location": { "column": 8, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 37, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "A &" }, @@ -579,9 +577,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 27, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 39, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "std::size_t" }, @@ -609,9 +607,9 @@ int A::static_int = 1; ], "source_location": { "column": 10, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 41, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "int" }, @@ -643,9 +641,9 @@ int A::static_int = 1; ], "source_location": { "column": 10, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 42, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "int" }, @@ -674,9 +672,9 @@ int A::static_int = 1; ], "source_location": { "column": 10, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 44, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "int" }, @@ -709,9 +707,9 @@ int A::static_int = 1; ], "source_location": { "column": 17, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 45, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "std::string" }, @@ -739,9 +737,9 @@ int A::static_int = 1; ], "source_location": { "column": 14, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 50, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "A" }, @@ -764,9 +762,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 58, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "void" }, @@ -789,9 +787,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 67, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "type": "void" }, @@ -824,19 +822,14 @@ int A::static_int = 1; "namespace": "clanguml::t00003", "source_location": { "column": 7, - "file": "../../tests/t00003/t00003.cc", + "file": "t00003.cc", "line": 7, - "translation_unit": "../../tests/t00003/t00003.cc" + "translation_unit": "t00003.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00003_class", "relationships": [], "using_namespace": "clanguml::t00003" diff --git a/docs/test_cases/t00003_class.svg b/docs/test_cases/t00003_class.svg index 6a3d9ca1..a7c8ea85 100644 --- a/docs/test_cases/t00003_class.svg +++ b/docs/test_cases/t00003_class.svg @@ -1,6 +1,6 @@ - + @@ -9,227 +9,227 @@ - - + + 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 10f24108..4ce6f538 100644 --- a/docs/test_cases/t00003_class_mermaid.svg +++ b/docs/test_cases/t00003_class_mermaid.svg @@ -52,7 +52,7 @@ - + diff --git a/docs/test_cases/t00004.md b/docs/test_cases/t00004.md index 8c581025..4b7b036b 100644 --- a/docs/test_cases/t00004.md +++ b/docs/test_cases/t00004.md @@ -1,17 +1,12 @@ # t00004 - Nested classes and enums ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00004_class: type: class glob: - - ../../tests/t00004/t00004.cc - using_namespace: - - clanguml::t00004 - - clanguml::t00004::A - - clanguml::t00004::A::AA + - t00004.cc + using_namespace: clanguml::t00004 include: namespaces: - clanguml::t00004 @@ -98,9 +93,9 @@ public: "namespace": "clanguml::t00004", "source_location": { "column": 7, - "file": "../../tests/t00004/t00004.cc", + "file": "t00004.cc", "line": 4, - "translation_unit": "../../tests/t00004/t00004.cc" + "translation_unit": "t00004.cc" }, "template_parameters": [], "type": "class" @@ -118,9 +113,9 @@ public: "namespace": "clanguml::t00004", "source_location": { "column": 10, - "file": "../../tests/t00004/t00004.cc", + "file": "t00004.cc", "line": 6, - "translation_unit": "../../tests/t00004/t00004.cc" + "translation_unit": "t00004.cc" }, "type": "enum" }, @@ -154,9 +149,9 @@ public: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00004/t00004.cc", + "file": "t00004.cc", "line": 11, - "translation_unit": "../../tests/t00004/t00004.cc" + "translation_unit": "t00004.cc" }, "type": "void" }, @@ -179,9 +174,9 @@ public: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00004/t00004.cc", + "file": "t00004.cc", "line": 20, - "translation_unit": "../../tests/t00004/t00004.cc" + "translation_unit": "t00004.cc" }, "type": "void" } @@ -190,9 +185,9 @@ public: "namespace": "clanguml::t00004", "source_location": { "column": 7, - "file": "../../tests/t00004/t00004.cc", + "file": "t00004.cc", "line": 9, - "translation_unit": "../../tests/t00004/t00004.cc" + "translation_unit": "t00004.cc" }, "template_parameters": [], "type": "class" @@ -212,9 +207,9 @@ public: "namespace": "clanguml::t00004", "source_location": { "column": 11, - "file": "../../tests/t00004/t00004.cc", + "file": "t00004.cc", "line": 13, - "translation_unit": "../../tests/t00004/t00004.cc" + "translation_unit": "t00004.cc" }, "template_parameters": [], "type": "class" @@ -232,9 +227,9 @@ public: "namespace": "clanguml::t00004", "source_location": { "column": 20, - "file": "../../tests/t00004/t00004.cc", + "file": "t00004.cc", "line": 15, - "translation_unit": "../../tests/t00004/t00004.cc" + "translation_unit": "t00004.cc" }, "type": "enum" }, @@ -253,9 +248,9 @@ public: "namespace": "clanguml::t00004", "source_location": { "column": 15, - "file": "../../tests/t00004/t00004.cc", + "file": "t00004.cc", "line": 17, - "translation_unit": "../../tests/t00004/t00004.cc" + "translation_unit": "t00004.cc" }, "template_parameters": [], "type": "class" @@ -275,9 +270,9 @@ public: "namespace": "clanguml::t00004", "source_location": { "column": 33, - "file": "../../tests/t00004/t00004.cc", + "file": "t00004.cc", "line": 33, - "translation_unit": "../../tests/t00004/t00004.cc" + "translation_unit": "t00004.cc" }, "template_parameters": [ { @@ -305,9 +300,9 @@ public: "name": "t", "source_location": { "column": 7, - "file": "../../tests/t00004/t00004.cc", + "file": "t00004.cc", "line": 25, - "translation_unit": "../../tests/t00004/t00004.cc" + "translation_unit": "t00004.cc" }, "type": "T" }, @@ -317,9 +312,9 @@ public: "name": "b_int", "source_location": { "column": 12, - "file": "../../tests/t00004/t00004.cc", + "file": "t00004.cc", "line": 37, - "translation_unit": "../../tests/t00004/t00004.cc" + "translation_unit": "t00004.cc" }, "type": "B" } @@ -329,9 +324,9 @@ public: "namespace": "clanguml::t00004", "source_location": { "column": 29, - "file": "../../tests/t00004/t00004.cc", + "file": "t00004.cc", "line": 23, - "translation_unit": "../../tests/t00004/t00004.cc" + "translation_unit": "t00004.cc" }, "template_parameters": [ { @@ -358,9 +353,9 @@ public: "namespace": "clanguml::t00004", "source_location": { "column": 11, - "file": "../../tests/t00004/t00004.cc", + "file": "t00004.cc", "line": 27, - "translation_unit": "../../tests/t00004/t00004.cc" + "translation_unit": "t00004.cc" }, "template_parameters": [], "type": "class" @@ -380,9 +375,9 @@ public: "namespace": "clanguml::t00004", "source_location": { "column": 15, - "file": "../../tests/t00004/t00004.cc", + "file": "t00004.cc", "line": 28, - "translation_unit": "../../tests/t00004/t00004.cc" + "translation_unit": "t00004.cc" }, "template_parameters": [], "type": "class" @@ -399,9 +394,9 @@ public: "namespace": "clanguml::t00004", "source_location": { "column": 20, - "file": "../../tests/t00004/t00004.cc", + "file": "t00004.cc", "line": 30, - "translation_unit": "../../tests/t00004/t00004.cc" + "translation_unit": "t00004.cc" }, "type": "enum" }, @@ -421,9 +416,9 @@ public: "name": "b", "source_location": { "column": 11, - "file": "../../tests/t00004/t00004.cc", + "file": "t00004.cc", "line": 34, - "translation_unit": "../../tests/t00004/t00004.cc" + "translation_unit": "t00004.cc" }, "type": "V" } @@ -433,9 +428,9 @@ public: "namespace": "clanguml::t00004", "source_location": { "column": 33, - "file": "../../tests/t00004/t00004.cc", + "file": "t00004.cc", "line": 33, - "translation_unit": "../../tests/t00004/t00004.cc" + "translation_unit": "t00004.cc" }, "template_parameters": [ { @@ -459,9 +454,9 @@ public: "namespace": "clanguml::t00004", "source_location": { "column": 16, - "file": "../../tests/t00004/t00004.cc", + "file": "t00004.cc", "line": 39, - "translation_unit": "../../tests/t00004/t00004.cc" + "translation_unit": "t00004.cc" }, "type": "enum" }, @@ -480,9 +475,9 @@ public: "namespace": "clanguml::t00004::detail", "source_location": { "column": 7, - "file": "../../tests/t00004/t00004.cc", + "file": "t00004.cc", "line": 43, - "translation_unit": "../../tests/t00004/t00004.cc" + "translation_unit": "t00004.cc" }, "template_parameters": [], "type": "class" @@ -500,9 +495,9 @@ public: "namespace": "clanguml::t00004::detail", "source_location": { "column": 16, - "file": "../../tests/t00004/t00004.cc", + "file": "t00004.cc", "line": 45, - "translation_unit": "../../tests/t00004/t00004.cc" + "translation_unit": "t00004.cc" }, "type": "enum" }, @@ -521,19 +516,14 @@ public: "namespace": "clanguml::t00004::detail", "source_location": { "column": 11, - "file": "../../tests/t00004/t00004.cc", + "file": "t00004.cc", "line": 47, - "translation_unit": "../../tests/t00004/t00004.cc" + "translation_unit": "t00004.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00004_class", "relationships": [ { diff --git a/docs/test_cases/t00004_class.svg b/docs/test_cases/t00004_class.svg index eba25be6..fe7a491f 100644 --- a/docs/test_cases/t00004_class.svg +++ b/docs/test_cases/t00004_class.svg @@ -1,6 +1,6 @@ - + @@ -9,16 +9,16 @@ - - + + B - - + + B::AA @@ -28,38 +28,38 @@ AA_3 - - + + A - + - + foo() const : void - + - + foo2() const : void - - + + A::AA - - + + A::AA::Lights @@ -69,16 +69,16 @@ Red - - + + A::AA::AAA - - + + C::B @@ -87,8 +87,8 @@ - - + + C @@ -97,38 +97,38 @@ - + - + b_int : B<int> - + - + t : T - - + + C::AA - - + + C::AA::AAA - - + + C::AA::CCC @@ -137,8 +137,8 @@ CCC_2 - - + + C::B @@ -147,15 +147,15 @@ - + - + b : V - - + + C::CC @@ -164,16 +164,16 @@ CC_2 - - + + detail::D - - + + detail::D::AA @@ -183,8 +183,8 @@ AA_3 - - + + detail::D::DD diff --git a/docs/test_cases/t00004_class_mermaid.svg b/docs/test_cases/t00004_class_mermaid.svg index 3aec06ee..7efe5cf0 100644 --- a/docs/test_cases/t00004_class_mermaid.svg +++ b/docs/test_cases/t00004_class_mermaid.svg @@ -210,7 +210,7 @@ - + @@ -229,7 +229,7 @@ - + @@ -263,7 +263,7 @@ - + @@ -292,7 +292,7 @@ - + @@ -311,7 +311,7 @@ - + @@ -345,7 +345,7 @@ - + @@ -364,7 +364,7 @@ - + @@ -383,7 +383,7 @@ - + @@ -412,7 +412,7 @@ - + @@ -431,7 +431,7 @@ - + @@ -450,7 +450,7 @@ - + @@ -479,7 +479,7 @@ - + @@ -503,7 +503,7 @@ - + @@ -532,7 +532,7 @@ - + @@ -551,7 +551,7 @@ - + @@ -585,7 +585,7 @@ - + diff --git a/docs/test_cases/t00005.md b/docs/test_cases/t00005.md index 51c3375d..cfcbaf55 100644 --- a/docs/test_cases/t00005.md +++ b/docs/test_cases/t00005.md @@ -1,15 +1,12 @@ # t00005 - Basic class field relationships ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00005_class: type: class glob: - - ../../tests/t00005/t00005.cc - using_namespace: - - clanguml::t00005 + - t00005.cc + using_namespace: clanguml::t00005 include: namespaces: - clanguml::t00005 @@ -88,9 +85,9 @@ public: "namespace": "clanguml::t00005", "source_location": { "column": 7, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 3, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "template_parameters": [], "type": "class" @@ -110,9 +107,9 @@ public: "namespace": "clanguml::t00005", "source_location": { "column": 7, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 5, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "template_parameters": [], "type": "class" @@ -132,9 +129,9 @@ public: "namespace": "clanguml::t00005", "source_location": { "column": 7, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 7, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "template_parameters": [], "type": "class" @@ -154,9 +151,9 @@ public: "namespace": "clanguml::t00005", "source_location": { "column": 7, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 9, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "template_parameters": [], "type": "class" @@ -176,9 +173,9 @@ public: "namespace": "clanguml::t00005", "source_location": { "column": 7, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 11, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "template_parameters": [], "type": "class" @@ -198,9 +195,9 @@ public: "namespace": "clanguml::t00005", "source_location": { "column": 7, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 13, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "template_parameters": [], "type": "class" @@ -220,9 +217,9 @@ public: "namespace": "clanguml::t00005", "source_location": { "column": 7, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 15, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "template_parameters": [], "type": "class" @@ -242,9 +239,9 @@ public: "namespace": "clanguml::t00005", "source_location": { "column": 7, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 17, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "template_parameters": [], "type": "class" @@ -264,9 +261,9 @@ public: "namespace": "clanguml::t00005", "source_location": { "column": 7, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 19, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "template_parameters": [], "type": "class" @@ -286,9 +283,9 @@ public: "namespace": "clanguml::t00005", "source_location": { "column": 7, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 21, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "template_parameters": [], "type": "class" @@ -308,9 +305,9 @@ public: "namespace": "clanguml::t00005", "source_location": { "column": 7, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 23, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "template_parameters": [], "type": "class" @@ -331,9 +328,9 @@ public: "name": "some_int", "source_location": { "column": 9, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 27, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "type": "int" }, @@ -343,9 +340,9 @@ public: "name": "some_int_pointer", "source_location": { "column": 10, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 28, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "type": "int *" }, @@ -355,9 +352,9 @@ public: "name": "some_int_pointer_pointer", "source_location": { "column": 11, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 29, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "type": "int **" }, @@ -367,9 +364,9 @@ public: "name": "some_int_reference", "source_location": { "column": 10, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 30, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "type": "int &" }, @@ -379,9 +376,9 @@ public: "name": "a", "source_location": { "column": 7, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 31, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "type": "A" }, @@ -391,9 +388,9 @@ public: "name": "b", "source_location": { "column": 8, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 32, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "type": "B *" }, @@ -403,9 +400,9 @@ public: "name": "c", "source_location": { "column": 8, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 33, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "type": "C &" }, @@ -415,9 +412,9 @@ public: "name": "d", "source_location": { "column": 14, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 34, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "type": "const D *" }, @@ -427,9 +424,9 @@ public: "name": "e", "source_location": { "column": 14, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 35, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "type": "const E &" }, @@ -439,9 +436,9 @@ public: "name": "f", "source_location": { "column": 9, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 36, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "type": "F &&" }, @@ -451,9 +448,9 @@ public: "name": "g", "source_location": { "column": 9, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 37, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "type": "G **" }, @@ -463,9 +460,9 @@ public: "name": "h", "source_location": { "column": 10, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 38, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "type": "H ***" }, @@ -475,9 +472,9 @@ public: "name": "i", "source_location": { "column": 9, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 39, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "type": "I *&" }, @@ -487,9 +484,9 @@ public: "name": "j", "source_location": { "column": 17, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 40, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "type": "volatile J *" }, @@ -499,9 +496,9 @@ public: "name": "k", "source_location": { "column": 16, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 41, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "type": "K *" } @@ -511,19 +508,14 @@ public: "namespace": "clanguml::t00005", "source_location": { "column": 7, - "file": "../../tests/t00005/t00005.cc", + "file": "t00005.cc", "line": 25, - "translation_unit": "../../tests/t00005/t00005.cc" + "translation_unit": "t00005.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00005_class", "relationships": [ { diff --git a/docs/test_cases/t00005_class.svg b/docs/test_cases/t00005_class.svg index 6d516d25..b5d4b8ef 100644 --- a/docs/test_cases/t00005_class.svg +++ b/docs/test_cases/t00005_class.svg @@ -1,6 +1,6 @@ - + @@ -9,205 +9,205 @@ - - + + A - - + + B - - + + C - - + + D - - + + E - - + + F - - + + G - - + + H - - + + I - - + + J - - + + 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 & diff --git a/docs/test_cases/t00005_class_mermaid.svg b/docs/test_cases/t00005_class_mermaid.svg index ab433bc5..48ee0881 100644 --- a/docs/test_cases/t00005_class_mermaid.svg +++ b/docs/test_cases/t00005_class_mermaid.svg @@ -186,7 +186,7 @@ - + @@ -205,7 +205,7 @@ - + @@ -224,7 +224,7 @@ - + @@ -243,7 +243,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -281,7 +281,7 @@ - + @@ -300,7 +300,7 @@ - + @@ -319,7 +319,7 @@ - + @@ -338,7 +338,7 @@ - + @@ -357,7 +357,7 @@ - + @@ -376,7 +376,7 @@ - + @@ -395,7 +395,7 @@ - + diff --git a/docs/test_cases/t00006.md b/docs/test_cases/t00006.md index c276b299..a6bf6f58 100644 --- a/docs/test_cases/t00006.md +++ b/docs/test_cases/t00006.md @@ -1,15 +1,12 @@ # t00006 - Class field relationships inferred from templates ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00006_class: type: class glob: - - ../../tests/t00006/t00006.cc - using_namespace: - - clanguml::t00006 + - t00006.cc + using_namespace: clanguml::t00006 include: namespaces: - clanguml::t00006 @@ -112,9 +109,9 @@ public: "namespace": "clanguml::t00006", "source_location": { "column": 7, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 7, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "template_parameters": [], "type": "class" @@ -134,9 +131,9 @@ public: "namespace": "clanguml::t00006", "source_location": { "column": 7, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 9, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "template_parameters": [], "type": "class" @@ -156,9 +153,9 @@ public: "namespace": "clanguml::t00006", "source_location": { "column": 7, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 11, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "template_parameters": [], "type": "class" @@ -178,9 +175,9 @@ public: "namespace": "clanguml::t00006", "source_location": { "column": 7, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 13, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "template_parameters": [], "type": "class" @@ -200,9 +197,9 @@ public: "namespace": "clanguml::t00006", "source_location": { "column": 7, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 15, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "template_parameters": [], "type": "class" @@ -222,9 +219,9 @@ public: "namespace": "clanguml::t00006", "source_location": { "column": 7, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 17, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "template_parameters": [], "type": "class" @@ -244,9 +241,9 @@ public: "namespace": "clanguml::t00006", "source_location": { "column": 7, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 19, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "template_parameters": [], "type": "class" @@ -266,9 +263,9 @@ public: "namespace": "clanguml::t00006", "source_location": { "column": 7, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 21, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "template_parameters": [], "type": "class" @@ -288,9 +285,9 @@ public: "namespace": "clanguml::t00006", "source_location": { "column": 7, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 23, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "template_parameters": [], "type": "class" @@ -310,9 +307,9 @@ public: "namespace": "clanguml::t00006", "source_location": { "column": 7, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 25, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "template_parameters": [], "type": "class" @@ -332,9 +329,9 @@ public: "namespace": "clanguml::t00006", "source_location": { "column": 7, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 27, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "template_parameters": [], "type": "class" @@ -354,9 +351,9 @@ public: "namespace": "clanguml::t00006", "source_location": { "column": 7, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 29, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "template_parameters": [], "type": "class" @@ -376,9 +373,9 @@ public: "namespace": "clanguml::t00006", "source_location": { "column": 7, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 31, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "template_parameters": [], "type": "class" @@ -398,9 +395,9 @@ public: "namespace": "clanguml::t00006", "source_location": { "column": 7, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 33, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "template_parameters": [], "type": "class" @@ -420,9 +417,9 @@ public: "namespace": "clanguml::t00006", "source_location": { "column": 7, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 35, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "template_parameters": [], "type": "class" @@ -442,9 +439,9 @@ public: "namespace": "clanguml::t00006", "source_location": { "column": 7, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 37, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "template_parameters": [], "type": "class" @@ -465,9 +462,9 @@ public: "name": "data", "source_location": { "column": 20, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 41, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "type": "std::vector" } @@ -477,9 +474,9 @@ public: "namespace": "clanguml::t00006", "source_location": { "column": 29, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 39, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "template_parameters": [ { @@ -506,9 +503,9 @@ public: "namespace": "clanguml::t00006", "source_location": { "column": 29, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 39, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "template_parameters": [ { @@ -536,9 +533,9 @@ public: "name": "a", "source_location": { "column": 20, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 46, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "type": "std::vector" }, @@ -548,9 +545,9 @@ public: "name": "b", "source_location": { "column": 22, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 47, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "type": "std::vector" }, @@ -560,9 +557,9 @@ public: "name": "c", "source_location": { "column": 22, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 49, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "type": "std::map" }, @@ -572,9 +569,9 @@ public: "name": "d", "source_location": { "column": 24, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 50, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "type": "std::map" }, @@ -584,9 +581,9 @@ public: "name": "e", "source_location": { "column": 25, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 52, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "type": "custom_container" }, @@ -596,9 +593,9 @@ public: "name": "f", "source_location": { "column": 33, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 54, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "type": "std::vector>" }, @@ -608,9 +605,9 @@ public: "name": "g", "source_location": { "column": 37, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 55, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "type": "std::map>" }, @@ -620,9 +617,9 @@ public: "name": "h", "source_location": { "column": 23, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 57, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "type": "std::array" }, @@ -632,9 +629,9 @@ public: "name": "i", "source_location": { "column": 24, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 58, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "type": "std::array" }, @@ -644,9 +641,9 @@ public: "name": "j", "source_location": { "column": 7, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 60, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "type": "J[10]" }, @@ -656,9 +653,9 @@ public: "name": "k", "source_location": { "column": 8, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 61, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "type": "K *[20]" }, @@ -668,9 +665,9 @@ public: "name": "lm", "source_location": { "column": 34, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 63, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "type": "std::vector>" }, @@ -680,9 +677,9 @@ public: "name": "ns", "source_location": { "column": 28, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 65, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "type": "std::tuple" } @@ -692,19 +689,14 @@ public: "namespace": "clanguml::t00006", "source_location": { "column": 7, - "file": "../../tests/t00006/t00006.cc", + "file": "t00006.cc", "line": 44, - "translation_unit": "../../tests/t00006/t00006.cc" + "translation_unit": "t00006.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00006_class", "relationships": [ { diff --git a/docs/test_cases/t00006_class.svg b/docs/test_cases/t00006_class.svg index 5e8130fe..9060dde9 100644 --- a/docs/test_cases/t00006_class.svg +++ b/docs/test_cases/t00006_class.svg @@ -1,6 +1,6 @@ - + @@ -9,136 +9,136 @@ - - + + A - - + + B - - + + C - - + + D - - + + E - - + + F - - + + G - - + + H - - + + I - - + + J - - + + K - - + + L - - + + M - - + + N - - + + NN - - + + NNN - - + + custom_container @@ -147,15 +147,15 @@ - + - + data : std::vector<T> - - + + custom_container @@ -164,103 +164,103 @@ - - + + 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> diff --git a/docs/test_cases/t00006_class_mermaid.svg b/docs/test_cases/t00006_class_mermaid.svg index a009e50c..c6a77c14 100644 --- a/docs/test_cases/t00006_class_mermaid.svg +++ b/docs/test_cases/t00006_class_mermaid.svg @@ -270,7 +270,7 @@ - + @@ -289,7 +289,7 @@ - + @@ -308,7 +308,7 @@ - + @@ -327,7 +327,7 @@ - + @@ -346,7 +346,7 @@ - + @@ -365,7 +365,7 @@ - + @@ -384,7 +384,7 @@ - + @@ -403,7 +403,7 @@ - + @@ -422,7 +422,7 @@ - + @@ -441,7 +441,7 @@ - + @@ -460,7 +460,7 @@ - + @@ -479,7 +479,7 @@ - + @@ -498,7 +498,7 @@ - + @@ -517,7 +517,7 @@ - + @@ -536,7 +536,7 @@ - + @@ -555,7 +555,7 @@ - + @@ -574,7 +574,7 @@ - + @@ -598,7 +598,7 @@ - + @@ -617,7 +617,7 @@ - + diff --git a/docs/test_cases/t00007.md b/docs/test_cases/t00007.md index 6f865c37..8f9bb8e3 100644 --- a/docs/test_cases/t00007.md +++ b/docs/test_cases/t00007.md @@ -1,15 +1,12 @@ # t00007 - Smart pointers ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00007_class: type: class glob: - - ../../tests/t00007/t00007.cc - using_namespace: - - clanguml::t00007 + - t00007.cc + using_namespace: clanguml::t00007 include: namespaces: - clanguml::t00007 @@ -62,9 +59,9 @@ public: "namespace": "clanguml::t00007", "source_location": { "column": 7, - "file": "../../tests/t00007/t00007.cc", + "file": "t00007.cc", "line": 5, - "translation_unit": "../../tests/t00007/t00007.cc" + "translation_unit": "t00007.cc" }, "template_parameters": [], "type": "class" @@ -84,9 +81,9 @@ public: "namespace": "clanguml::t00007", "source_location": { "column": 7, - "file": "../../tests/t00007/t00007.cc", + "file": "t00007.cc", "line": 7, - "translation_unit": "../../tests/t00007/t00007.cc" + "translation_unit": "t00007.cc" }, "template_parameters": [], "type": "class" @@ -106,9 +103,9 @@ public: "namespace": "clanguml::t00007", "source_location": { "column": 7, - "file": "../../tests/t00007/t00007.cc", + "file": "t00007.cc", "line": 9, - "translation_unit": "../../tests/t00007/t00007.cc" + "translation_unit": "t00007.cc" }, "template_parameters": [], "type": "class" @@ -129,9 +126,9 @@ public: "name": "a", "source_location": { "column": 24, - "file": "../../tests/t00007/t00007.cc", + "file": "t00007.cc", "line": 13, - "translation_unit": "../../tests/t00007/t00007.cc" + "translation_unit": "t00007.cc" }, "type": "std::unique_ptr" }, @@ -141,9 +138,9 @@ public: "name": "b", "source_location": { "column": 24, - "file": "../../tests/t00007/t00007.cc", + "file": "t00007.cc", "line": 14, - "translation_unit": "../../tests/t00007/t00007.cc" + "translation_unit": "t00007.cc" }, "type": "std::shared_ptr" }, @@ -153,9 +150,9 @@ public: "name": "c", "source_location": { "column": 22, - "file": "../../tests/t00007/t00007.cc", + "file": "t00007.cc", "line": 15, - "translation_unit": "../../tests/t00007/t00007.cc" + "translation_unit": "t00007.cc" }, "type": "std::weak_ptr" } @@ -165,19 +162,14 @@ public: "namespace": "clanguml::t00007", "source_location": { "column": 7, - "file": "../../tests/t00007/t00007.cc", + "file": "t00007.cc", "line": 11, - "translation_unit": "../../tests/t00007/t00007.cc" + "translation_unit": "t00007.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00007_class", "relationships": [ { diff --git a/docs/test_cases/t00007_class.svg b/docs/test_cases/t00007_class.svg index 996f1859..08cef83c 100644 --- a/docs/test_cases/t00007_class.svg +++ b/docs/test_cases/t00007_class.svg @@ -1,6 +1,6 @@ - + @@ -9,57 +9,57 @@ - - + + A - - + + B - - + + C - - + + R - + - + a : std::unique_ptr<A> - + - + b : std::shared_ptr<B> - + - + c : std::weak_ptr<C> diff --git a/docs/test_cases/t00007_class_mermaid.svg b/docs/test_cases/t00007_class_mermaid.svg index c0c9b390..44adfc39 100644 --- a/docs/test_cases/t00007_class_mermaid.svg +++ b/docs/test_cases/t00007_class_mermaid.svg @@ -90,7 +90,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -147,7 +147,7 @@ - + diff --git a/docs/test_cases/t00008.md b/docs/test_cases/t00008.md index b78ff814..9ee1aa14 100644 --- a/docs/test_cases/t00008.md +++ b/docs/test_cases/t00008.md @@ -1,15 +1,12 @@ # t00008 - Template and template template relationships ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00008_class: type: class glob: - - ../../tests/t00008/t00008.cc - using_namespace: - - clanguml::t00008 + - t00008.cc + using_namespace: clanguml::t00008 include: namespaces: - clanguml::t00008 @@ -96,9 +93,9 @@ template <> struct E::nested_template { "name": "value", "source_location": { "column": 7, - "file": "../../tests/t00008/t00008.cc", + "file": "t00008.cc", "line": 11, - "translation_unit": "../../tests/t00008/t00008.cc" + "translation_unit": "t00008.cc" }, "type": "T" }, @@ -108,9 +105,9 @@ template <> struct E::nested_template { "name": "pointer", "source_location": { "column": 8, - "file": "../../tests/t00008/t00008.cc", + "file": "t00008.cc", "line": 12, - "translation_unit": "../../tests/t00008/t00008.cc" + "translation_unit": "t00008.cc" }, "type": "T *" }, @@ -120,9 +117,9 @@ template <> struct E::nested_template { "name": "reference", "source_location": { "column": 8, - "file": "../../tests/t00008/t00008.cc", + "file": "t00008.cc", "line": 13, - "translation_unit": "../../tests/t00008/t00008.cc" + "translation_unit": "t00008.cc" }, "type": "T &" }, @@ -132,9 +129,9 @@ template <> struct E::nested_template { "name": "values", "source_location": { "column": 20, - "file": "../../tests/t00008/t00008.cc", + "file": "t00008.cc", "line": 14, - "translation_unit": "../../tests/t00008/t00008.cc" + "translation_unit": "t00008.cc" }, "type": "std::vector

" }, @@ -144,9 +141,9 @@ template <> struct E::nested_template { "name": "ints", "source_location": { "column": 24, - "file": "../../tests/t00008/t00008.cc", + "file": "t00008.cc", "line": 15, - "translation_unit": "../../tests/t00008/t00008.cc" + "translation_unit": "t00008.cc" }, "type": "std::array" }, @@ -156,9 +153,9 @@ template <> struct E::nested_template { "name": "comparator", "source_location": { "column": 9, - "file": "../../tests/t00008/t00008.cc", + "file": "t00008.cc", "line": 17, - "translation_unit": "../../tests/t00008/t00008.cc" + "translation_unit": "t00008.cc" }, "type": "CMP" } @@ -168,9 +165,9 @@ template <> struct E::nested_template { "namespace": "clanguml::t00008", "source_location": { "column": 71, - "file": "../../tests/t00008/t00008.cc", + "file": "t00008.cc", "line": 9, - "translation_unit": "../../tests/t00008/t00008.cc" + "translation_unit": "t00008.cc" }, "template_parameters": [ { @@ -220,9 +217,9 @@ template <> struct E::nested_template { "name": "values", "source_location": { "column": 20, - "file": "../../tests/t00008/t00008.cc", + "file": "t00008.cc", "line": 21, - "translation_unit": "../../tests/t00008/t00008.cc" + "translation_unit": "t00008.cc" }, "type": "std::vector" } @@ -232,9 +229,9 @@ template <> struct E::nested_template { "namespace": "clanguml::t00008", "source_location": { "column": 30, - "file": "../../tests/t00008/t00008.cc", + "file": "t00008.cc", "line": 20, - "translation_unit": "../../tests/t00008/t00008.cc" + "translation_unit": "t00008.cc" }, "template_parameters": [ { @@ -262,9 +259,9 @@ template <> struct E::nested_template { "name": "template_template", "source_location": { "column": 10, - "file": "../../tests/t00008/t00008.cc", + "file": "t00008.cc", "line": 25, - "translation_unit": "../../tests/t00008/t00008.cc" + "translation_unit": "t00008.cc" }, "type": "C" } @@ -274,9 +271,9 @@ template <> struct E::nested_template { "namespace": "clanguml::t00008", "source_location": { "column": 62, - "file": "../../tests/t00008/t00008.cc", + "file": "t00008.cc", "line": 24, - "translation_unit": "../../tests/t00008/t00008.cc" + "translation_unit": "t00008.cc" }, "template_parameters": [ { @@ -309,9 +306,9 @@ template <> struct E::nested_template { "namespace": "clanguml::t00008", "source_location": { "column": 62, - "file": "../../tests/t00008/t00008.cc", + "file": "t00008.cc", "line": 24, - "translation_unit": "../../tests/t00008/t00008.cc" + "translation_unit": "t00008.cc" }, "template_parameters": [ { @@ -345,9 +342,9 @@ template <> struct E::nested_template { "name": "ints", "source_location": { "column": 20, - "file": "../../tests/t00008/t00008.cc", + "file": "t00008.cc", "line": 29, - "translation_unit": "../../tests/t00008/t00008.cc" + "translation_unit": "t00008.cc" }, "type": "B" } @@ -377,9 +374,9 @@ template <> struct E::nested_template { ], "source_location": { "column": 10, - "file": "../../tests/t00008/t00008.cc", + "file": "t00008.cc", "line": 33, - "translation_unit": "../../tests/t00008/t00008.cc" + "translation_unit": "t00008.cc" }, "type": "void" }, @@ -412,9 +409,9 @@ template <> struct E::nested_template { "namespace": "clanguml::t00008", "source_location": { "column": 8, - "file": "../../tests/t00008/t00008.cc", + "file": "t00008.cc", "line": 28, - "translation_unit": "../../tests/t00008/t00008.cc" + "translation_unit": "t00008.cc" }, "template_parameters": [], "type": "class" @@ -434,9 +431,9 @@ template <> struct E::nested_template { "namespace": "clanguml::t00008", "source_location": { "column": 8, - "file": "../../tests/t00008/t00008.cc", + "file": "t00008.cc", "line": 36, - "translation_unit": "../../tests/t00008/t00008.cc" + "translation_unit": "t00008.cc" }, "template_parameters": [], "type": "class" @@ -476,9 +473,9 @@ template <> struct E::nested_template { ], "source_location": { "column": 20, - "file": "../../tests/t00008/t00008.cc", + "file": "t00008.cc", "line": 40, - "translation_unit": "../../tests/t00008/t00008.cc" + "translation_unit": "t00008.cc" }, "type": "DT *" } @@ -487,9 +484,9 @@ template <> struct E::nested_template { "namespace": "clanguml::t00008", "source_location": { "column": 35, - "file": "../../tests/t00008/t00008.cc", + "file": "t00008.cc", "line": 37, - "translation_unit": "../../tests/t00008/t00008.cc" + "translation_unit": "t00008.cc" }, "template_parameters": [ { @@ -536,9 +533,9 @@ template <> struct E::nested_template { ], "source_location": { "column": 22, - "file": "../../tests/t00008/t00008.cc", + "file": "t00008.cc", "line": 47, - "translation_unit": "../../tests/t00008/t00008.cc" + "translation_unit": "t00008.cc" }, "type": "DeclType *" } @@ -547,9 +544,9 @@ template <> struct E::nested_template { "namespace": "clanguml::t00008", "source_location": { "column": 23, - "file": "../../tests/t00008/t00008.cc", + "file": "t00008.cc", "line": 44, - "translation_unit": "../../tests/t00008/t00008.cc" + "translation_unit": "t00008.cc" }, "template_parameters": [ { @@ -562,11 +559,6 @@ template <> struct E::nested_template { "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00008_class", "relationships": [ { diff --git a/docs/test_cases/t00008_class.svg b/docs/test_cases/t00008_class.svg index 78a3963b..7c4bdf7c 100644 --- a/docs/test_cases/t00008_class.svg +++ b/docs/test_cases/t00008_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + A @@ -19,50 +19,50 @@ - + - + comparator : CMP - + - + ints : std::array<int,N> - + - + pointer : T * - + - + reference : T & - + - + value : T - + - + values : std::vector<P> - - + + Vector @@ -71,15 +71,15 @@ - + - + values : std::vector<T> - - + + B @@ -88,15 +88,15 @@ - + - + template_template : C<T> - - + + B @@ -105,8 +105,8 @@ - - + + D @@ -115,31 +115,31 @@ D<Items...>(std::tuple<Items...> *) : void - + - + add(int i) : void - + - + ints : B<int,Vector> - - + + E - - + + E::nested_template @@ -147,16 +147,16 @@ ET - + - + get(ET * d) : DT * - - + + E::nested_template @@ -164,11 +164,11 @@ char - + - + getDecl(char * c) : DeclType * diff --git a/docs/test_cases/t00008_class_mermaid.svg b/docs/test_cases/t00008_class_mermaid.svg index 20bdd847..e0d4a42a 100644 --- a/docs/test_cases/t00008_class_mermaid.svg +++ b/docs/test_cases/t00008_class_mermaid.svg @@ -114,7 +114,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -187,7 +187,7 @@ - + @@ -211,7 +211,7 @@ - + @@ -230,7 +230,7 @@ - + @@ -264,7 +264,7 @@ - + @@ -283,7 +283,7 @@ - + @@ -307,7 +307,7 @@ - + diff --git a/docs/test_cases/t00009.md b/docs/test_cases/t00009.md index c364be92..e8eabe68 100644 --- a/docs/test_cases/t00009.md +++ b/docs/test_cases/t00009.md @@ -1,15 +1,12 @@ # t00009 - Template instantiation ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00009_class: type: class glob: - - ../../tests/t00009/t00009.cc - using_namespace: - - clanguml::t00009 + - t00009.cc + using_namespace: clanguml::t00009 include: namespaces: - clanguml::t00009 @@ -64,9 +61,9 @@ public: "name": "value", "source_location": { "column": 7, - "file": "../../tests/t00009/t00009.cc", + "file": "t00009.cc", "line": 9, - "translation_unit": "../../tests/t00009/t00009.cc" + "translation_unit": "t00009.cc" }, "type": "T" } @@ -76,9 +73,9 @@ public: "namespace": "clanguml::t00009", "source_location": { "column": 29, - "file": "../../tests/t00009/t00009.cc", + "file": "t00009.cc", "line": 7, - "translation_unit": "../../tests/t00009/t00009.cc" + "translation_unit": "t00009.cc" }, "template_parameters": [ { @@ -105,9 +102,9 @@ public: "namespace": "clanguml::t00009", "source_location": { "column": 29, - "file": "../../tests/t00009/t00009.cc", + "file": "t00009.cc", "line": 7, - "translation_unit": "../../tests/t00009/t00009.cc" + "translation_unit": "t00009.cc" }, "template_parameters": [ { @@ -134,9 +131,9 @@ public: "namespace": "clanguml::t00009", "source_location": { "column": 29, - "file": "../../tests/t00009/t00009.cc", + "file": "t00009.cc", "line": 7, - "translation_unit": "../../tests/t00009/t00009.cc" + "translation_unit": "t00009.cc" }, "template_parameters": [ { @@ -163,9 +160,9 @@ public: "namespace": "clanguml::t00009", "source_location": { "column": 29, - "file": "../../tests/t00009/t00009.cc", + "file": "t00009.cc", "line": 7, - "translation_unit": "../../tests/t00009/t00009.cc" + "translation_unit": "t00009.cc" }, "template_parameters": [ { @@ -200,9 +197,9 @@ public: "name": "aint", "source_location": { "column": 12, - "file": "../../tests/t00009/t00009.cc", + "file": "t00009.cc", "line": 14, - "translation_unit": "../../tests/t00009/t00009.cc" + "translation_unit": "t00009.cc" }, "type": "A" }, @@ -212,9 +209,9 @@ public: "name": "astring", "source_location": { "column": 21, - "file": "../../tests/t00009/t00009.cc", + "file": "t00009.cc", "line": 15, - "translation_unit": "../../tests/t00009/t00009.cc" + "translation_unit": "t00009.cc" }, "type": "A *" }, @@ -224,9 +221,9 @@ public: "name": "avector", "source_location": { "column": 34, - "file": "../../tests/t00009/t00009.cc", + "file": "t00009.cc", "line": 16, - "translation_unit": "../../tests/t00009/t00009.cc" + "translation_unit": "t00009.cc" }, "type": "A> &" } @@ -236,19 +233,14 @@ public: "namespace": "clanguml::t00009", "source_location": { "column": 7, - "file": "../../tests/t00009/t00009.cc", + "file": "t00009.cc", "line": 12, - "translation_unit": "../../tests/t00009/t00009.cc" + "translation_unit": "t00009.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00009_class", "relationships": [ { diff --git a/docs/test_cases/t00009_class.svg b/docs/test_cases/t00009_class.svg index 0ba70da9..0f5ba35d 100644 --- a/docs/test_cases/t00009_class.svg +++ b/docs/test_cases/t00009_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + A @@ -19,15 +19,15 @@ - + - + value : T - - + + A @@ -36,8 +36,8 @@ - - + + A @@ -46,8 +46,8 @@ - - + + A @@ -56,33 +56,33 @@ - - + + B - + - + aint : A<int> - + - + astring : A<std::string> * - + - + avector : A<std::vector<std::string>> & diff --git a/docs/test_cases/t00009_class_mermaid.svg b/docs/test_cases/t00009_class_mermaid.svg index 7df54f0b..43d6b51a 100644 --- a/docs/test_cases/t00009_class_mermaid.svg +++ b/docs/test_cases/t00009_class_mermaid.svg @@ -126,7 +126,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -169,7 +169,7 @@ - + @@ -188,7 +188,7 @@ - + @@ -207,7 +207,7 @@ - + diff --git a/docs/test_cases/t00010.md b/docs/test_cases/t00010.md index 34976221..624e3571 100644 --- a/docs/test_cases/t00010.md +++ b/docs/test_cases/t00010.md @@ -1,15 +1,12 @@ # t00010 - Basic template instantiation ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00010_class: type: class glob: - - ../../tests/t00010/t00010.cc - using_namespace: - - clanguml::t00010 + - t00010.cc + using_namespace: clanguml::t00010 include: namespaces: - clanguml::t00010 @@ -68,9 +65,9 @@ public: "name": "first", "source_location": { "column": 7, - "file": "../../tests/t00010/t00010.cc", + "file": "t00010.cc", "line": 9, - "translation_unit": "../../tests/t00010/t00010.cc" + "translation_unit": "t00010.cc" }, "type": "T" }, @@ -80,9 +77,9 @@ public: "name": "second", "source_location": { "column": 7, - "file": "../../tests/t00010/t00010.cc", + "file": "t00010.cc", "line": 10, - "translation_unit": "../../tests/t00010/t00010.cc" + "translation_unit": "t00010.cc" }, "type": "P" } @@ -92,9 +89,9 @@ public: "namespace": "clanguml::t00010", "source_location": { "column": 41, - "file": "../../tests/t00010/t00010.cc", + "file": "t00010.cc", "line": 7, - "translation_unit": "../../tests/t00010/t00010.cc" + "translation_unit": "t00010.cc" }, "template_parameters": [ { @@ -127,9 +124,9 @@ public: "namespace": "clanguml::t00010", "source_location": { "column": 41, - "file": "../../tests/t00010/t00010.cc", + "file": "t00010.cc", "line": 7, - "translation_unit": "../../tests/t00010/t00010.cc" + "translation_unit": "t00010.cc" }, "template_parameters": [ { @@ -163,9 +160,9 @@ public: "name": "astring", "source_location": { "column": 23, - "file": "../../tests/t00010/t00010.cc", + "file": "t00010.cc", "line": 15, - "translation_unit": "../../tests/t00010/t00010.cc" + "translation_unit": "t00010.cc" }, "type": "A" } @@ -175,9 +172,9 @@ public: "namespace": "clanguml::t00010", "source_location": { "column": 29, - "file": "../../tests/t00010/t00010.cc", + "file": "t00010.cc", "line": 13, - "translation_unit": "../../tests/t00010/t00010.cc" + "translation_unit": "t00010.cc" }, "template_parameters": [ { @@ -204,9 +201,9 @@ public: "namespace": "clanguml::t00010", "source_location": { "column": 29, - "file": "../../tests/t00010/t00010.cc", + "file": "t00010.cc", "line": 13, - "translation_unit": "../../tests/t00010/t00010.cc" + "translation_unit": "t00010.cc" }, "template_parameters": [ { @@ -234,9 +231,9 @@ public: "name": "aintstring", "source_location": { "column": 12, - "file": "../../tests/t00010/t00010.cc", + "file": "t00010.cc", "line": 20, - "translation_unit": "../../tests/t00010/t00010.cc" + "translation_unit": "t00010.cc" }, "type": "B" } @@ -246,19 +243,14 @@ public: "namespace": "clanguml::t00010", "source_location": { "column": 7, - "file": "../../tests/t00010/t00010.cc", + "file": "t00010.cc", "line": 18, - "translation_unit": "../../tests/t00010/t00010.cc" + "translation_unit": "t00010.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00010_class", "relationships": [ { diff --git a/docs/test_cases/t00010_class.svg b/docs/test_cases/t00010_class.svg index 6bc3a541..302b6faa 100644 --- a/docs/test_cases/t00010_class.svg +++ b/docs/test_cases/t00010_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + A @@ -19,22 +19,22 @@ - + - + first : T - + - + second : P - - + + A @@ -43,8 +43,8 @@ - - + + B @@ -53,15 +53,15 @@ - + - + astring : A<T,std::string> - - + + B @@ -70,19 +70,19 @@ - - + + C - + - + aintstring : B<int> diff --git a/docs/test_cases/t00010_class_mermaid.svg b/docs/test_cases/t00010_class_mermaid.svg index 38434da8..cb588f54 100644 --- a/docs/test_cases/t00010_class_mermaid.svg +++ b/docs/test_cases/t00010_class_mermaid.svg @@ -102,7 +102,7 @@ - + @@ -131,7 +131,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -174,7 +174,7 @@ - + @@ -193,7 +193,7 @@ - + diff --git a/docs/test_cases/t00011.md b/docs/test_cases/t00011.md index df7023ee..8b361e80 100644 --- a/docs/test_cases/t00011.md +++ b/docs/test_cases/t00011.md @@ -1,15 +1,12 @@ # t00011 - Friend relationships ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00011_class: type: class glob: - - ../../tests/t00011/t00011.cc - using_namespace: - - clanguml::t00011 + - t00011.cc + using_namespace: clanguml::t00011 include: namespaces: - clanguml::t00011 @@ -77,9 +74,9 @@ public: "name": "value", "source_location": { "column": 7, - "file": "../../tests/t00011/t00011.cc", + "file": "t00011.cc", "line": 11, - "translation_unit": "../../tests/t00011/t00011.cc" + "translation_unit": "t00011.cc" }, "type": "T" } @@ -89,9 +86,9 @@ public: "namespace": "clanguml::t00011", "source_location": { "column": 29, - "file": "../../tests/t00011/t00011.cc", + "file": "t00011.cc", "line": 10, - "translation_unit": "../../tests/t00011/t00011.cc" + "translation_unit": "t00011.cc" }, "template_parameters": [ { @@ -133,9 +130,9 @@ public: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00011/t00011.cc", + "file": "t00011.cc", "line": 16, - "translation_unit": "../../tests/t00011/t00011.cc" + "translation_unit": "t00011.cc" }, "type": "void" } @@ -144,9 +141,9 @@ public: "namespace": "clanguml::t00011", "source_location": { "column": 7, - "file": "../../tests/t00011/t00011.cc", + "file": "t00011.cc", "line": 14, - "translation_unit": "../../tests/t00011/t00011.cc" + "translation_unit": "t00011.cc" }, "template_parameters": [], "type": "class" @@ -167,9 +164,9 @@ public: "name": "m_a", "source_location": { "column": 8, - "file": "../../tests/t00011/t00011.cc", + "file": "t00011.cc", "line": 29, - "translation_unit": "../../tests/t00011/t00011.cc" + "translation_unit": "t00011.cc" }, "type": "A *" } @@ -194,9 +191,9 @@ public: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00011/t00011.cc", + "file": "t00011.cc", "line": 28, - "translation_unit": "../../tests/t00011/t00011.cc" + "translation_unit": "t00011.cc" }, "type": "void" } @@ -205,19 +202,14 @@ public: "namespace": "clanguml::t00011", "source_location": { "column": 7, - "file": "../../tests/t00011/t00011.cc", + "file": "t00011.cc", "line": 26, - "translation_unit": "../../tests/t00011/t00011.cc" + "translation_unit": "t00011.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00011_class", "relationships": [ { diff --git a/docs/test_cases/t00011_class.svg b/docs/test_cases/t00011_class.svg index 18cf3247..a00faa88 100644 --- a/docs/test_cases/t00011_class.svg +++ b/docs/test_cases/t00011_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + D @@ -19,48 +19,48 @@ - + - + value : T - - + + A - + - + foo() : void - - + + B - + - + foo() : void - + - + m_a : A * diff --git a/docs/test_cases/t00011_class_mermaid.svg b/docs/test_cases/t00011_class_mermaid.svg index aa5049e5..72c43137 100644 --- a/docs/test_cases/t00011_class_mermaid.svg +++ b/docs/test_cases/t00011_class_mermaid.svg @@ -78,7 +78,7 @@ - + @@ -102,7 +102,7 @@ - + @@ -126,7 +126,7 @@ - + diff --git a/docs/test_cases/t00012.md b/docs/test_cases/t00012.md index 09d54e8a..4144b325 100644 --- a/docs/test_cases/t00012.md +++ b/docs/test_cases/t00012.md @@ -1,15 +1,12 @@ # t00012 - Advanced template instantiations ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00012_class: type: class glob: - - ../../tests/t00012/t00012.cc - using_namespace: - - clanguml::t00012 + - t00012.cc + using_namespace: clanguml::t00012 include: namespaces: - clanguml::t00012 @@ -84,9 +81,9 @@ class R { "name": "value", "source_location": { "column": 7, - "file": "../../tests/t00012/t00012.cc", + "file": "t00012.cc", "line": 12, - "translation_unit": "../../tests/t00012/t00012.cc" + "translation_unit": "t00012.cc" }, "type": "T" }, @@ -96,9 +93,9 @@ class R { "name": "values", "source_location": { "column": 25, - "file": "../../tests/t00012/t00012.cc", + "file": "t00012.cc", "line": 13, - "translation_unit": "../../tests/t00012/t00012.cc" + "translation_unit": "t00012.cc" }, "type": "std::variant" } @@ -108,9 +105,9 @@ class R { "namespace": "clanguml::t00012", "source_location": { "column": 45, - "file": "../../tests/t00012/t00012.cc", + "file": "t00012.cc", "line": 11, - "translation_unit": "../../tests/t00012/t00012.cc" + "translation_unit": "t00012.cc" }, "template_parameters": [ { @@ -144,9 +141,9 @@ class R { "name": "ints", "source_location": { "column": 36, - "file": "../../tests/t00012/t00012.cc", + "file": "t00012.cc", "line": 17, - "translation_unit": "../../tests/t00012/t00012.cc" + "translation_unit": "t00012.cc" }, "type": "std::array" } @@ -156,9 +153,9 @@ class R { "namespace": "clanguml::t00012", "source_location": { "column": 28, - "file": "../../tests/t00012/t00012.cc", + "file": "t00012.cc", "line": 16, - "translation_unit": "../../tests/t00012/t00012.cc" + "translation_unit": "t00012.cc" }, "template_parameters": [ { @@ -187,9 +184,9 @@ class R { "name": "ints", "source_location": { "column": 34, - "file": "../../tests/t00012/t00012.cc", + "file": "t00012.cc", "line": 21, - "translation_unit": "../../tests/t00012/t00012.cc" + "translation_unit": "t00012.cc" }, "type": "std::array" } @@ -199,9 +196,9 @@ class R { "namespace": "clanguml::t00012", "source_location": { "column": 40, - "file": "../../tests/t00012/t00012.cc", + "file": "t00012.cc", "line": 20, - "translation_unit": "../../tests/t00012/t00012.cc" + "translation_unit": "t00012.cc" }, "template_parameters": [ { @@ -235,9 +232,9 @@ class R { "namespace": "clanguml::t00012", "source_location": { "column": 45, - "file": "../../tests/t00012/t00012.cc", + "file": "t00012.cc", "line": 11, - "translation_unit": "../../tests/t00012/t00012.cc" + "translation_unit": "t00012.cc" }, "template_parameters": [ { @@ -276,9 +273,9 @@ class R { "namespace": "clanguml::t00012", "source_location": { "column": 45, - "file": "../../tests/t00012/t00012.cc", + "file": "t00012.cc", "line": 11, - "translation_unit": "../../tests/t00012/t00012.cc" + "translation_unit": "t00012.cc" }, "template_parameters": [ { @@ -317,9 +314,9 @@ class R { "namespace": "clanguml::t00012", "source_location": { "column": 28, - "file": "../../tests/t00012/t00012.cc", + "file": "t00012.cc", "line": 16, - "translation_unit": "../../tests/t00012/t00012.cc" + "translation_unit": "t00012.cc" }, "template_parameters": [ { @@ -358,9 +355,9 @@ class R { "namespace": "clanguml::t00012", "source_location": { "column": 28, - "file": "../../tests/t00012/t00012.cc", + "file": "t00012.cc", "line": 16, - "translation_unit": "../../tests/t00012/t00012.cc" + "translation_unit": "t00012.cc" }, "template_parameters": [ { @@ -405,9 +402,9 @@ class R { "namespace": "clanguml::t00012", "source_location": { "column": 40, - "file": "../../tests/t00012/t00012.cc", + "file": "t00012.cc", "line": 20, - "translation_unit": "../../tests/t00012/t00012.cc" + "translation_unit": "t00012.cc" }, "template_parameters": [ { @@ -487,9 +484,9 @@ class R { "name": "a1", "source_location": { "column": 32, - "file": "../../tests/t00012/t00012.cc", + "file": "t00012.cc", "line": 25, - "translation_unit": "../../tests/t00012/t00012.cc" + "translation_unit": "t00012.cc" }, "type": "A" }, @@ -499,9 +496,9 @@ class R { "name": "a2", "source_location": { "column": 31, - "file": "../../tests/t00012/t00012.cc", + "file": "t00012.cc", "line": 26, - "translation_unit": "../../tests/t00012/t00012.cc" + "translation_unit": "t00012.cc" }, "type": "A" }, @@ -511,9 +508,9 @@ class R { "name": "b1", "source_location": { "column": 16, - "file": "../../tests/t00012/t00012.cc", + "file": "t00012.cc", "line": 28, - "translation_unit": "../../tests/t00012/t00012.cc" + "translation_unit": "t00012.cc" }, "type": "B<3,2,1>" }, @@ -523,9 +520,9 @@ class R { "name": "b2", "source_location": { "column": 19, - "file": "../../tests/t00012/t00012.cc", + "file": "t00012.cc", "line": 29, - "translation_unit": "../../tests/t00012/t00012.cc" + "translation_unit": "t00012.cc" }, "type": "B<1,1,1,1>" }, @@ -535,9 +532,9 @@ class R { "name": "c1", "source_location": { "column": 9, - "file": "../../tests/t00012/t00012.cc", + "file": "t00012.cc", "line": 33, - "translation_unit": "../../tests/t00012/t00012.cc" + "translation_unit": "t00012.cc" }, "type": "C>>>,3,3,3>" } @@ -547,19 +544,14 @@ class R { "namespace": "clanguml::t00012", "source_location": { "column": 7, - "file": "../../tests/t00012/t00012.cc", + "file": "t00012.cc", "line": 24, - "translation_unit": "../../tests/t00012/t00012.cc" + "translation_unit": "t00012.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00012_class", "relationships": [ { diff --git a/docs/test_cases/t00012_class.svg b/docs/test_cases/t00012_class.svg index 4f0331d1..75fbc290 100644 --- a/docs/test_cases/t00012_class.svg +++ b/docs/test_cases/t00012_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + A @@ -19,22 +19,22 @@ - + - + value : T - + - + values : std::variant<Ts...> - - + + B @@ -43,15 +43,15 @@ - + - + ints : std::array<int,sizeof...(Is)> - - + + C @@ -60,15 +60,15 @@ - + - + ints : std::array<T,sizeof...(Is)> - - + + A @@ -77,8 +77,8 @@ - - + + A @@ -87,8 +87,8 @@ - - + + B @@ -97,8 +97,8 @@ - - + + B @@ -107,8 +107,8 @@ - - + + C @@ -117,50 +117,50 @@ - - + + 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 diff --git a/docs/test_cases/t00012_class_mermaid.svg b/docs/test_cases/t00012_class_mermaid.svg index 27bfc2cf..074361a4 100644 --- a/docs/test_cases/t00012_class_mermaid.svg +++ b/docs/test_cases/t00012_class_mermaid.svg @@ -174,7 +174,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -227,7 +227,7 @@ - + @@ -251,7 +251,7 @@ - + @@ -270,7 +270,7 @@ - + @@ -289,7 +289,7 @@ - + @@ -308,7 +308,7 @@ - + @@ -327,7 +327,7 @@ - + @@ -346,7 +346,7 @@ - + diff --git a/docs/test_cases/t00013.md b/docs/test_cases/t00013.md index 2ded417c..02ca593a 100644 --- a/docs/test_cases/t00013.md +++ b/docs/test_cases/t00013.md @@ -1,15 +1,12 @@ # t00013 - Template instantiation relationships ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00013_class: type: class glob: - - ../../tests/t00013/t00013.cc - using_namespace: - - clanguml::t00013 + - t00013.cc + using_namespace: clanguml::t00013 include: namespaces: - clanguml::t00013 @@ -112,9 +109,9 @@ private: "name": "f", "source_location": { "column": 7, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 8, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "type": "T" } @@ -124,9 +121,9 @@ private: "namespace": "ABCD", "source_location": { "column": 30, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 7, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "template_parameters": [ { @@ -153,9 +150,9 @@ private: "namespace": "ABCD", "source_location": { "column": 30, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 7, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "template_parameters": [ { @@ -183,9 +180,9 @@ private: "name": "a", "source_location": { "column": 9, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 15, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "type": "int" } @@ -195,9 +192,9 @@ private: "namespace": "clanguml::t00013", "source_location": { "column": 8, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 14, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "template_parameters": [], "type": "class" @@ -218,9 +215,9 @@ private: "name": "b", "source_location": { "column": 9, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 19, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "type": "int" } @@ -230,9 +227,9 @@ private: "namespace": "clanguml::t00013", "source_location": { "column": 8, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 18, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "template_parameters": [], "type": "class" @@ -253,9 +250,9 @@ private: "name": "c", "source_location": { "column": 9, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 23, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "type": "int" } @@ -265,9 +262,9 @@ private: "namespace": "clanguml::t00013", "source_location": { "column": 8, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 22, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "template_parameters": [], "type": "class" @@ -288,9 +285,9 @@ private: "name": "d", "source_location": { "column": 9, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 29, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "type": "int" } @@ -320,9 +317,9 @@ private: ], "source_location": { "column": 10, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 30, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "type": "void" } @@ -331,9 +328,9 @@ private: "namespace": "clanguml::t00013", "source_location": { "column": 8, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 28, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "template_parameters": [], "type": "class" @@ -354,9 +351,9 @@ private: "name": "e", "source_location": { "column": 7, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 34, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "type": "T" } @@ -366,9 +363,9 @@ private: "namespace": "clanguml::t00013", "source_location": { "column": 30, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 33, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "template_parameters": [ { @@ -396,9 +393,9 @@ private: "name": "g", "source_location": { "column": 7, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 38, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "type": "T" }, @@ -408,9 +405,9 @@ private: "name": "args", "source_location": { "column": 25, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 39, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "type": "std::tuple" } @@ -420,9 +417,9 @@ private: "namespace": "clanguml::t00013", "source_location": { "column": 48, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 37, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "template_parameters": [ { @@ -455,9 +452,9 @@ private: "namespace": "clanguml::t00013", "source_location": { "column": 30, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 33, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "template_parameters": [ { @@ -484,9 +481,9 @@ private: "namespace": "clanguml::t00013", "source_location": { "column": 48, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 37, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "template_parameters": [ { @@ -525,9 +522,9 @@ private: "namespace": "clanguml::t00013", "source_location": { "column": 30, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 33, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "template_parameters": [ { @@ -555,9 +552,9 @@ private: "name": "gintstring", "source_location": { "column": 32, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 60, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "type": "G" }, @@ -567,9 +564,9 @@ private: "name": "estring", "source_location": { "column": 28, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 63, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "type": "E" } @@ -599,9 +596,9 @@ private: ], "source_location": { "column": 9, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 45, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "type": "int" }, @@ -629,9 +626,9 @@ private: ], "source_location": { "column": 9, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 46, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "type": "int" }, @@ -659,9 +656,9 @@ private: ], "source_location": { "column": 9, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 47, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "type": "int" }, @@ -689,9 +686,9 @@ private: ], "source_location": { "column": 9, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 48, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "type": "int" }, @@ -719,9 +716,9 @@ private: ], "source_location": { "column": 9, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 49, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "type": "int" }, @@ -749,9 +746,9 @@ private: ], "source_location": { "column": 9, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 51, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "type": "int" }, @@ -779,9 +776,9 @@ private: ], "source_location": { "column": 9, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 54, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "type": "int" }, @@ -809,9 +806,9 @@ private: ], "source_location": { "column": 9, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 55, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "type": "int" }, @@ -839,9 +836,9 @@ private: ], "source_location": { "column": 9, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 58, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "type": "int" }, @@ -898,19 +895,14 @@ private: "namespace": "clanguml::t00013", "source_location": { "column": 7, - "file": "../../tests/t00013/t00013.cc", + "file": "t00013.cc", "line": 43, - "translation_unit": "../../tests/t00013/t00013.cc" + "translation_unit": "t00013.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00013_class", "relationships": [ { diff --git a/docs/test_cases/t00013_class.svg b/docs/test_cases/t00013_class.svg index d8d65fdb..39716279 100644 --- a/docs/test_cases/t00013_class.svg +++ b/docs/test_cases/t00013_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + ABCD::F @@ -19,15 +19,15 @@ - + - + f : T - - + + ABCD::F @@ -36,75 +36,75 @@ - - + + A - + - + a : int - - + + B - + - + b : int - - + + C - + - + c : int - - + + D - + - + print(R * r) : void - + - + d : int - - + + E @@ -113,15 +113,15 @@ - + - + e : T - - + + G @@ -130,22 +130,22 @@ - + - + args : std::tuple<Args...> - + - + g : T - - + + E @@ -154,8 +154,8 @@ - - + + G @@ -164,8 +164,8 @@ - - + + E @@ -174,93 +174,93 @@ - - + + 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> diff --git a/docs/test_cases/t00013_class_mermaid.svg b/docs/test_cases/t00013_class_mermaid.svg index de5ccf93..e1d62fa4 100644 --- a/docs/test_cases/t00013_class_mermaid.svg +++ b/docs/test_cases/t00013_class_mermaid.svg @@ -234,7 +234,7 @@ - + @@ -258,7 +258,7 @@ - + @@ -277,7 +277,7 @@ - + @@ -301,7 +301,7 @@ - + @@ -325,7 +325,7 @@ - + @@ -349,7 +349,7 @@ - + @@ -378,7 +378,7 @@ - + @@ -402,7 +402,7 @@ - + @@ -431,7 +431,7 @@ - + @@ -450,7 +450,7 @@ - + @@ -469,7 +469,7 @@ - + @@ -488,7 +488,7 @@ - + diff --git a/docs/test_cases/t00014.md b/docs/test_cases/t00014.md index 6cd8046e..1d2b2841 100644 --- a/docs/test_cases/t00014.md +++ b/docs/test_cases/t00014.md @@ -1,15 +1,12 @@ # t00014 - Alias template instantiation ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00014_class: type: class glob: - - ../../tests/t00014/t00014.cc - using_namespace: - - clanguml::t00014 + - t00014.cc + using_namespace: clanguml::t00014 include: namespaces: - clanguml::t00014 @@ -132,9 +129,9 @@ public: "name": "t", "source_location": { "column": 7, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 22, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "type": "T" }, @@ -144,9 +141,9 @@ public: "name": "p", "source_location": { "column": 7, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 23, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "type": "P" } @@ -156,9 +153,9 @@ public: "namespace": "clanguml::t00014", "source_location": { "column": 42, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 21, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "template_parameters": [ { @@ -192,9 +189,9 @@ public: "name": "value", "source_location": { "column": 17, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 27, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "type": "std::string" } @@ -204,9 +201,9 @@ public: "namespace": "clanguml::t00014", "source_location": { "column": 8, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 26, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "template_parameters": [], "type": "class" @@ -226,9 +223,9 @@ public: "namespace": "clanguml::t00014", "source_location": { "column": 42, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 21, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "template_parameters": [ { @@ -261,9 +258,9 @@ public: "namespace": "clanguml::t00014", "source_location": { "column": 42, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 21, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "template_parameters": [ { @@ -302,10 +299,10 @@ public: "name": "A", "namespace": "clanguml::t00014", "source_location": { - "column": 12, - "file": "../../../../../../usr/include/c++/11/bits/stl_iterator.h", - "line": 2488, - "translation_unit": "../../tests/t00014/t00014.cc" + "column": 42, + "file": "t00014.cc", + "line": 21, + "translation_unit": "t00014.cc" }, "template_parameters": [ { @@ -337,10 +334,10 @@ public: "name": "A", "namespace": "clanguml::t00014", "source_location": { - "column": 11, - "file": "../../../../../../usr/include/c++/11/bits/unique_ptr.h", - "line": 242, - "translation_unit": "../../tests/t00014/t00014.cc" + "column": 42, + "file": "t00014.cc", + "line": 21, + "translation_unit": "t00014.cc" }, "template_parameters": [ { @@ -372,10 +369,10 @@ public: "name": "A", "namespace": "clanguml::t00014", "source_location": { - "column": 12, - "file": "../../../../../../usr/include/c++/11/bits/stl_iterator.h", - "line": 2488, - "translation_unit": "../../tests/t00014/t00014.cc" + "column": 42, + "file": "t00014.cc", + "line": 21, + "translation_unit": "t00014.cc" }, "template_parameters": [ { @@ -407,10 +404,10 @@ public: "name": "A", "namespace": "clanguml::t00014", "source_location": { - "column": 12, - "file": "../../../../../../usr/include/c++/11/bits/stl_iterator.h", - "line": 2488, - "translation_unit": "../../tests/t00014/t00014.cc" + "column": 42, + "file": "t00014.cc", + "line": 21, + "translation_unit": "t00014.cc" }, "template_parameters": [ { @@ -442,10 +439,10 @@ public: "name": "A", "namespace": "clanguml::t00014", "source_location": { - "column": 11, - "file": "../../../../../../usr/include/c++/11/bits/unique_ptr.h", - "line": 242, - "translation_unit": "../../tests/t00014/t00014.cc" + "column": 42, + "file": "t00014.cc", + "line": 21, + "translation_unit": "t00014.cc" }, "template_parameters": [ { @@ -477,10 +474,10 @@ public: "name": "A", "namespace": "clanguml::t00014", "source_location": { - "column": 12, - "file": "../../../../../../usr/include/c++/11/bits/stl_iterator.h", - "line": 2488, - "translation_unit": "../../tests/t00014/t00014.cc" + "column": 42, + "file": "t00014.cc", + "line": 21, + "translation_unit": "t00014.cc" }, "template_parameters": [ { @@ -512,10 +509,10 @@ public: "name": "A", "namespace": "clanguml::t00014", "source_location": { - "column": 11, - "file": "../../../../../../usr/include/c++/11/bits/shared_ptr.h", - "line": 122, - "translation_unit": "../../tests/t00014/t00014.cc" + "column": 42, + "file": "t00014.cc", + "line": 21, + "translation_unit": "t00014.cc" }, "template_parameters": [ { @@ -548,9 +545,9 @@ public: "namespace": "clanguml::t00014", "source_location": { "column": 42, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 21, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "template_parameters": [ { @@ -583,9 +580,9 @@ public: "namespace": "clanguml::t00014", "source_location": { "column": 42, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 21, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "template_parameters": [ { @@ -625,9 +622,9 @@ public: "namespace": "clanguml::t00014", "source_location": { "column": 42, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 21, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "template_parameters": [ { @@ -660,9 +657,9 @@ public: "namespace": "clanguml::t00014", "source_location": { "column": 42, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 21, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "template_parameters": [ { @@ -693,12 +690,6 @@ public: "methods": [], "name": "A", "namespace": "clanguml::t00014", - "source_location": { - "column": 11, - "file": "../../../../../../usr/include/c++/11/bits/std_function.h", - "line": 111, - "translation_unit": "../../tests/t00014/t00014.cc" - }, "template_parameters": [ { "is_variadic": false, @@ -728,12 +719,6 @@ public: "methods": [], "name": "A", "namespace": "clanguml::t00014", - "source_location": { - "column": 11, - "file": "../../../../../../usr/include/c++/11/bits/std_function.h", - "line": 111, - "translation_unit": "../../tests/t00014/t00014.cc" - }, "template_parameters": [ { "is_variadic": false, @@ -766,9 +751,9 @@ public: "name": "bapair", "source_location": { "column": 22, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 59, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "type": "PairPairBA" }, @@ -778,9 +763,9 @@ public: "name": "abool", "source_location": { "column": 16, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 61, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "type": "APtr" }, @@ -790,9 +775,9 @@ public: "name": "aboolfloat", "source_location": { "column": 24, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 62, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "type": "AAPtr" }, @@ -802,9 +787,9 @@ public: "name": "afloat", "source_location": { "column": 23, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 63, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "type": "ASharedPtr" }, @@ -814,9 +799,9 @@ public: "name": "boolstring", "source_location": { "column": 26, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 64, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "type": "A" }, @@ -826,9 +811,9 @@ public: "name": "floatstring", "source_location": { "column": 23, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 65, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "type": "AStringPtr" }, @@ -838,9 +823,9 @@ public: "name": "intstring", "source_location": { "column": 16, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 66, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "type": "AIntString" }, @@ -850,9 +835,9 @@ public: "name": "stringstring", "source_location": { "column": 19, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 67, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "type": "AStringString" }, @@ -862,9 +847,9 @@ public: "name": "bstringstring", "source_location": { "column": 19, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 68, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "type": "BStringString" }, @@ -874,9 +859,9 @@ public: "name": "atfloat", "source_location": { "column": 21, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 69, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "type": "AAPtr" }, @@ -886,9 +871,9 @@ public: "name": "bs", "source_location": { "column": 13, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 72, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "type": "BVector" }, @@ -898,9 +883,9 @@ public: "name": "bs2", "source_location": { "column": 14, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 75, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "type": "BVector2" }, @@ -910,9 +895,9 @@ public: "name": "cb", "source_location": { "column": 33, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 76, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "type": "SimpleCallback" }, @@ -922,9 +907,9 @@ public: "name": "gcb", "source_location": { "column": 35, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 77, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "type": "GenericCallback" }, @@ -934,9 +919,9 @@ public: "name": "vcb", "source_location": { "column": 18, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 78, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "type": "VoidCallback" }, @@ -946,9 +931,9 @@ public: "name": "vps", "source_location": { "column": 18, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 79, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "type": "VectorPtr" } @@ -958,9 +943,9 @@ public: "namespace": "clanguml::t00014", "source_location": { "column": 29, - "file": "../../tests/t00014/t00014.cc", + "file": "t00014.cc", "line": 56, - "translation_unit": "../../tests/t00014/t00014.cc" + "translation_unit": "t00014.cc" }, "template_parameters": [ { @@ -973,11 +958,6 @@ public: "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00014_class", "relationships": [ { @@ -1181,12 +1161,26 @@ public: "source": "1758213171584933144", "type": "dependency" }, + { + "access": "public", + "destination": "340562099063642390", + "label": "cb", + "source": "1758213171584933144", + "type": "dependency" + }, { "access": "public", "destination": "1388877149159894665", "source": "1758213171584933144", "type": "dependency" }, + { + "access": "public", + "destination": "1388877149159894665", + "label": "gcb", + "source": "1758213171584933144", + "type": "dependency" + }, { "access": "public", "destination": "934136012292043506", diff --git a/docs/test_cases/t00014_class.svg b/docs/test_cases/t00014_class.svg index 87ccb77a..8f6fc43f 100644 --- a/docs/test_cases/t00014_class.svg +++ b/docs/test_cases/t00014_class.svg @@ -1,6 +1,6 @@ - + - + @@ -9,414 +9,418 @@ - - - - - A - - T,P - - + + + + + A + + T,P + + - - - + + + - - p : P + + p : P - - - + + + - - t : T + + t : T - - - - - B - - + + + + + B + + - - - + + + - - value : std::string + + value : std::string - - - - - A - - T,std::string - - + + + + + A + + T,std::string + + - - - - - A - - T,std::unique_ptr<std::string> - - + + + + + A + + T,std::unique_ptr<std::string> + + - - - - - A - - long,T - - + + + + + A + + long,T + + - - - - - A - - double,T - - + + + + + A + + double,T + + - - - - - A - - long,U - - + + + + + A + + long,U + + - - - - - A - - long,bool - - + + + + + A + + long,bool + + - - - - - A - - double,bool - - + + + + + A + + double,bool + + - - - - - A - - long,float - - + + + + + A + + long,float + + - - - - - A - - double,float - - + + + + + A + + double,float + + - - - - - A - - bool,std::string - - + + + + + A + + bool,std::string + + - - - - - A - - float,std::unique_ptr<std::string> - - + + + + + A + + float,std::unique_ptr<std::string> + + - - - - - A - - int,std::string - - + + + + + A + + int,std::string + + - - - - - A - - std::string,std::string - - + + + + + A + + std::string,std::string + + - - - - - A - - char,std::string - - + + + + A + + char,std::string + + + + + + A + + wchar_t,std::string + + + + + + + R + + T + + - - - - - A - - wchar_t,std::string - - + + + - - - - - R - - T - - + + abool : APtr<bool> - - - + + + - - abool : APtr<bool> + + aboolfloat : AAPtr<bool,float> - - - + + + - - aboolfloat : AAPtr<bool,float> + + afloat : ASharedPtr<float> - - - + + + - - afloat : ASharedPtr<float> + + atfloat : AAPtr<T,float> - - - + + + - - atfloat : AAPtr<T,float> + + bapair : PairPairBA<bool> - - - + + + - - bapair : PairPairBA<bool> + + boolstring : A<bool,std::string> - - - + + + - - boolstring : A<bool,std::string> + + bs : BVector - - - + + + - - bs : BVector + + bs2 : BVector2 - - - + + + - - bs2 : BVector2 + + bstringstring : BStringString - - - + + + - - bstringstring : BStringString + + cb : SimpleCallback<ACharString> - - - + + + - - cb : SimpleCallback<ACharString> + + floatstring : AStringPtr<float> - - - + + + - - floatstring : AStringPtr<float> + + gcb : GenericCallback<AWCharString> - - - + + + - - gcb : GenericCallback<AWCharString> + + intstring : AIntString - - - + + + - - intstring : AIntString + + stringstring : AStringString - - - + + + - - stringstring : AStringString + + vcb : VoidCallback - - - + + + - - vcb : VoidCallback + + vps : VectorPtr<B> - - - - - - vps : VectorPtr<B> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bapair - - - - bs - - - - bs2 - - - - vps - - - - bapair - - - - abool - - - - aboolfloat - - - - aboolfloat - - - - atfloat - - - - afloat - - - - boolstring - - - - floatstring - - - - intstring - - - - stringstring - - - - bstringstring - - - - atfloat - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 06e8f53f..8da6bc9d 100644 --- a/docs/test_cases/t00014_class_mermaid.svg +++ b/docs/test_cases/t00014_class_mermaid.svg @@ -80,9 +80,11 @@ - - - + + + + + @@ -426,6 +428,17 @@ + + + +

+ + +cb + +
+ + + @@ -437,6 +450,17 @@ + + + +
+ + +gcb + +
+ + + @@ -450,7 +474,7 @@ - + @@ -479,7 +503,7 @@ - + @@ -503,7 +527,7 @@ - + @@ -522,7 +546,7 @@ - + @@ -541,7 +565,7 @@ - + @@ -560,7 +584,7 @@ - + @@ -579,7 +603,7 @@ - + @@ -598,7 +622,7 @@ - + @@ -617,7 +641,7 @@ - + @@ -636,7 +660,7 @@ - + @@ -655,7 +679,7 @@ - + @@ -674,7 +698,7 @@ - + @@ -693,7 +717,7 @@ - + @@ -712,7 +736,7 @@ - + @@ -731,7 +755,7 @@ - + @@ -750,45 +774,41 @@ - - - - - - - -
- -
- - -
- A<char,std::string> -
- - + + + + + + +
+ +
+ + +
+ A<char,std::string> +
+ - - - - - - - - -
- -
- - -
- A<wchar_t,std::string> -
- - + + + + + + + +
+ +
+ + +
+ A<wchar_t,std::string> +
+ - - + + diff --git a/docs/test_cases/t00015.md b/docs/test_cases/t00015.md index 284f33c7..4a164bc9 100644 --- a/docs/test_cases/t00015.md +++ b/docs/test_cases/t00015.md @@ -1,15 +1,12 @@ # t00015 - Namespace fun ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00015_class: type: class glob: - - ../../tests/t00015/t00015.cc - using_namespace: - - clanguml::t00015 + - t00015.cc + using_namespace: clanguml::t00015 include: namespaces: - clanguml::t00015 @@ -71,9 +68,9 @@ class B : public ns1::ns2::Anon { }; "namespace": "clanguml::t00015::ns1", "source_location": { "column": 7, - "file": "../../tests/t00015/t00015.cc", + "file": "t00015.cc", "line": 6, - "translation_unit": "../../tests/t00015/t00015.cc" + "translation_unit": "t00015.cc" }, "template_parameters": [], "type": "class" @@ -93,9 +90,9 @@ class B : public ns1::ns2::Anon { }; "namespace": "clanguml::t00015::ns1::ns2_v0_9_0", "source_location": { "column": 22, - "file": "../../tests/t00015/t00015.cc", + "file": "t00015.cc", "line": 10, - "translation_unit": "../../tests/t00015/t00015.cc" + "translation_unit": "t00015.cc" }, "template_parameters": [], "type": "class" @@ -122,9 +119,9 @@ class B : public ns1::ns2::Anon { }; "namespace": "clanguml::t00015::ns1", "source_location": { "column": 7, - "file": "../../tests/t00015/t00015.cc", + "file": "t00015.cc", "line": 14, - "translation_unit": "../../tests/t00015/t00015.cc" + "translation_unit": "t00015.cc" }, "template_parameters": [], "type": "class" @@ -151,9 +148,9 @@ class B : public ns1::ns2::Anon { }; "namespace": "clanguml::t00015::ns3::ns1::ns2", "source_location": { "column": 7, - "file": "../../tests/t00015/t00015.cc", + "file": "t00015.cc", "line": 21, - "translation_unit": "../../tests/t00015/t00015.cc" + "translation_unit": "t00015.cc" }, "template_parameters": [], "type": "class" @@ -180,19 +177,14 @@ class B : public ns1::ns2::Anon { }; "namespace": "clanguml::t00015::ns3", "source_location": { "column": 7, - "file": "../../tests/t00015/t00015.cc", + "file": "t00015.cc", "line": 24, - "translation_unit": "../../tests/t00015/t00015.cc" + "translation_unit": "t00015.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00015_class", "relationships": [ { diff --git a/docs/test_cases/t00015_class.svg b/docs/test_cases/t00015_class.svg index dda0438f..3252cd78 100644 --- a/docs/test_cases/t00015_class.svg +++ b/docs/test_cases/t00015_class.svg @@ -1,6 +1,6 @@ - + @@ -9,40 +9,40 @@ - - + + ns1::A - - + + ns1::ns2_v0_9_0::A - - + + ns1::Anon - - + + ns3::ns1::ns2::Anon - - + + ns3::B diff --git a/docs/test_cases/t00015_class_mermaid.svg b/docs/test_cases/t00015_class_mermaid.svg index dfa02304..aead00af 100644 --- a/docs/test_cases/t00015_class_mermaid.svg +++ b/docs/test_cases/t00015_class_mermaid.svg @@ -84,7 +84,7 @@ - + @@ -103,7 +103,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -160,7 +160,7 @@ - + diff --git a/docs/test_cases/t00016.md b/docs/test_cases/t00016.md index 21d96b75..a25ec3d2 100644 --- a/docs/test_cases/t00016.md +++ b/docs/test_cases/t00016.md @@ -1,15 +1,12 @@ # t00016 - Unnamed enums and empty templates ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00016_class: type: class glob: - - ../../tests/t00016/t00016.cc - using_namespace: - - clanguml::t00016 + - t00016.cc + using_namespace: clanguml::t00016 include: namespaces: - clanguml::t00016 @@ -79,9 +76,9 @@ template <> struct is_numeric { "namespace": "clanguml::t00016", "source_location": { "column": 28, - "file": "../../tests/t00016/t00016.cc", + "file": "t00016.cc", "line": 4, - "translation_unit": "../../tests/t00016/t00016.cc" + "translation_unit": "t00016.cc" }, "template_parameters": [ { @@ -115,9 +112,9 @@ template <> struct is_numeric { "namespace": "clanguml::t00016", "source_location": { "column": 20, - "file": "../../tests/t00016/t00016.cc", + "file": "t00016.cc", "line": 8, - "translation_unit": "../../tests/t00016/t00016.cc" + "translation_unit": "t00016.cc" }, "template_parameters": [ { @@ -151,9 +148,9 @@ template <> struct is_numeric { "namespace": "clanguml::t00016", "source_location": { "column": 20, - "file": "../../tests/t00016/t00016.cc", + "file": "t00016.cc", "line": 12, - "translation_unit": "../../tests/t00016/t00016.cc" + "translation_unit": "t00016.cc" }, "template_parameters": [ { @@ -187,9 +184,9 @@ template <> struct is_numeric { "namespace": "clanguml::t00016", "source_location": { "column": 20, - "file": "../../tests/t00016/t00016.cc", + "file": "t00016.cc", "line": 16, - "translation_unit": "../../tests/t00016/t00016.cc" + "translation_unit": "t00016.cc" }, "template_parameters": [ { @@ -223,9 +220,9 @@ template <> struct is_numeric { "namespace": "clanguml::t00016", "source_location": { "column": 20, - "file": "../../tests/t00016/t00016.cc", + "file": "t00016.cc", "line": 20, - "translation_unit": "../../tests/t00016/t00016.cc" + "translation_unit": "t00016.cc" }, "template_parameters": [ { @@ -259,9 +256,9 @@ template <> struct is_numeric { "namespace": "clanguml::t00016", "source_location": { "column": 20, - "file": "../../tests/t00016/t00016.cc", + "file": "t00016.cc", "line": 24, - "translation_unit": "../../tests/t00016/t00016.cc" + "translation_unit": "t00016.cc" }, "template_parameters": [ { @@ -274,11 +271,6 @@ template <> struct is_numeric { "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00016_class", "relationships": [ { diff --git a/docs/test_cases/t00016_class.svg b/docs/test_cases/t00016_class.svg index 68c4b869..29c6dad3 100644 --- a/docs/test_cases/t00016_class.svg +++ b/docs/test_cases/t00016_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + is_numeric @@ -21,8 +21,8 @@ value : enum - - + + is_numeric @@ -33,8 +33,8 @@ value : enum - - + + is_numeric @@ -45,8 +45,8 @@ value : enum - - + + is_numeric @@ -57,8 +57,8 @@ value : enum - - + + is_numeric @@ -69,8 +69,8 @@ value : enum - - + + is_numeric diff --git a/docs/test_cases/t00016_class_mermaid.svg b/docs/test_cases/t00016_class_mermaid.svg index 20a00b8c..4bafca7a 100644 --- a/docs/test_cases/t00016_class_mermaid.svg +++ b/docs/test_cases/t00016_class_mermaid.svg @@ -114,7 +114,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -162,7 +162,7 @@ - + @@ -186,7 +186,7 @@ - + @@ -210,7 +210,7 @@ - + @@ -234,7 +234,7 @@ - + diff --git a/docs/test_cases/t00017.md b/docs/test_cases/t00017.md index 32798e60..85e1593c 100644 --- a/docs/test_cases/t00017.md +++ b/docs/test_cases/t00017.md @@ -1,16 +1,13 @@ # t00017 - Test include relations also as members flag ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00017_class: type: class include_relations_also_as_members: false glob: - - ../../tests/t00017/t00017.cc - using_namespace: - - clanguml::t00017 + - t00017.cc + using_namespace: clanguml::t00017 include: namespaces: - clanguml::t00017 @@ -100,9 +97,9 @@ private: "namespace": "clanguml::t00017", "source_location": { "column": 7, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 5, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "template_parameters": [], "type": "class" @@ -122,9 +119,9 @@ private: "namespace": "clanguml::t00017", "source_location": { "column": 7, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 7, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "template_parameters": [], "type": "class" @@ -144,9 +141,9 @@ private: "namespace": "clanguml::t00017", "source_location": { "column": 7, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 9, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "template_parameters": [], "type": "class" @@ -166,9 +163,9 @@ private: "namespace": "clanguml::t00017", "source_location": { "column": 7, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 11, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "template_parameters": [], "type": "class" @@ -188,9 +185,9 @@ private: "namespace": "clanguml::t00017", "source_location": { "column": 7, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 13, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "template_parameters": [], "type": "class" @@ -210,9 +207,9 @@ private: "namespace": "clanguml::t00017", "source_location": { "column": 7, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 15, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "template_parameters": [], "type": "class" @@ -232,9 +229,9 @@ private: "namespace": "clanguml::t00017", "source_location": { "column": 7, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 17, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "template_parameters": [], "type": "class" @@ -254,9 +251,9 @@ private: "namespace": "clanguml::t00017", "source_location": { "column": 7, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 19, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "template_parameters": [], "type": "class" @@ -276,9 +273,9 @@ private: "namespace": "clanguml::t00017", "source_location": { "column": 7, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 21, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "template_parameters": [], "type": "class" @@ -298,9 +295,9 @@ private: "namespace": "clanguml::t00017", "source_location": { "column": 7, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 23, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "template_parameters": [], "type": "class" @@ -320,9 +317,9 @@ private: "namespace": "clanguml::t00017", "source_location": { "column": 7, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 25, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "template_parameters": [], "type": "class" @@ -343,9 +340,9 @@ private: "name": "some_int", "source_location": { "column": 9, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 38, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "type": "int" }, @@ -355,9 +352,9 @@ private: "name": "some_int_pointer", "source_location": { "column": 10, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 39, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "type": "int *" }, @@ -367,9 +364,9 @@ private: "name": "some_int_pointer_pointer", "source_location": { "column": 11, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 40, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "type": "int **" }, @@ -379,9 +376,9 @@ private: "name": "some_int_reference", "source_location": { "column": 10, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 41, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "type": "int &" }, @@ -391,9 +388,9 @@ private: "name": "a", "source_location": { "column": 7, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 42, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "type": "A" }, @@ -403,9 +400,9 @@ private: "name": "b", "source_location": { "column": 8, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 43, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "type": "B *" }, @@ -415,9 +412,9 @@ private: "name": "c", "source_location": { "column": 8, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 44, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "type": "C &" }, @@ -427,9 +424,9 @@ private: "name": "d", "source_location": { "column": 14, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 45, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "type": "const D *" }, @@ -439,9 +436,9 @@ private: "name": "e", "source_location": { "column": 14, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 46, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "type": "const E &" }, @@ -451,9 +448,9 @@ private: "name": "f", "source_location": { "column": 9, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 47, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "type": "F &&" }, @@ -463,9 +460,9 @@ private: "name": "g", "source_location": { "column": 9, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 48, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "type": "G **" }, @@ -475,9 +472,9 @@ private: "name": "h", "source_location": { "column": 10, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 49, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "type": "H ***" }, @@ -487,9 +484,9 @@ private: "name": "i", "source_location": { "column": 9, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 50, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "type": "I *&" }, @@ -499,9 +496,9 @@ private: "name": "j", "source_location": { "column": 17, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 51, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "type": "volatile J *" }, @@ -511,9 +508,9 @@ private: "name": "k", "source_location": { "column": 16, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 52, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "type": "K *" } @@ -559,9 +556,9 @@ private: ], "source_location": { "column": 14, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 28, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "type": "void" } @@ -570,19 +567,14 @@ private: "namespace": "clanguml::t00017", "source_location": { "column": 7, - "file": "../../tests/t00017/t00017.cc", + "file": "t00017.cc", "line": 27, - "translation_unit": "../../tests/t00017/t00017.cc" + "translation_unit": "t00017.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00017_class", "relationships": [ { diff --git a/docs/test_cases/t00017_class.svg b/docs/test_cases/t00017_class.svg index 4b2502d8..0fc8b639 100644 --- a/docs/test_cases/t00017_class.svg +++ b/docs/test_cases/t00017_class.svg @@ -1,6 +1,6 @@ - + @@ -9,135 +9,135 @@ - - + + A - - + + B - - + + C - - + + D - - + + E - - + + F - - + + G - - + + H - - + + I - - + + J - - + + 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 & diff --git a/docs/test_cases/t00017_class_mermaid.svg b/docs/test_cases/t00017_class_mermaid.svg index b1e2981f..44874645 100644 --- a/docs/test_cases/t00017_class_mermaid.svg +++ b/docs/test_cases/t00017_class_mermaid.svg @@ -186,7 +186,7 @@ - + @@ -205,7 +205,7 @@ - + @@ -224,7 +224,7 @@ - + @@ -243,7 +243,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -281,7 +281,7 @@ - + @@ -300,7 +300,7 @@ - + @@ -319,7 +319,7 @@ - + @@ -338,7 +338,7 @@ - + @@ -357,7 +357,7 @@ - + @@ -376,7 +376,7 @@ - + @@ -395,7 +395,7 @@ - + diff --git a/docs/test_cases/t00018.md b/docs/test_cases/t00018.md index 8aef3dad..228c03a7 100644 --- a/docs/test_cases/t00018.md +++ b/docs/test_cases/t00018.md @@ -1,15 +1,12 @@ # t00018 - Pimpl pattern ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00018_class: type: class glob: - - ../../tests/t00018/**.cc - using_namespace: - - clanguml::t00018 + - "*.cc" + using_namespace: clanguml::t00018 include: namespaces: - clanguml::t00018 @@ -158,9 +155,9 @@ void widget::draw(const clanguml::t00018::widget &w) "name": "n", "source_location": { "column": 9, - "file": "../../tests/t00018/t00018_impl.h", + "file": "t00018_impl.h", "line": 10, - "translation_unit": "../../tests/t00018/t00018.cc" + "translation_unit": "t00018.cc" }, "type": "int" } @@ -190,9 +187,9 @@ void widget::draw(const clanguml::t00018::widget &w) ], "source_location": { "column": 10, - "file": "../../tests/t00018/t00018_impl.h", + "file": "t00018_impl.h", "line": 13, - "translation_unit": "../../tests/t00018/t00018.cc" + "translation_unit": "t00018.cc" }, "type": "void" }, @@ -220,9 +217,9 @@ void widget::draw(const clanguml::t00018::widget &w) ], "source_location": { "column": 10, - "file": "../../tests/t00018/t00018_impl.h", + "file": "t00018_impl.h", "line": 14, - "translation_unit": "../../tests/t00018/t00018.cc" + "translation_unit": "t00018.cc" }, "type": "void" }, @@ -250,9 +247,9 @@ void widget::draw(const clanguml::t00018::widget &w) ], "source_location": { "column": 5, - "file": "../../tests/t00018/t00018_impl.h", + "file": "t00018_impl.h", "line": 15, - "translation_unit": "../../tests/t00018/t00018.cc" + "translation_unit": "t00018.cc" }, "type": "void" } @@ -261,9 +258,9 @@ void widget::draw(const clanguml::t00018::widget &w) "namespace": "clanguml::t00018::impl", "source_location": { "column": 7, - "file": "../../tests/t00018/t00018_impl.h", + "file": "t00018_impl.h", "line": 9, - "translation_unit": "../../tests/t00018/t00018.cc" + "translation_unit": "t00018.cc" }, "template_parameters": [], "type": "class" @@ -284,9 +281,9 @@ void widget::draw(const clanguml::t00018::widget &w) "name": "pImpl", "source_location": { "column": 35, - "file": "../../tests/t00018/t00018.h", + "file": "t00018.h", "line": 18, - "translation_unit": "../../tests/t00018/t00018.cc" + "translation_unit": "t00018.cc" }, "type": "std::unique_ptr" } @@ -311,9 +308,9 @@ void widget::draw(const clanguml::t00018::widget &w) "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00018/t00018.h", + "file": "t00018.h", "line": 21, - "translation_unit": "../../tests/t00018/t00018.cc" + "translation_unit": "t00018.cc" }, "type": "void" }, @@ -336,9 +333,9 @@ void widget::draw(const clanguml::t00018::widget &w) "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00018/t00018.h", + "file": "t00018.h", "line": 22, - "translation_unit": "../../tests/t00018/t00018.cc" + "translation_unit": "t00018.cc" }, "type": "void" }, @@ -361,9 +358,9 @@ void widget::draw(const clanguml::t00018::widget &w) "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00018/t00018.h", + "file": "t00018.h", "line": 23, - "translation_unit": "../../tests/t00018/t00018.cc" + "translation_unit": "t00018.cc" }, "type": "bool" }, @@ -391,9 +388,9 @@ void widget::draw(const clanguml::t00018::widget &w) ], "source_location": { "column": 5, - "file": "../../tests/t00018/t00018.h", + "file": "t00018.h", "line": 24, - "translation_unit": "../../tests/t00018/t00018.cc" + "translation_unit": "t00018.cc" }, "type": "void" }, @@ -416,9 +413,9 @@ void widget::draw(const clanguml::t00018::widget &w) "parameters": [], "source_location": { "column": 5, - "file": "../../tests/t00018/t00018.h", + "file": "t00018.h", "line": 25, - "translation_unit": "../../tests/t00018/t00018.cc" + "translation_unit": "t00018.cc" }, "type": "void" }, @@ -446,9 +443,9 @@ void widget::draw(const clanguml::t00018::widget &w) ], "source_location": { "column": 5, - "file": "../../tests/t00018/t00018.h", + "file": "t00018.h", "line": 27, - "translation_unit": "../../tests/t00018/t00018.cc" + "translation_unit": "t00018.cc" }, "type": "void" }, @@ -476,9 +473,9 @@ void widget::draw(const clanguml::t00018::widget &w) ], "source_location": { "column": 5, - "file": "../../tests/t00018/t00018.h", + "file": "t00018.h", "line": 29, - "translation_unit": "../../tests/t00018/t00018.cc" + "translation_unit": "t00018.cc" }, "type": "void" }, @@ -506,9 +503,9 @@ void widget::draw(const clanguml::t00018::widget &w) ], "source_location": { "column": 13, - "file": "../../tests/t00018/t00018.h", + "file": "t00018.h", "line": 30, - "translation_unit": "../../tests/t00018/t00018.cc" + "translation_unit": "t00018.cc" }, "type": "widget &" }, @@ -536,9 +533,9 @@ void widget::draw(const clanguml::t00018::widget &w) ], "source_location": { "column": 13, - "file": "../../tests/t00018/t00018.h", + "file": "t00018.h", "line": 31, - "translation_unit": "../../tests/t00018/t00018.cc" + "translation_unit": "t00018.cc" }, "type": "widget &" } @@ -547,19 +544,14 @@ void widget::draw(const clanguml::t00018::widget &w) "namespace": "clanguml::t00018", "source_location": { "column": 7, - "file": "../../tests/t00018/t00018.h", + "file": "t00018.h", "line": 17, - "translation_unit": "../../tests/t00018/t00018.cc" + "translation_unit": "t00018.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00018_class", "relationships": [ { diff --git a/docs/test_cases/t00018_class.svg b/docs/test_cases/t00018_class.svg index ceb3000e..959ffeb6 100644 --- a/docs/test_cases/t00018_class.svg +++ b/docs/test_cases/t00018_class.svg @@ -1,6 +1,6 @@ - + @@ -9,121 +9,121 @@ - - + + impl::widget - + - + 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> diff --git a/docs/test_cases/t00018_class_mermaid.svg b/docs/test_cases/t00018_class_mermaid.svg index 670935b8..95f112f9 100644 --- a/docs/test_cases/t00018_class_mermaid.svg +++ b/docs/test_cases/t00018_class_mermaid.svg @@ -78,7 +78,7 @@ - + @@ -117,7 +117,7 @@ - + diff --git a/docs/test_cases/t00019.md b/docs/test_cases/t00019.md index fe9a0442..b53c1181 100644 --- a/docs/test_cases/t00019.md +++ b/docs/test_cases/t00019.md @@ -1,16 +1,13 @@ # t00019 - Layercake pattern ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00019_class: type: class glob: - - ../../tests/t00019/**.cc + - "*.cc" generate_template_argument_dependencies: false - using_namespace: - - clanguml::t00019 + using_namespace: clanguml::t00019 include: namespaces: - clanguml::t00019 @@ -190,9 +187,9 @@ class Base { "parameters": [], "source_location": { "column": 5, - "file": "../../tests/t00019/t00019_base.h", + "file": "t00019_base.h", "line": 10, - "translation_unit": "../../tests/t00019/t00019.cc" + "translation_unit": "t00019.cc" }, "type": "void" }, @@ -215,9 +212,9 @@ class Base { "parameters": [], "source_location": { "column": 13, - "file": "../../tests/t00019/t00019_base.h", + "file": "t00019_base.h", "line": 12, - "translation_unit": "../../tests/t00019/t00019.cc" + "translation_unit": "t00019.cc" }, "type": "void" }, @@ -240,9 +237,9 @@ class Base { "parameters": [], "source_location": { "column": 17, - "file": "../../tests/t00019/t00019_base.h", + "file": "t00019_base.h", "line": 14, - "translation_unit": "../../tests/t00019/t00019.cc" + "translation_unit": "t00019.cc" }, "type": "int" }, @@ -265,9 +262,9 @@ class Base { "parameters": [], "source_location": { "column": 25, - "file": "../../tests/t00019/t00019_base.h", + "file": "t00019_base.h", "line": 16, - "translation_unit": "../../tests/t00019/t00019.cc" + "translation_unit": "t00019.cc" }, "type": "std::string" } @@ -276,9 +273,9 @@ class Base { "namespace": "clanguml::t00019", "source_location": { "column": 7, - "file": "../../tests/t00019/t00019_base.h", + "file": "t00019_base.h", "line": 8, - "translation_unit": "../../tests/t00019/t00019.cc" + "translation_unit": "t00019.cc" }, "template_parameters": [], "type": "class" @@ -313,9 +310,9 @@ class Base { "parameters": [], "source_location": { "column": 9, - "file": "../../tests/t00019/t00019_layer1.h", + "file": "t00019_layer1.h", "line": 13, - "translation_unit": "../../tests/t00019/t00019.cc" + "translation_unit": "t00019.cc" }, "type": "int" }, @@ -338,9 +335,9 @@ class Base { "parameters": [], "source_location": { "column": 17, - "file": "../../tests/t00019/t00019_layer1.h", + "file": "t00019_layer1.h", "line": 19, - "translation_unit": "../../tests/t00019/t00019.cc" + "translation_unit": "t00019.cc" }, "type": "std::string" } @@ -349,9 +346,9 @@ class Base { "namespace": "clanguml::t00019", "source_location": { "column": 38, - "file": "../../tests/t00019/t00019_layer1.h", + "file": "t00019_layer1.h", "line": 9, - "translation_unit": "../../tests/t00019/t00019.cc" + "translation_unit": "t00019.cc" }, "template_parameters": [ { @@ -393,9 +390,9 @@ class Base { "parameters": [], "source_location": { "column": 9, - "file": "../../tests/t00019/t00019_layer2.h", + "file": "t00019_layer2.h", "line": 14, - "translation_unit": "../../tests/t00019/t00019.cc" + "translation_unit": "t00019.cc" }, "type": "int" } @@ -404,9 +401,9 @@ class Base { "namespace": "clanguml::t00019", "source_location": { "column": 38, - "file": "../../tests/t00019/t00019_layer2.h", + "file": "t00019_layer2.h", "line": 6, - "translation_unit": "../../tests/t00019/t00019.cc" + "translation_unit": "t00019.cc" }, "template_parameters": [ { @@ -434,9 +431,9 @@ class Base { "name": "m_m1_calls", "source_location": { "column": 9, - "file": "../../tests/t00019/t00019_layer3.h", + "file": "t00019_layer3.h", "line": 29, - "translation_unit": "../../tests/t00019/t00019.cc" + "translation_unit": "t00019.cc" }, "type": "int" }, @@ -446,9 +443,9 @@ class Base { "name": "m_m2_calls", "source_location": { "column": 9, - "file": "../../tests/t00019/t00019_layer3.h", + "file": "t00019_layer3.h", "line": 30, - "translation_unit": "../../tests/t00019/t00019.cc" + "translation_unit": "t00019.cc" }, "type": "int" } @@ -473,9 +470,9 @@ class Base { "parameters": [], "source_location": { "column": 17, - "file": "../../tests/t00019/t00019_layer3.h", + "file": "t00019_layer3.h", "line": 12, - "translation_unit": "../../tests/t00019/t00019.cc" + "translation_unit": "t00019.cc" }, "type": "int" }, @@ -498,9 +495,9 @@ class Base { "parameters": [], "source_location": { "column": 25, - "file": "../../tests/t00019/t00019_layer3.h", + "file": "t00019_layer3.h", "line": 18, - "translation_unit": "../../tests/t00019/t00019.cc" + "translation_unit": "t00019.cc" }, "type": "std::string" }, @@ -523,9 +520,9 @@ class Base { "parameters": [], "source_location": { "column": 9, - "file": "../../tests/t00019/t00019_layer3.h", + "file": "t00019_layer3.h", "line": 24, - "translation_unit": "../../tests/t00019/t00019.cc" + "translation_unit": "t00019.cc" }, "type": "int" }, @@ -548,9 +545,9 @@ class Base { "parameters": [], "source_location": { "column": 9, - "file": "../../tests/t00019/t00019_layer3.h", + "file": "t00019_layer3.h", "line": 26, - "translation_unit": "../../tests/t00019/t00019.cc" + "translation_unit": "t00019.cc" }, "type": "int" } @@ -559,9 +556,9 @@ class Base { "namespace": "clanguml::t00019", "source_location": { "column": 38, - "file": "../../tests/t00019/t00019_layer3.h", + "file": "t00019_layer3.h", "line": 8, - "translation_unit": "../../tests/t00019/t00019.cc" + "translation_unit": "t00019.cc" }, "template_parameters": [ { @@ -595,9 +592,9 @@ class Base { "namespace": "clanguml::t00019", "source_location": { "column": 38, - "file": "../../tests/t00019/t00019_layer2.h", + "file": "t00019_layer2.h", "line": 6, - "translation_unit": "../../tests/t00019/t00019.cc" + "translation_unit": "t00019.cc" }, "template_parameters": [ { @@ -631,9 +628,9 @@ class Base { "namespace": "clanguml::t00019", "source_location": { "column": 38, - "file": "../../tests/t00019/t00019_layer1.h", + "file": "t00019_layer1.h", "line": 9, - "translation_unit": "../../tests/t00019/t00019.cc" + "translation_unit": "t00019.cc" }, "template_parameters": [ { @@ -673,10 +670,10 @@ class Base { "name": "Layer1", "namespace": "clanguml::t00019", "source_location": { - "column": 11, - "file": "../../../../../../usr/include/c++/11/bits/unique_ptr.h", - "line": 242, - "translation_unit": "../../tests/t00019/t00019.cc" + "column": 38, + "file": "t00019_layer1.h", + "line": 9, + "translation_unit": "t00019.cc" }, "template_parameters": [ { @@ -718,9 +715,9 @@ class Base { "name": "layers", "source_location": { "column": 51, - "file": "../../tests/t00019/t00019.cc", + "file": "t00019.cc", "line": 13, - "translation_unit": "../../tests/t00019/t00019.cc" + "translation_unit": "t00019.cc" }, "type": "std::unique_ptr>>>" } @@ -730,19 +727,14 @@ class Base { "namespace": "clanguml::t00019", "source_location": { "column": 7, - "file": "../../tests/t00019/t00019.cc", + "file": "t00019.cc", "line": 11, - "translation_unit": "../../tests/t00019/t00019.cc" + "translation_unit": "t00019.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00019_class", "relationships": [ { diff --git a/docs/test_cases/t00019_class.svg b/docs/test_cases/t00019_class.svg index 35a5b347..955b73c3 100644 --- a/docs/test_cases/t00019_class.svg +++ b/docs/test_cases/t00019_class.svg @@ -1,6 +1,6 @@ - + @@ -9,45 +9,45 @@ - - + + Base - + - + Base() = default : void - + - + ~Base() constexpr = default : void - + - + m1() : int - + - + m2() : std::string - - + + Layer1 @@ -55,23 +55,23 @@ LowerLayer - + - + m1() : int - + - + m2() : std::string - - + + Layer2 @@ -79,16 +79,16 @@ LowerLayer - + - + all_calls_count() const : int - - + + Layer3 @@ -96,51 +96,51 @@ LowerLayer - + - + m1() : int - + - + m1_calls() const : int - + - + m2() : std::string - + - + m2_calls() const : int - + - + m_m1_calls : int - + - + m_m2_calls : int - - + + Layer3 @@ -149,8 +149,8 @@ - - + + Layer2 @@ -159,8 +159,8 @@ - - + + Layer1 @@ -169,19 +169,19 @@ - - + + A - + - + layers : std::unique_ptr<Layer1<Layer2<Layer3<Base>>>> diff --git a/docs/test_cases/t00019_class_mermaid.svg b/docs/test_cases/t00019_class_mermaid.svg index 96ff0984..f37ce78d 100644 --- a/docs/test_cases/t00019_class_mermaid.svg +++ b/docs/test_cases/t00019_class_mermaid.svg @@ -132,7 +132,7 @@ - + @@ -171,7 +171,7 @@ - + @@ -200,7 +200,7 @@ - + @@ -224,7 +224,7 @@ - + @@ -273,7 +273,7 @@ - + @@ -292,7 +292,7 @@ - + @@ -311,7 +311,7 @@ - + @@ -330,7 +330,7 @@ - + diff --git a/docs/test_cases/t00020.md b/docs/test_cases/t00020.md index 720e04f6..fe541264 100644 --- a/docs/test_cases/t00020.md +++ b/docs/test_cases/t00020.md @@ -1,15 +1,12 @@ # t00020 - Abstract factory pattern ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00020_class: type: class glob: - - ../../tests/t00020/t00020.cc - using_namespace: - - clanguml::t00020 + - t00020.cc + using_namespace: clanguml::t00020 include: namespaces: - clanguml::t00020 @@ -135,9 +132,9 @@ public: "parameters": [], "source_location": { "column": 13, - "file": "../../tests/t00020/t00020.cc", + "file": "t00020.cc", "line": 8, - "translation_unit": "../../tests/t00020/t00020.cc" + "translation_unit": "t00020.cc" }, "type": "void" }, @@ -165,9 +162,9 @@ public: ], "source_location": { "column": 18, - "file": "../../tests/t00020/t00020.cc", + "file": "t00020.cc", "line": 9, - "translation_unit": "../../tests/t00020/t00020.cc" + "translation_unit": "t00020.cc" }, "type": "bool" } @@ -176,9 +173,9 @@ public: "namespace": "clanguml::t00020", "source_location": { "column": 7, - "file": "../../tests/t00020/t00020.cc", + "file": "t00020.cc", "line": 6, - "translation_unit": "../../tests/t00020/t00020.cc" + "translation_unit": "t00020.cc" }, "template_parameters": [], "type": "class" @@ -225,9 +222,9 @@ public: ], "source_location": { "column": 10, - "file": "../../tests/t00020/t00020.cc", + "file": "t00020.cc", "line": 14, - "translation_unit": "../../tests/t00020/t00020.cc" + "translation_unit": "t00020.cc" }, "type": "bool" } @@ -236,9 +233,9 @@ public: "namespace": "clanguml::t00020", "source_location": { "column": 7, - "file": "../../tests/t00020/t00020.cc", + "file": "t00020.cc", "line": 12, - "translation_unit": "../../tests/t00020/t00020.cc" + "translation_unit": "t00020.cc" }, "template_parameters": [], "type": "class" @@ -285,9 +282,9 @@ public: ], "source_location": { "column": 10, - "file": "../../tests/t00020/t00020.cc", + "file": "t00020.cc", "line": 19, - "translation_unit": "../../tests/t00020/t00020.cc" + "translation_unit": "t00020.cc" }, "type": "bool" } @@ -296,9 +293,9 @@ public: "namespace": "clanguml::t00020", "source_location": { "column": 7, - "file": "../../tests/t00020/t00020.cc", + "file": "t00020.cc", "line": 17, - "translation_unit": "../../tests/t00020/t00020.cc" + "translation_unit": "t00020.cc" }, "template_parameters": [], "type": "class" @@ -333,9 +330,9 @@ public: "parameters": [], "source_location": { "column": 13, - "file": "../../tests/t00020/t00020.cc", + "file": "t00020.cc", "line": 24, - "translation_unit": "../../tests/t00020/t00020.cc" + "translation_unit": "t00020.cc" }, "type": "void" }, @@ -363,9 +360,9 @@ public: ], "source_location": { "column": 18, - "file": "../../tests/t00020/t00020.cc", + "file": "t00020.cc", "line": 25, - "translation_unit": "../../tests/t00020/t00020.cc" + "translation_unit": "t00020.cc" }, "type": "bool" } @@ -374,9 +371,9 @@ public: "namespace": "clanguml::t00020", "source_location": { "column": 7, - "file": "../../tests/t00020/t00020.cc", + "file": "t00020.cc", "line": 22, - "translation_unit": "../../tests/t00020/t00020.cc" + "translation_unit": "t00020.cc" }, "template_parameters": [], "type": "class" @@ -423,9 +420,9 @@ public: ], "source_location": { "column": 10, - "file": "../../tests/t00020/t00020.cc", + "file": "t00020.cc", "line": 30, - "translation_unit": "../../tests/t00020/t00020.cc" + "translation_unit": "t00020.cc" }, "type": "bool" } @@ -434,9 +431,9 @@ public: "namespace": "clanguml::t00020", "source_location": { "column": 7, - "file": "../../tests/t00020/t00020.cc", + "file": "t00020.cc", "line": 28, - "translation_unit": "../../tests/t00020/t00020.cc" + "translation_unit": "t00020.cc" }, "template_parameters": [], "type": "class" @@ -483,9 +480,9 @@ public: ], "source_location": { "column": 10, - "file": "../../tests/t00020/t00020.cc", + "file": "t00020.cc", "line": 35, - "translation_unit": "../../tests/t00020/t00020.cc" + "translation_unit": "t00020.cc" }, "type": "bool" } @@ -494,9 +491,9 @@ public: "namespace": "clanguml::t00020", "source_location": { "column": 7, - "file": "../../tests/t00020/t00020.cc", + "file": "t00020.cc", "line": 33, - "translation_unit": "../../tests/t00020/t00020.cc" + "translation_unit": "t00020.cc" }, "template_parameters": [], "type": "class" @@ -531,9 +528,9 @@ public: "parameters": [], "source_location": { "column": 39, - "file": "../../tests/t00020/t00020.cc", + "file": "t00020.cc", "line": 40, - "translation_unit": "../../tests/t00020/t00020.cc" + "translation_unit": "t00020.cc" }, "type": "std::unique_ptr" }, @@ -556,9 +553,9 @@ public: "parameters": [], "source_location": { "column": 39, - "file": "../../tests/t00020/t00020.cc", + "file": "t00020.cc", "line": 41, - "translation_unit": "../../tests/t00020/t00020.cc" + "translation_unit": "t00020.cc" }, "type": "std::unique_ptr" } @@ -567,9 +564,9 @@ public: "namespace": "clanguml::t00020", "source_location": { "column": 7, - "file": "../../tests/t00020/t00020.cc", + "file": "t00020.cc", "line": 38, - "translation_unit": "../../tests/t00020/t00020.cc" + "translation_unit": "t00020.cc" }, "template_parameters": [], "type": "class" @@ -611,9 +608,9 @@ public: "parameters": [], "source_location": { "column": 31, - "file": "../../tests/t00020/t00020.cc", + "file": "t00020.cc", "line": 46, - "translation_unit": "../../tests/t00020/t00020.cc" + "translation_unit": "t00020.cc" }, "type": "std::unique_ptr" }, @@ -636,9 +633,9 @@ public: "parameters": [], "source_location": { "column": 31, - "file": "../../tests/t00020/t00020.cc", + "file": "t00020.cc", "line": 51, - "translation_unit": "../../tests/t00020/t00020.cc" + "translation_unit": "t00020.cc" }, "type": "std::unique_ptr" } @@ -647,9 +644,9 @@ public: "namespace": "clanguml::t00020", "source_location": { "column": 7, - "file": "../../tests/t00020/t00020.cc", + "file": "t00020.cc", "line": 44, - "translation_unit": "../../tests/t00020/t00020.cc" + "translation_unit": "t00020.cc" }, "template_parameters": [], "type": "class" @@ -691,9 +688,9 @@ public: "parameters": [], "source_location": { "column": 31, - "file": "../../tests/t00020/t00020.cc", + "file": "t00020.cc", "line": 59, - "translation_unit": "../../tests/t00020/t00020.cc" + "translation_unit": "t00020.cc" }, "type": "std::unique_ptr" }, @@ -716,9 +713,9 @@ public: "parameters": [], "source_location": { "column": 31, - "file": "../../tests/t00020/t00020.cc", + "file": "t00020.cc", "line": 64, - "translation_unit": "../../tests/t00020/t00020.cc" + "translation_unit": "t00020.cc" }, "type": "std::unique_ptr" } @@ -727,19 +724,14 @@ public: "namespace": "clanguml::t00020", "source_location": { "column": 7, - "file": "../../tests/t00020/t00020.cc", + "file": "t00020.cc", "line": 57, - "translation_unit": "../../tests/t00020/t00020.cc" + "translation_unit": "t00020.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00020_class", "relationships": [ { diff --git a/docs/test_cases/t00020_class.svg b/docs/test_cases/t00020_class.svg index e74b2d28..50598c03 100644 --- a/docs/test_cases/t00020_class.svg +++ b/docs/test_cases/t00020_class.svg @@ -1,6 +1,6 @@ - + @@ -9,175 +9,175 @@ - - + + ProductA - + - + ~ProductA() constexpr = default : void - + - + sell(int price) const = 0 : bool - - + + ProductA1 - + - + sell(int price) const : bool - - + + 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 498bc98d..d59bcee4 100644 --- a/docs/test_cases/t00020_class_mermaid.svg +++ b/docs/test_cases/t00020_class_mermaid.svg @@ -186,7 +186,7 @@ - + @@ -215,7 +215,7 @@ - + @@ -239,7 +239,7 @@ - + @@ -263,7 +263,7 @@ - + @@ -292,7 +292,7 @@ - + @@ -316,7 +316,7 @@ - + @@ -340,7 +340,7 @@ - + @@ -369,7 +369,7 @@ - + @@ -398,7 +398,7 @@ - + diff --git a/docs/test_cases/t00021.md b/docs/test_cases/t00021.md index 707ea234..07b7c92a 100644 --- a/docs/test_cases/t00021.md +++ b/docs/test_cases/t00021.md @@ -1,15 +1,12 @@ # t00021 - Visitor pattern ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00021_class: type: class glob: - - ../../tests/t00021/t00021.cc - using_namespace: - - clanguml::t00021 + - t00021.cc + using_namespace: clanguml::t00021 include: namespaces: - clanguml::t00021 @@ -109,9 +106,9 @@ public: "parameters": [], "source_location": { "column": 13, - "file": "../../tests/t00021/t00021.cc", + "file": "t00021.cc", "line": 11, - "translation_unit": "../../tests/t00021/t00021.cc" + "translation_unit": "t00021.cc" }, "type": "void" }, @@ -139,9 +136,9 @@ public: ], "source_location": { "column": 18, - "file": "../../tests/t00021/t00021.cc", + "file": "t00021.cc", "line": 12, - "translation_unit": "../../tests/t00021/t00021.cc" + "translation_unit": "t00021.cc" }, "type": "void" }, @@ -169,9 +166,9 @@ public: ], "source_location": { "column": 18, - "file": "../../tests/t00021/t00021.cc", + "file": "t00021.cc", "line": 13, - "translation_unit": "../../tests/t00021/t00021.cc" + "translation_unit": "t00021.cc" }, "type": "void" } @@ -180,9 +177,9 @@ public: "namespace": "clanguml::t00021", "source_location": { "column": 7, - "file": "../../tests/t00021/t00021.cc", + "file": "t00021.cc", "line": 9, - "translation_unit": "../../tests/t00021/t00021.cc" + "translation_unit": "t00021.cc" }, "template_parameters": [], "type": "class" @@ -229,9 +226,9 @@ public: ], "source_location": { "column": 10, - "file": "../../tests/t00021/t00021.cc", + "file": "t00021.cc", "line": 18, - "translation_unit": "../../tests/t00021/t00021.cc" + "translation_unit": "t00021.cc" }, "type": "void" }, @@ -259,9 +256,9 @@ public: ], "source_location": { "column": 10, - "file": "../../tests/t00021/t00021.cc", + "file": "t00021.cc", "line": 19, - "translation_unit": "../../tests/t00021/t00021.cc" + "translation_unit": "t00021.cc" }, "type": "void" } @@ -270,9 +267,9 @@ public: "namespace": "clanguml::t00021", "source_location": { "column": 7, - "file": "../../tests/t00021/t00021.cc", + "file": "t00021.cc", "line": 16, - "translation_unit": "../../tests/t00021/t00021.cc" + "translation_unit": "t00021.cc" }, "template_parameters": [], "type": "class" @@ -319,9 +316,9 @@ public: ], "source_location": { "column": 10, - "file": "../../tests/t00021/t00021.cc", + "file": "t00021.cc", "line": 24, - "translation_unit": "../../tests/t00021/t00021.cc" + "translation_unit": "t00021.cc" }, "type": "void" }, @@ -349,9 +346,9 @@ public: ], "source_location": { "column": 10, - "file": "../../tests/t00021/t00021.cc", + "file": "t00021.cc", "line": 25, - "translation_unit": "../../tests/t00021/t00021.cc" + "translation_unit": "t00021.cc" }, "type": "void" } @@ -360,9 +357,9 @@ public: "namespace": "clanguml::t00021", "source_location": { "column": 7, - "file": "../../tests/t00021/t00021.cc", + "file": "t00021.cc", "line": 22, - "translation_unit": "../../tests/t00021/t00021.cc" + "translation_unit": "t00021.cc" }, "template_parameters": [], "type": "class" @@ -409,9 +406,9 @@ public: ], "source_location": { "column": 10, - "file": "../../tests/t00021/t00021.cc", + "file": "t00021.cc", "line": 30, - "translation_unit": "../../tests/t00021/t00021.cc" + "translation_unit": "t00021.cc" }, "type": "void" }, @@ -439,9 +436,9 @@ public: ], "source_location": { "column": 10, - "file": "../../tests/t00021/t00021.cc", + "file": "t00021.cc", "line": 31, - "translation_unit": "../../tests/t00021/t00021.cc" + "translation_unit": "t00021.cc" }, "type": "void" } @@ -450,9 +447,9 @@ public: "namespace": "clanguml::t00021", "source_location": { "column": 7, - "file": "../../tests/t00021/t00021.cc", + "file": "t00021.cc", "line": 28, - "translation_unit": "../../tests/t00021/t00021.cc" + "translation_unit": "t00021.cc" }, "template_parameters": [], "type": "class" @@ -487,9 +484,9 @@ public: "parameters": [], "source_location": { "column": 13, - "file": "../../tests/t00021/t00021.cc", + "file": "t00021.cc", "line": 36, - "translation_unit": "../../tests/t00021/t00021.cc" + "translation_unit": "t00021.cc" }, "type": "void" }, @@ -517,9 +514,9 @@ public: ], "source_location": { "column": 18, - "file": "../../tests/t00021/t00021.cc", + "file": "t00021.cc", "line": 37, - "translation_unit": "../../tests/t00021/t00021.cc" + "translation_unit": "t00021.cc" }, "type": "void" } @@ -528,9 +525,9 @@ public: "namespace": "clanguml::t00021", "source_location": { "column": 7, - "file": "../../tests/t00021/t00021.cc", + "file": "t00021.cc", "line": 34, - "translation_unit": "../../tests/t00021/t00021.cc" + "translation_unit": "t00021.cc" }, "template_parameters": [], "type": "class" @@ -577,9 +574,9 @@ public: ], "source_location": { "column": 10, - "file": "../../tests/t00021/t00021.cc", + "file": "t00021.cc", "line": 42, - "translation_unit": "../../tests/t00021/t00021.cc" + "translation_unit": "t00021.cc" }, "type": "void" } @@ -588,9 +585,9 @@ public: "namespace": "clanguml::t00021", "source_location": { "column": 7, - "file": "../../tests/t00021/t00021.cc", + "file": "t00021.cc", "line": 40, - "translation_unit": "../../tests/t00021/t00021.cc" + "translation_unit": "t00021.cc" }, "template_parameters": [], "type": "class" @@ -637,9 +634,9 @@ public: ], "source_location": { "column": 10, - "file": "../../tests/t00021/t00021.cc", + "file": "t00021.cc", "line": 47, - "translation_unit": "../../tests/t00021/t00021.cc" + "translation_unit": "t00021.cc" }, "type": "void" } @@ -648,19 +645,14 @@ public: "namespace": "clanguml::t00021", "source_location": { "column": 7, - "file": "../../tests/t00021/t00021.cc", + "file": "t00021.cc", "line": 45, - "translation_unit": "../../tests/t00021/t00021.cc" + "translation_unit": "t00021.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00021_class", "relationships": [ { diff --git a/docs/test_cases/t00021_class.svg b/docs/test_cases/t00021_class.svg index 46600066..16289def 100644 --- a/docs/test_cases/t00021_class.svg +++ b/docs/test_cases/t00021_class.svg @@ -1,6 +1,6 @@ - + @@ -9,152 +9,152 @@ - - + + Visitor - + - + ~Visitor() constexpr = default : void - + - + visit_A(const A & item) const = 0 : 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 df32dbf4..a1f3a1f5 100644 --- a/docs/test_cases/t00021_class_mermaid.svg +++ b/docs/test_cases/t00021_class_mermaid.svg @@ -236,7 +236,7 @@ - + @@ -270,7 +270,7 @@ - + @@ -299,7 +299,7 @@ - + @@ -328,7 +328,7 @@ - + @@ -357,7 +357,7 @@ - + @@ -386,7 +386,7 @@ - + @@ -410,7 +410,7 @@ - + diff --git a/docs/test_cases/t00022.md b/docs/test_cases/t00022.md index 998dc1f4..e452784b 100644 --- a/docs/test_cases/t00022.md +++ b/docs/test_cases/t00022.md @@ -1,15 +1,12 @@ # t00022 - Template method pattern ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00022_class: type: class glob: - - ../../tests/t00022/t00022.cc - using_namespace: - - clanguml::t00022 + - t00022.cc + using_namespace: clanguml::t00022 include: namespaces: - clanguml::t00022 @@ -90,9 +87,9 @@ protected: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00022/t00022.cc", + "file": "t00022.cc", "line": 8, - "translation_unit": "../../tests/t00022/t00022.cc" + "translation_unit": "t00022.cc" }, "type": "void" }, @@ -115,9 +112,9 @@ protected: "parameters": [], "source_location": { "column": 18, - "file": "../../tests/t00022/t00022.cc", + "file": "t00022.cc", "line": 15, - "translation_unit": "../../tests/t00022/t00022.cc" + "translation_unit": "t00022.cc" }, "type": "void" }, @@ -140,9 +137,9 @@ protected: "parameters": [], "source_location": { "column": 18, - "file": "../../tests/t00022/t00022.cc", + "file": "t00022.cc", "line": 16, - "translation_unit": "../../tests/t00022/t00022.cc" + "translation_unit": "t00022.cc" }, "type": "void" } @@ -151,9 +148,9 @@ protected: "namespace": "clanguml::t00022", "source_location": { "column": 7, - "file": "../../tests/t00022/t00022.cc", + "file": "t00022.cc", "line": 6, - "translation_unit": "../../tests/t00022/t00022.cc" + "translation_unit": "t00022.cc" }, "template_parameters": [], "type": "class" @@ -195,9 +192,9 @@ protected: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00022/t00022.cc", + "file": "t00022.cc", "line": 21, - "translation_unit": "../../tests/t00022/t00022.cc" + "translation_unit": "t00022.cc" }, "type": "void" }, @@ -220,9 +217,9 @@ protected: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00022/t00022.cc", + "file": "t00022.cc", "line": 22, - "translation_unit": "../../tests/t00022/t00022.cc" + "translation_unit": "t00022.cc" }, "type": "void" } @@ -231,9 +228,9 @@ protected: "namespace": "clanguml::t00022", "source_location": { "column": 7, - "file": "../../tests/t00022/t00022.cc", + "file": "t00022.cc", "line": 19, - "translation_unit": "../../tests/t00022/t00022.cc" + "translation_unit": "t00022.cc" }, "template_parameters": [], "type": "class" @@ -275,9 +272,9 @@ protected: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00022/t00022.cc", + "file": "t00022.cc", "line": 27, - "translation_unit": "../../tests/t00022/t00022.cc" + "translation_unit": "t00022.cc" }, "type": "void" }, @@ -300,9 +297,9 @@ protected: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00022/t00022.cc", + "file": "t00022.cc", "line": 28, - "translation_unit": "../../tests/t00022/t00022.cc" + "translation_unit": "t00022.cc" }, "type": "void" } @@ -311,19 +308,14 @@ protected: "namespace": "clanguml::t00022", "source_location": { "column": 7, - "file": "../../tests/t00022/t00022.cc", + "file": "t00022.cc", "line": 25, - "translation_unit": "../../tests/t00022/t00022.cc" + "translation_unit": "t00022.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00022_class", "relationships": [ { diff --git a/docs/test_cases/t00022_class.svg b/docs/test_cases/t00022_class.svg index 63413c3c..79699606 100644 --- a/docs/test_cases/t00022_class.svg +++ b/docs/test_cases/t00022_class.svg @@ -1,6 +1,6 @@ - + @@ -9,76 +9,76 @@ - - + + A - + - + 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 aa9ecefb..5b093bc3 100644 --- a/docs/test_cases/t00022_class_mermaid.svg +++ b/docs/test_cases/t00022_class_mermaid.svg @@ -74,7 +74,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -137,7 +137,7 @@ - + diff --git a/docs/test_cases/t00023.md b/docs/test_cases/t00023.md index 899b18d1..d828ee4c 100644 --- a/docs/test_cases/t00023.md +++ b/docs/test_cases/t00023.md @@ -1,15 +1,12 @@ # t00023 - Strategy pattern ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00023_class: type: class glob: - - ../../tests/t00023/t00023.cc - using_namespace: - - clanguml::t00023 + - t00023.cc + using_namespace: clanguml::t00023 include: namespaces: - clanguml::t00023 @@ -99,9 +96,9 @@ private: "parameters": [], "source_location": { "column": 13, - "file": "../../tests/t00023/t00023.cc", + "file": "t00023.cc", "line": 8, - "translation_unit": "../../tests/t00023/t00023.cc" + "translation_unit": "t00023.cc" }, "type": "void" }, @@ -124,9 +121,9 @@ private: "parameters": [], "source_location": { "column": 18, - "file": "../../tests/t00023/t00023.cc", + "file": "t00023.cc", "line": 9, - "translation_unit": "../../tests/t00023/t00023.cc" + "translation_unit": "t00023.cc" }, "type": "void" } @@ -135,9 +132,9 @@ private: "namespace": "clanguml::t00023", "source_location": { "column": 7, - "file": "../../tests/t00023/t00023.cc", + "file": "t00023.cc", "line": 6, - "translation_unit": "../../tests/t00023/t00023.cc" + "translation_unit": "t00023.cc" }, "template_parameters": [], "type": "class" @@ -179,9 +176,9 @@ private: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00023/t00023.cc", + "file": "t00023.cc", "line": 14, - "translation_unit": "../../tests/t00023/t00023.cc" + "translation_unit": "t00023.cc" }, "type": "void" } @@ -190,9 +187,9 @@ private: "namespace": "clanguml::t00023", "source_location": { "column": 7, - "file": "../../tests/t00023/t00023.cc", + "file": "t00023.cc", "line": 12, - "translation_unit": "../../tests/t00023/t00023.cc" + "translation_unit": "t00023.cc" }, "template_parameters": [], "type": "class" @@ -234,9 +231,9 @@ private: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00023/t00023.cc", + "file": "t00023.cc", "line": 19, - "translation_unit": "../../tests/t00023/t00023.cc" + "translation_unit": "t00023.cc" }, "type": "void" } @@ -245,9 +242,9 @@ private: "namespace": "clanguml::t00023", "source_location": { "column": 7, - "file": "../../tests/t00023/t00023.cc", + "file": "t00023.cc", "line": 17, - "translation_unit": "../../tests/t00023/t00023.cc" + "translation_unit": "t00023.cc" }, "template_parameters": [], "type": "class" @@ -289,9 +286,9 @@ private: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00023/t00023.cc", + "file": "t00023.cc", "line": 24, - "translation_unit": "../../tests/t00023/t00023.cc" + "translation_unit": "t00023.cc" }, "type": "void" } @@ -300,9 +297,9 @@ private: "namespace": "clanguml::t00023", "source_location": { "column": 7, - "file": "../../tests/t00023/t00023.cc", + "file": "t00023.cc", "line": 22, - "translation_unit": "../../tests/t00023/t00023.cc" + "translation_unit": "t00023.cc" }, "template_parameters": [], "type": "class" @@ -323,9 +320,9 @@ private: "name": "m_strategy", "source_location": { "column": 31, - "file": "../../tests/t00023/t00023.cc", + "file": "t00023.cc", "line": 37, - "translation_unit": "../../tests/t00023/t00023.cc" + "translation_unit": "t00023.cc" }, "type": "std::unique_ptr" } @@ -355,9 +352,9 @@ private: ], "source_location": { "column": 5, - "file": "../../tests/t00023/t00023.cc", + "file": "t00023.cc", "line": 29, - "translation_unit": "../../tests/t00023/t00023.cc" + "translation_unit": "t00023.cc" }, "type": "void" }, @@ -380,9 +377,9 @@ private: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00023/t00023.cc", + "file": "t00023.cc", "line": 34, - "translation_unit": "../../tests/t00023/t00023.cc" + "translation_unit": "t00023.cc" }, "type": "void" } @@ -391,19 +388,14 @@ private: "namespace": "clanguml::t00023", "source_location": { "column": 7, - "file": "../../tests/t00023/t00023.cc", + "file": "t00023.cc", "line": 27, - "translation_unit": "../../tests/t00023/t00023.cc" + "translation_unit": "t00023.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00023_class", "relationships": [ { diff --git a/docs/test_cases/t00023_class.svg b/docs/test_cases/t00023_class.svg index 7e72e5b0..817fb96f 100644 --- a/docs/test_cases/t00023_class.svg +++ b/docs/test_cases/t00023_class.svg @@ -1,6 +1,6 @@ - + @@ -9,102 +9,102 @@ - - + + Strategy - + - + ~Strategy() constexpr = default : void - + - + algorithm() = 0 : void - - + + 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> diff --git a/docs/test_cases/t00023_class_mermaid.svg b/docs/test_cases/t00023_class_mermaid.svg index c492debf..ca39d939 100644 --- a/docs/test_cases/t00023_class_mermaid.svg +++ b/docs/test_cases/t00023_class_mermaid.svg @@ -96,7 +96,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -149,7 +149,7 @@ - + @@ -173,7 +173,7 @@ - + @@ -197,7 +197,7 @@ - + diff --git a/docs/test_cases/t00024.md b/docs/test_cases/t00024.md index d80b6251..ab0e7efc 100644 --- a/docs/test_cases/t00024.md +++ b/docs/test_cases/t00024.md @@ -1,15 +1,12 @@ # t00024 - Proxy pattern ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00024_class: type: class glob: - - ../../tests/t00024/t00024.cc - using_namespace: - - clanguml::t00024 + - t00024.cc + using_namespace: clanguml::t00024 include: namespaces: - clanguml::t00024 @@ -98,9 +95,9 @@ private: "parameters": [], "source_location": { "column": 13, - "file": "../../tests/t00024/t00024.cc", + "file": "t00024.cc", "line": 8, - "translation_unit": "../../tests/t00024/t00024.cc" + "translation_unit": "t00024.cc" }, "type": "void" }, @@ -123,9 +120,9 @@ private: "parameters": [], "source_location": { "column": 18, - "file": "../../tests/t00024/t00024.cc", + "file": "t00024.cc", "line": 10, - "translation_unit": "../../tests/t00024/t00024.cc" + "translation_unit": "t00024.cc" }, "type": "void" }, @@ -148,9 +145,9 @@ private: "parameters": [], "source_location": { "column": 18, - "file": "../../tests/t00024/t00024.cc", + "file": "t00024.cc", "line": 11, - "translation_unit": "../../tests/t00024/t00024.cc" + "translation_unit": "t00024.cc" }, "type": "void" } @@ -159,9 +156,9 @@ private: "namespace": "clanguml::t00024", "source_location": { "column": 7, - "file": "../../tests/t00024/t00024.cc", + "file": "t00024.cc", "line": 6, - "translation_unit": "../../tests/t00024/t00024.cc" + "translation_unit": "t00024.cc" }, "template_parameters": [], "type": "class" @@ -203,9 +200,9 @@ private: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00024/t00024.cc", + "file": "t00024.cc", "line": 16, - "translation_unit": "../../tests/t00024/t00024.cc" + "translation_unit": "t00024.cc" }, "type": "void" }, @@ -228,9 +225,9 @@ private: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00024/t00024.cc", + "file": "t00024.cc", "line": 17, - "translation_unit": "../../tests/t00024/t00024.cc" + "translation_unit": "t00024.cc" }, "type": "void" } @@ -239,9 +236,9 @@ private: "namespace": "clanguml::t00024", "source_location": { "column": 7, - "file": "../../tests/t00024/t00024.cc", + "file": "t00024.cc", "line": 14, - "translation_unit": "../../tests/t00024/t00024.cc" + "translation_unit": "t00024.cc" }, "template_parameters": [], "type": "class" @@ -283,9 +280,9 @@ private: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00024/t00024.cc", + "file": "t00024.cc", "line": 22, - "translation_unit": "../../tests/t00024/t00024.cc" + "translation_unit": "t00024.cc" }, "type": "void" }, @@ -308,9 +305,9 @@ private: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00024/t00024.cc", + "file": "t00024.cc", "line": 23, - "translation_unit": "../../tests/t00024/t00024.cc" + "translation_unit": "t00024.cc" }, "type": "void" } @@ -319,9 +316,9 @@ private: "namespace": "clanguml::t00024", "source_location": { "column": 7, - "file": "../../tests/t00024/t00024.cc", + "file": "t00024.cc", "line": 20, - "translation_unit": "../../tests/t00024/t00024.cc" + "translation_unit": "t00024.cc" }, "template_parameters": [], "type": "class" @@ -349,9 +346,9 @@ private: "name": "m_target", "source_location": { "column": 29, - "file": "../../tests/t00024/t00024.cc", + "file": "t00024.cc", "line": 36, - "translation_unit": "../../tests/t00024/t00024.cc" + "translation_unit": "t00024.cc" }, "type": "std::shared_ptr" } @@ -381,9 +378,9 @@ private: ], "source_location": { "column": 5, - "file": "../../tests/t00024/t00024.cc", + "file": "t00024.cc", "line": 28, - "translation_unit": "../../tests/t00024/t00024.cc" + "translation_unit": "t00024.cc" }, "type": "void" }, @@ -406,9 +403,9 @@ private: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00024/t00024.cc", + "file": "t00024.cc", "line": 32, - "translation_unit": "../../tests/t00024/t00024.cc" + "translation_unit": "t00024.cc" }, "type": "void" }, @@ -431,9 +428,9 @@ private: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00024/t00024.cc", + "file": "t00024.cc", "line": 33, - "translation_unit": "../../tests/t00024/t00024.cc" + "translation_unit": "t00024.cc" }, "type": "void" } @@ -442,19 +439,14 @@ private: "namespace": "clanguml::t00024", "source_location": { "column": 7, - "file": "../../tests/t00024/t00024.cc", + "file": "t00024.cc", "line": 26, - "translation_unit": "../../tests/t00024/t00024.cc" + "translation_unit": "t00024.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00024_class", "relationships": [ { diff --git a/docs/test_cases/t00024_class.svg b/docs/test_cases/t00024_class.svg index 717b60a8..3e845c65 100644 --- a/docs/test_cases/t00024_class.svg +++ b/docs/test_cases/t00024_class.svg @@ -1,6 +1,6 @@ - + @@ -9,115 +9,115 @@ - - + + Target - + - + ~Target() = 0 : void - + - + 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> diff --git a/docs/test_cases/t00024_class_mermaid.svg b/docs/test_cases/t00024_class_mermaid.svg index 936038cf..6ea79620 100644 --- a/docs/test_cases/t00024_class_mermaid.svg +++ b/docs/test_cases/t00024_class_mermaid.svg @@ -96,7 +96,7 @@ - + @@ -130,7 +130,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -188,7 +188,7 @@ - + diff --git a/docs/test_cases/t00025.md b/docs/test_cases/t00025.md index 7f0e2252..c3e29106 100644 --- a/docs/test_cases/t00025.md +++ b/docs/test_cases/t00025.md @@ -1,15 +1,12 @@ # t00025 - Template proxy pattern ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00025_class: type: class glob: - - ../../tests/t00025/t00025.cc - using_namespace: - - clanguml::t00025 + - /t00025.cc + using_namespace: clanguml::t00025 include: namespaces: - clanguml::t00025 @@ -96,9 +93,9 @@ public: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00025/t00025.cc", + "file": "t00025.cc", "line": 8, - "translation_unit": "../../tests/t00025/t00025.cc" + "translation_unit": "t00025.cc" }, "type": "void" }, @@ -121,9 +118,9 @@ public: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00025/t00025.cc", + "file": "t00025.cc", "line": 9, - "translation_unit": "../../tests/t00025/t00025.cc" + "translation_unit": "t00025.cc" }, "type": "void" } @@ -132,9 +129,9 @@ public: "namespace": "clanguml::t00025", "source_location": { "column": 7, - "file": "../../tests/t00025/t00025.cc", + "file": "t00025.cc", "line": 6, - "translation_unit": "../../tests/t00025/t00025.cc" + "translation_unit": "t00025.cc" }, "template_parameters": [], "type": "class" @@ -169,9 +166,9 @@ public: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00025/t00025.cc", + "file": "t00025.cc", "line": 14, - "translation_unit": "../../tests/t00025/t00025.cc" + "translation_unit": "t00025.cc" }, "type": "void" }, @@ -194,9 +191,9 @@ public: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00025/t00025.cc", + "file": "t00025.cc", "line": 15, - "translation_unit": "../../tests/t00025/t00025.cc" + "translation_unit": "t00025.cc" }, "type": "void" } @@ -205,9 +202,9 @@ public: "namespace": "clanguml::t00025", "source_location": { "column": 7, - "file": "../../tests/t00025/t00025.cc", + "file": "t00025.cc", "line": 12, - "translation_unit": "../../tests/t00025/t00025.cc" + "translation_unit": "t00025.cc" }, "template_parameters": [], "type": "class" @@ -228,9 +225,9 @@ public: "name": "m_target", "source_location": { "column": 24, - "file": "../../tests/t00025/t00025.cc", + "file": "t00025.cc", "line": 28, - "translation_unit": "../../tests/t00025/t00025.cc" + "translation_unit": "t00025.cc" }, "type": "std::shared_ptr" } @@ -260,9 +257,9 @@ public: ], "source_location": { "column": 5, - "file": "../../tests/t00025/t00025.cc", + "file": "t00025.cc", "line": 20, - "translation_unit": "../../tests/t00025/t00025.cc" + "translation_unit": "t00025.cc" }, "type": "void" }, @@ -285,9 +282,9 @@ public: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00025/t00025.cc", + "file": "t00025.cc", "line": 24, - "translation_unit": "../../tests/t00025/t00025.cc" + "translation_unit": "t00025.cc" }, "type": "void" }, @@ -310,9 +307,9 @@ public: "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00025/t00025.cc", + "file": "t00025.cc", "line": 25, - "translation_unit": "../../tests/t00025/t00025.cc" + "translation_unit": "t00025.cc" }, "type": "void" } @@ -321,9 +318,9 @@ public: "namespace": "clanguml::t00025", "source_location": { "column": 29, - "file": "../../tests/t00025/t00025.cc", + "file": "t00025.cc", "line": 18, - "translation_unit": "../../tests/t00025/t00025.cc" + "translation_unit": "t00025.cc" }, "template_parameters": [ { @@ -350,9 +347,9 @@ public: "namespace": "clanguml::t00025", "source_location": { "column": 29, - "file": "../../tests/t00025/t00025.cc", + "file": "t00025.cc", "line": 18, - "translation_unit": "../../tests/t00025/t00025.cc" + "translation_unit": "t00025.cc" }, "template_parameters": [ { @@ -379,9 +376,9 @@ public: "namespace": "clanguml::t00025", "source_location": { "column": 29, - "file": "../../tests/t00025/t00025.cc", + "file": "t00025.cc", "line": 18, - "translation_unit": "../../tests/t00025/t00025.cc" + "translation_unit": "t00025.cc" }, "template_parameters": [ { @@ -409,9 +406,9 @@ public: "name": "proxy1", "source_location": { "column": 20, - "file": "../../tests/t00025/t00025.cc", + "file": "t00025.cc", "line": 33, - "translation_unit": "../../tests/t00025/t00025.cc" + "translation_unit": "t00025.cc" }, "type": "Proxy" }, @@ -421,9 +418,9 @@ public: "name": "proxy2", "source_location": { "column": 20, - "file": "../../tests/t00025/t00025.cc", + "file": "t00025.cc", "line": 34, - "translation_unit": "../../tests/t00025/t00025.cc" + "translation_unit": "t00025.cc" }, "type": "Proxy" } @@ -433,19 +430,14 @@ public: "namespace": "clanguml::t00025", "source_location": { "column": 7, - "file": "../../tests/t00025/t00025.cc", + "file": "t00025.cc", "line": 31, - "translation_unit": "../../tests/t00025/t00025.cc" + "translation_unit": "t00025.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00025_class", "relationships": [ { diff --git a/docs/test_cases/t00025_class.svg b/docs/test_cases/t00025_class.svg index e545c398..f5337964 100644 --- a/docs/test_cases/t00025_class.svg +++ b/docs/test_cases/t00025_class.svg @@ -1,6 +1,6 @@ - + @@ -9,52 +9,52 @@ - - + + Target1 - + - + m1() : void - + - + m2() : void - - + + Target2 - + - + m1() : void - + - + m2() : void - - + + Proxy @@ -62,38 +62,38 @@ T - + - + Proxy(std::shared_ptr<T> target) : void - + - + m1() : void - + - + m2() : void - + - + m_target : std::shared_ptr<T> - - + + Proxy @@ -102,8 +102,8 @@ - - + + Proxy @@ -112,26 +112,26 @@ - - + + ProxyHolder - + - + proxy1 : Proxy<Target1> - + - + proxy2 : Proxy<Target2> diff --git a/docs/test_cases/t00025_class_mermaid.svg b/docs/test_cases/t00025_class_mermaid.svg index e7641cec..717dd1da 100644 --- a/docs/test_cases/t00025_class_mermaid.svg +++ b/docs/test_cases/t00025_class_mermaid.svg @@ -126,7 +126,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -184,7 +184,7 @@ - + @@ -223,7 +223,7 @@ - + @@ -242,7 +242,7 @@ - + @@ -261,7 +261,7 @@ - + diff --git a/docs/test_cases/t00026.md b/docs/test_cases/t00026.md index f8813b68..2a62b904 100644 --- a/docs/test_cases/t00026.md +++ b/docs/test_cases/t00026.md @@ -1,15 +1,12 @@ # t00026 - Template memento pattern ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00026_class: type: class glob: - - ../../tests/t00026/t00026.cc - using_namespace: - - clanguml::t00026 + - t00026.cc + using_namespace: clanguml::t00026 include: namespaces: - clanguml::t00026 @@ -103,9 +100,9 @@ struct StringMemento { "name": "m_value", "source_location": { "column": 7, - "file": "../../tests/t00026/t00026.cc", + "file": "t00026.cc", "line": 18, - "translation_unit": "../../tests/t00026/t00026.cc" + "translation_unit": "t00026.cc" }, "type": "T" } @@ -135,9 +132,9 @@ struct StringMemento { ], "source_location": { "column": 5, - "file": "../../tests/t00026/t00026.cc", + "file": "t00026.cc", "line": 10, - "translation_unit": "../../tests/t00026/t00026.cc" + "translation_unit": "t00026.cc" }, "type": "void" }, @@ -160,9 +157,9 @@ struct StringMemento { "parameters": [], "source_location": { "column": 7, - "file": "../../tests/t00026/t00026.cc", + "file": "t00026.cc", "line": 15, - "translation_unit": "../../tests/t00026/t00026.cc" + "translation_unit": "t00026.cc" }, "type": "T" } @@ -171,9 +168,9 @@ struct StringMemento { "namespace": "clanguml::t00026", "source_location": { "column": 29, - "file": "../../tests/t00026/t00026.cc", + "file": "t00026.cc", "line": 8, - "translation_unit": "../../tests/t00026/t00026.cc" + "translation_unit": "t00026.cc" }, "template_parameters": [ { @@ -201,9 +198,9 @@ struct StringMemento { "name": "m_value", "source_location": { "column": 7, - "file": "../../tests/t00026/t00026.cc", + "file": "t00026.cc", "line": 37, - "translation_unit": "../../tests/t00026/t00026.cc" + "translation_unit": "t00026.cc" }, "type": "T" } @@ -233,9 +230,9 @@ struct StringMemento { ], "source_location": { "column": 5, - "file": "../../tests/t00026/t00026.cc", + "file": "t00026.cc", "line": 23, - "translation_unit": "../../tests/t00026/t00026.cc" + "translation_unit": "t00026.cc" }, "type": "void" }, @@ -258,9 +255,9 @@ struct StringMemento { "parameters": [], "source_location": { "column": 16, - "file": "../../tests/t00026/t00026.cc", + "file": "t00026.cc", "line": 28, - "translation_unit": "../../tests/t00026/t00026.cc" + "translation_unit": "t00026.cc" }, "type": "Memento" }, @@ -288,9 +285,9 @@ struct StringMemento { ], "source_location": { "column": 10, - "file": "../../tests/t00026/t00026.cc", + "file": "t00026.cc", "line": 30, - "translation_unit": "../../tests/t00026/t00026.cc" + "translation_unit": "t00026.cc" }, "type": "void" }, @@ -313,9 +310,9 @@ struct StringMemento { "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00026/t00026.cc", + "file": "t00026.cc", "line": 32, - "translation_unit": "../../tests/t00026/t00026.cc" + "translation_unit": "t00026.cc" }, "type": "void" }, @@ -343,9 +340,9 @@ struct StringMemento { ], "source_location": { "column": 10, - "file": "../../tests/t00026/t00026.cc", + "file": "t00026.cc", "line": 34, - "translation_unit": "../../tests/t00026/t00026.cc" + "translation_unit": "t00026.cc" }, "type": "void" } @@ -354,9 +351,9 @@ struct StringMemento { "namespace": "clanguml::t00026", "source_location": { "column": 29, - "file": "../../tests/t00026/t00026.cc", + "file": "t00026.cc", "line": 21, - "translation_unit": "../../tests/t00026/t00026.cc" + "translation_unit": "t00026.cc" }, "template_parameters": [ { @@ -384,9 +381,9 @@ struct StringMemento { "name": "m_mementos", "source_location": { "column": 49, - "file": "../../tests/t00026/t00026.cc", + "file": "t00026.cc", "line": 50, - "translation_unit": "../../tests/t00026/t00026.cc" + "translation_unit": "t00026.cc" }, "type": "std::unordered_map>" } @@ -416,9 +413,9 @@ struct StringMemento { ], "source_location": { "column": 17, - "file": "../../tests/t00026/t00026.cc", + "file": "t00026.cc", "line": 42, - "translation_unit": "../../tests/t00026/t00026.cc" + "translation_unit": "t00026.cc" }, "type": "Memento &" }, @@ -450,9 +447,9 @@ struct StringMemento { ], "source_location": { "column": 10, - "file": "../../tests/t00026/t00026.cc", + "file": "t00026.cc", "line": 44, - "translation_unit": "../../tests/t00026/t00026.cc" + "translation_unit": "t00026.cc" }, "type": "void" } @@ -461,9 +458,9 @@ struct StringMemento { "namespace": "clanguml::t00026", "source_location": { "column": 29, - "file": "../../tests/t00026/t00026.cc", + "file": "t00026.cc", "line": 40, - "translation_unit": "../../tests/t00026/t00026.cc" + "translation_unit": "t00026.cc" }, "template_parameters": [ { @@ -490,9 +487,9 @@ struct StringMemento { "namespace": "clanguml::t00026", "source_location": { "column": 29, - "file": "../../tests/t00026/t00026.cc", + "file": "t00026.cc", "line": 40, - "translation_unit": "../../tests/t00026/t00026.cc" + "translation_unit": "t00026.cc" }, "template_parameters": [ { @@ -519,9 +516,9 @@ struct StringMemento { "namespace": "clanguml::t00026", "source_location": { "column": 29, - "file": "../../tests/t00026/t00026.cc", + "file": "t00026.cc", "line": 21, - "translation_unit": "../../tests/t00026/t00026.cc" + "translation_unit": "t00026.cc" }, "template_parameters": [ { @@ -549,9 +546,9 @@ struct StringMemento { "name": "caretaker", "source_location": { "column": 28, - "file": "../../tests/t00026/t00026.cc", + "file": "t00026.cc", "line": 54, - "translation_unit": "../../tests/t00026/t00026.cc" + "translation_unit": "t00026.cc" }, "type": "Caretaker" }, @@ -561,9 +558,9 @@ struct StringMemento { "name": "originator", "source_location": { "column": 29, - "file": "../../tests/t00026/t00026.cc", + "file": "t00026.cc", "line": 55, - "translation_unit": "../../tests/t00026/t00026.cc" + "translation_unit": "t00026.cc" }, "type": "Originator" } @@ -573,19 +570,14 @@ struct StringMemento { "namespace": "clanguml::t00026", "source_location": { "column": 8, - "file": "../../tests/t00026/t00026.cc", + "file": "t00026.cc", "line": 53, - "translation_unit": "../../tests/t00026/t00026.cc" + "translation_unit": "t00026.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00026_class", "relationships": [ { diff --git a/docs/test_cases/t00026_class.svg b/docs/test_cases/t00026_class.svg index b4e404f5..fb470e9a 100644 --- a/docs/test_cases/t00026_class.svg +++ b/docs/test_cases/t00026_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + Memento @@ -18,31 +18,31 @@ T - + - + Memento(T && v) : void - + - + value() const : T - + - + m_value : T - - + + Originator @@ -50,52 +50,52 @@ 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 @@ -103,30 +103,30 @@ 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 @@ -135,8 +135,8 @@ - - + + Originator @@ -145,26 +145,26 @@ - - + + StringMemento - + - + caretaker : Caretaker<std::string> - + - + originator : Originator<std::string> diff --git a/docs/test_cases/t00026_class_mermaid.svg b/docs/test_cases/t00026_class_mermaid.svg index 456a7cf7..82f3fa7c 100644 --- a/docs/test_cases/t00026_class_mermaid.svg +++ b/docs/test_cases/t00026_class_mermaid.svg @@ -126,7 +126,7 @@ - + @@ -160,7 +160,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -243,7 +243,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -281,7 +281,7 @@ - + diff --git a/docs/test_cases/t00027.md b/docs/test_cases/t00027.md index ff671e38..1483999c 100644 --- a/docs/test_cases/t00027.md +++ b/docs/test_cases/t00027.md @@ -1,15 +1,12 @@ # t00027 - Template decorator pattern ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00027_class: type: class glob: - - ../../tests/t00027/t00027.cc - using_namespace: - - clanguml::t00027 + - t00027.cc + using_namespace: clanguml::t00027 include: namespaces: - clanguml::t00027 @@ -114,9 +111,9 @@ struct Window { "parameters": [], "source_location": { "column": 18, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 10, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "type": "void" }, @@ -139,9 +136,9 @@ struct Window { "parameters": [], "source_location": { "column": 13, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 11, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "type": "void" } @@ -150,9 +147,9 @@ struct Window { "namespace": "clanguml::t00027", "source_location": { "column": 7, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 8, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "template_parameters": [], "type": "class" @@ -172,9 +169,9 @@ struct Window { "namespace": "clanguml::t00027", "source_location": { "column": 40, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 14, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "template_parameters": [], "type": "class" @@ -222,9 +219,9 @@ struct Window { "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 17, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "type": "void" } @@ -233,9 +230,9 @@ struct Window { "namespace": "clanguml::t00027", "source_location": { "column": 7, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 15, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "template_parameters": [ { @@ -262,9 +259,9 @@ struct Window { "namespace": "clanguml::t00027", "source_location": { "column": 40, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 24, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "template_parameters": [], "type": "class" @@ -312,9 +309,9 @@ struct Window { "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 27, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "type": "void" } @@ -323,9 +320,9 @@ struct Window { "namespace": "clanguml::t00027", "source_location": { "column": 7, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 25, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "template_parameters": [ { @@ -367,9 +364,9 @@ struct Window { "parameters": [], "source_location": { "column": 18, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 35, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "type": "void" } @@ -378,9 +375,9 @@ struct Window { "namespace": "clanguml::t00027", "source_location": { "column": 8, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 34, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "template_parameters": [], "type": "class" @@ -422,9 +419,9 @@ struct Window { "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 40, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "type": "void" } @@ -433,9 +430,9 @@ struct Window { "namespace": "clanguml::t00027", "source_location": { "column": 29, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 38, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "template_parameters": [ { @@ -484,9 +481,9 @@ struct Window { "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 45, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "type": "void" } @@ -495,9 +492,9 @@ struct Window { "namespace": "clanguml::t00027", "source_location": { "column": 29, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 43, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "template_parameters": [ { @@ -524,9 +521,9 @@ struct Window { "namespace": "clanguml::t00027", "source_location": { "column": 7, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 15, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "template_parameters": [ { @@ -559,9 +556,9 @@ struct Window { "namespace": "clanguml::t00027", "source_location": { "column": 7, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 15, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "template_parameters": [ { @@ -588,9 +585,9 @@ struct Window { "namespace": "clanguml::t00027", "source_location": { "column": 7, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 25, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "template_parameters": [ { @@ -623,9 +620,9 @@ struct Window { "namespace": "clanguml::t00027", "source_location": { "column": 7, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 25, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "template_parameters": [ { @@ -653,9 +650,9 @@ struct Window { "name": "border", "source_location": { "column": 25, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 49, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "type": "Line" }, @@ -665,9 +662,9 @@ struct Window { "name": "divider", "source_location": { "column": 17, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 50, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "type": "Line" }, @@ -677,9 +674,9 @@ struct Window { "name": "title", "source_location": { "column": 25, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 51, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "type": "Text" }, @@ -689,9 +686,9 @@ struct Window { "name": "description", "source_location": { "column": 17, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 52, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "type": "Text" } @@ -701,19 +698,14 @@ struct Window { "namespace": "clanguml::t00027", "source_location": { "column": 8, - "file": "../../tests/t00027/t00027.cc", + "file": "t00027.cc", "line": 48, - "translation_unit": "../../tests/t00027/t00027.cc" + "translation_unit": "t00027.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00027_class", "relationships": [ { diff --git a/docs/test_cases/t00027_class.svg b/docs/test_cases/t00027_class.svg index d9a0dfbc..eaaa12cf 100644 --- a/docs/test_cases/t00027_class.svg +++ b/docs/test_cases/t00027_class.svg @@ -1,6 +1,6 @@ - + @@ -9,39 +9,39 @@ - - + + Shape - + - + ~Shape() constexpr = default : void - + - + display() = 0 : void - - + + Line - - + + Line @@ -49,24 +49,24 @@ T<>... - + - + display() : void - - + + Text - - + + Text @@ -74,31 +74,31 @@ T<>... - + - + display() : void - - + + ShapeDecorator - + - + display() = 0 : void - - + + Color @@ -106,16 +106,16 @@ T - + - + display() : void - - + + Weight @@ -123,16 +123,16 @@ T - + - + display() : void - - + + Line @@ -141,8 +141,8 @@ - - + + Line @@ -151,8 +151,8 @@ - - + + Text @@ -161,8 +161,8 @@ - - + + Text @@ -171,40 +171,40 @@ - - + + Window - + - + border : Line<Color,Weight> - + - + description : Text<Color> - + - + divider : Line<Color> - + - + title : Text<Color,Weight> diff --git a/docs/test_cases/t00027_class_mermaid.svg b/docs/test_cases/t00027_class_mermaid.svg index a252137c..94537426 100644 --- a/docs/test_cases/t00027_class_mermaid.svg +++ b/docs/test_cases/t00027_class_mermaid.svg @@ -190,7 +190,7 @@ - + @@ -219,7 +219,7 @@ - + @@ -238,7 +238,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -281,7 +281,7 @@ - + @@ -305,7 +305,7 @@ - + @@ -329,7 +329,7 @@ - + @@ -353,7 +353,7 @@ - + @@ -377,7 +377,7 @@ - + @@ -396,7 +396,7 @@ - + @@ -415,7 +415,7 @@ - + @@ -434,7 +434,7 @@ - + @@ -453,7 +453,7 @@ - + diff --git a/docs/test_cases/t00028.md b/docs/test_cases/t00028.md index 630b7cd1..e974c36d 100644 --- a/docs/test_cases/t00028.md +++ b/docs/test_cases/t00028.md @@ -1,15 +1,12 @@ # t00028 - PlantUML note decorator test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00028_class: type: class glob: - - ../../tests/t00028/t00028.cc - using_namespace: - - clanguml::t00028 + - t00028.cc + using_namespace: clanguml::t00028 include: namespaces: - clanguml::t00028 @@ -112,9 +109,9 @@ class R { "namespace": "clanguml::t00028", "source_location": { "column": 7, - "file": "../../tests/t00028/t00028.cc", + "file": "t00028.cc", "line": 8, - "translation_unit": "../../tests/t00028/t00028.cc" + "translation_unit": "t00028.cc" }, "template_parameters": [], "type": "class" @@ -138,9 +135,9 @@ class R { "namespace": "clanguml::t00028", "source_location": { "column": 7, - "file": "../../tests/t00028/t00028.cc", + "file": "t00028.cc", "line": 11, - "translation_unit": "../../tests/t00028/t00028.cc" + "translation_unit": "t00028.cc" }, "template_parameters": [], "type": "class" @@ -164,9 +161,9 @@ class R { "namespace": "clanguml::t00028", "source_location": { "column": 7, - "file": "../../tests/t00028/t00028.cc", + "file": "t00028.cc", "line": 16, - "translation_unit": "../../tests/t00028/t00028.cc" + "translation_unit": "t00028.cc" }, "template_parameters": [], "type": "class" @@ -190,9 +187,9 @@ class R { "namespace": "clanguml::t00028", "source_location": { "column": 7, - "file": "../../tests/t00028/t00028.cc", + "file": "t00028.cc", "line": 22, - "translation_unit": "../../tests/t00028/t00028.cc" + "translation_unit": "t00028.cc" }, "template_parameters": [], "type": "class" @@ -217,9 +214,9 @@ class R { "name": "param", "source_location": { "column": 7, - "file": "../../tests/t00028/t00028.cc", + "file": "t00028.cc", "line": 26, - "translation_unit": "../../tests/t00028/t00028.cc" + "translation_unit": "t00028.cc" }, "type": "T" } @@ -229,9 +226,9 @@ class R { "namespace": "clanguml::t00028", "source_location": { "column": 29, - "file": "../../tests/t00028/t00028.cc", + "file": "t00028.cc", "line": 25, - "translation_unit": "../../tests/t00028/t00028.cc" + "translation_unit": "t00028.cc" }, "template_parameters": [ { @@ -262,9 +259,9 @@ class R { "namespace": "clanguml::t00028", "source_location": { "column": 7, - "file": "../../tests/t00028/t00028.cc", + "file": "t00028.cc", "line": 30, - "translation_unit": "../../tests/t00028/t00028.cc" + "translation_unit": "t00028.cc" }, "template_parameters": [], "type": "class" @@ -286,9 +283,9 @@ class R { "namespace": "clanguml::t00028", "source_location": { "column": 12, - "file": "../../tests/t00028/t00028.cc", + "file": "t00028.cc", "line": 33, - "translation_unit": "../../tests/t00028/t00028.cc" + "translation_unit": "t00028.cc" }, "type": "enum" }, @@ -307,9 +304,9 @@ class R { "namespace": "clanguml::t00028", "source_location": { "column": 29, - "file": "../../tests/t00028/t00028.cc", + "file": "t00028.cc", "line": 25, - "translation_unit": "../../tests/t00028/t00028.cc" + "translation_unit": "t00028.cc" }, "template_parameters": [ { @@ -345,9 +342,9 @@ class R { "name": "aaa", "source_location": { "column": 7, - "file": "../../tests/t00028/t00028.cc", + "file": "t00028.cc", "line": 43, - "translation_unit": "../../tests/t00028/t00028.cc" + "translation_unit": "t00028.cc" }, "type": "A" }, @@ -361,9 +358,9 @@ class R { "name": "bbb", "source_location": { "column": 8, - "file": "../../tests/t00028/t00028.cc", + "file": "t00028.cc", "line": 46, - "translation_unit": "../../tests/t00028/t00028.cc" + "translation_unit": "t00028.cc" }, "type": "B *" }, @@ -373,9 +370,9 @@ class R { "name": "ccc", "source_location": { "column": 8, - "file": "../../tests/t00028/t00028.cc", + "file": "t00028.cc", "line": 48, - "translation_unit": "../../tests/t00028/t00028.cc" + "translation_unit": "t00028.cc" }, "type": "C &" }, @@ -385,9 +382,9 @@ class R { "name": "ddd", "source_location": { "column": 37, - "file": "../../tests/t00028/t00028.cc", + "file": "t00028.cc", "line": 50, - "translation_unit": "../../tests/t00028/t00028.cc" + "translation_unit": "t00028.cc" }, "type": "std::vector>" }, @@ -397,9 +394,9 @@ class R { "name": "eee", "source_location": { "column": 12, - "file": "../../tests/t00028/t00028.cc", + "file": "t00028.cc", "line": 52, - "translation_unit": "../../tests/t00028/t00028.cc" + "translation_unit": "t00028.cc" }, "type": "E" }, @@ -409,9 +406,9 @@ class R { "name": "ggg", "source_location": { "column": 9, - "file": "../../tests/t00028/t00028.cc", + "file": "t00028.cc", "line": 54, - "translation_unit": "../../tests/t00028/t00028.cc" + "translation_unit": "t00028.cc" }, "type": "G **" } @@ -441,9 +438,9 @@ class R { ], "source_location": { "column": 14, - "file": "../../tests/t00028/t00028.cc", + "file": "t00028.cc", "line": 37, - "translation_unit": "../../tests/t00028/t00028.cc" + "translation_unit": "t00028.cc" }, "type": "void" } @@ -452,19 +449,14 @@ class R { "namespace": "clanguml::t00028", "source_location": { "column": 7, - "file": "../../tests/t00028/t00028.cc", + "file": "t00028.cc", "line": 36, - "translation_unit": "../../tests/t00028/t00028.cc" + "translation_unit": "t00028.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00028_class", "relationships": [ { diff --git a/docs/test_cases/t00028_class.svg b/docs/test_cases/t00028_class.svg index 83e98d4d..94d7d781 100644 --- a/docs/test_cases/t00028_class.svg +++ b/docs/test_cases/t00028_class.svg @@ -1,6 +1,6 @@ - + @@ -9,54 +9,54 @@ - - + + A - + A class note. - - + + B - + B class note. - - + + C - + C class note. - - + + D - + D class note. - - + + E @@ -65,26 +65,26 @@ - + - + param : T - + E template class note. - - + + G - - + + F @@ -94,11 +94,11 @@ three - + F enum note. - - + + E @@ -107,70 +107,70 @@ - - + + 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. diff --git a/docs/test_cases/t00028_class_mermaid.svg b/docs/test_cases/t00028_class_mermaid.svg index 5a67dc67..4d38587c 100644 --- a/docs/test_cases/t00028_class_mermaid.svg +++ b/docs/test_cases/t00028_class_mermaid.svg @@ -218,7 +218,7 @@ - + @@ -237,7 +237,7 @@ - + @@ -256,7 +256,7 @@ - + @@ -275,7 +275,7 @@ - + @@ -294,7 +294,7 @@ - + @@ -318,7 +318,7 @@ - + @@ -337,7 +337,7 @@ - + @@ -371,7 +371,7 @@ - + @@ -390,7 +390,7 @@ - + diff --git a/docs/test_cases/t00029.md b/docs/test_cases/t00029.md index 1b08bdf4..298ecac3 100644 --- a/docs/test_cases/t00029.md +++ b/docs/test_cases/t00029.md @@ -1,15 +1,12 @@ # t00029 - PlantUML skip decorator test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00029_class: type: class glob: - - ../../tests/t00029/t00029.cc - using_namespace: - - clanguml::t00029 + - t00029.cc + using_namespace: clanguml::t00029 include: namespaces: - clanguml::t00029 @@ -91,9 +88,9 @@ struct R { "namespace": "clanguml::t00029", "source_location": { "column": 7, - "file": "../../tests/t00029/t00029.cc", + "file": "t00029.cc", "line": 7, - "translation_unit": "../../tests/t00029/t00029.cc" + "translation_unit": "t00029.cc" }, "template_parameters": [], "type": "class" @@ -114,9 +111,9 @@ struct R { "name": "param", "source_location": { "column": 7, - "file": "../../tests/t00029/t00029.cc", + "file": "t00029.cc", "line": 13, - "translation_unit": "../../tests/t00029/t00029.cc" + "translation_unit": "t00029.cc" }, "type": "T" } @@ -126,9 +123,9 @@ struct R { "namespace": "clanguml::t00029", "source_location": { "column": 29, - "file": "../../tests/t00029/t00029.cc", + "file": "t00029.cc", "line": 12, - "translation_unit": "../../tests/t00029/t00029.cc" + "translation_unit": "t00029.cc" }, "template_parameters": [ { @@ -160,9 +157,9 @@ struct R { "name": "param", "source_location": { "column": 7, - "file": "../../tests/t00029/t00029.cc", + "file": "t00029.cc", "line": 18, - "translation_unit": "../../tests/t00029/t00029.cc" + "translation_unit": "t00029.cc" }, "type": "T" } @@ -172,9 +169,9 @@ struct R { "namespace": "clanguml::t00029", "source_location": { "column": 29, - "file": "../../tests/t00029/t00029.cc", + "file": "t00029.cc", "line": 17, - "translation_unit": "../../tests/t00029/t00029.cc" + "translation_unit": "t00029.cc" }, "template_parameters": [], "type": "class" @@ -192,9 +189,9 @@ struct R { "namespace": "clanguml::t00029", "source_location": { "column": 12, - "file": "../../tests/t00029/t00029.cc", + "file": "t00029.cc", "line": 21, - "translation_unit": "../../tests/t00029/t00029.cc" + "translation_unit": "t00029.cc" }, "type": "enum" }, @@ -213,9 +210,9 @@ struct R { "namespace": "clanguml::t00029", "source_location": { "column": 7, - "file": "../../tests/t00029/t00029.cc", + "file": "t00029.cc", "line": 26, - "translation_unit": "../../tests/t00029/t00029.cc" + "translation_unit": "t00029.cc" }, "template_parameters": [], "type": "class" @@ -235,9 +232,9 @@ struct R { "namespace": "clanguml::t00029", "source_location": { "column": 7, - "file": "../../tests/t00029/t00029.cc", + "file": "t00029.cc", "line": 28, - "translation_unit": "../../tests/t00029/t00029.cc" + "translation_unit": "t00029.cc" }, "template_parameters": [], "type": "class" @@ -257,9 +254,9 @@ struct R { "namespace": "clanguml::t00029", "source_location": { "column": 7, - "file": "../../tests/t00029/t00029.cc", + "file": "t00029.cc", "line": 30, - "translation_unit": "../../tests/t00029/t00029.cc" + "translation_unit": "t00029.cc" }, "template_parameters": [], "type": "class" @@ -279,9 +276,9 @@ struct R { "namespace": "clanguml::t00029", "source_location": { "column": 7, - "file": "../../tests/t00029/t00029.cc", + "file": "t00029.cc", "line": 32, - "translation_unit": "../../tests/t00029/t00029.cc" + "translation_unit": "t00029.cc" }, "template_parameters": [], "type": "class" @@ -302,9 +299,9 @@ struct R { "name": "g1", "source_location": { "column": 8, - "file": "../../tests/t00029/t00029.cc", + "file": "t00029.cc", "line": 35, - "translation_unit": "../../tests/t00029/t00029.cc" + "translation_unit": "t00029.cc" }, "type": "G1" }, @@ -318,9 +315,9 @@ struct R { "name": "g3", "source_location": { "column": 9, - "file": "../../tests/t00029/t00029.cc", + "file": "t00029.cc", "line": 41, - "translation_unit": "../../tests/t00029/t00029.cc" + "translation_unit": "t00029.cc" }, "type": "G3 &" }, @@ -330,9 +327,9 @@ struct R { "name": "g4", "source_location": { "column": 25, - "file": "../../tests/t00029/t00029.cc", + "file": "t00029.cc", "line": 43, - "translation_unit": "../../tests/t00029/t00029.cc" + "translation_unit": "t00029.cc" }, "type": "std::shared_ptr" } @@ -342,19 +339,14 @@ struct R { "namespace": "clanguml::t00029", "source_location": { "column": 8, - "file": "../../tests/t00029/t00029.cc", + "file": "t00029.cc", "line": 34, - "translation_unit": "../../tests/t00029/t00029.cc" + "translation_unit": "t00029.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00029_class", "relationships": [ { diff --git a/docs/test_cases/t00029_class.svg b/docs/test_cases/t00029_class.svg index 9648f18d..64b72637 100644 --- a/docs/test_cases/t00029_class.svg +++ b/docs/test_cases/t00029_class.svg @@ -1,6 +1,6 @@ - + @@ -9,16 +9,16 @@ - - + + A - - + + C @@ -27,30 +27,30 @@ - + - + param : T - - + + D - + - + param : T - - + + E @@ -60,65 +60,65 @@ three - - + + G1 - - + + G2 - - + + G3 - - + + G4 - - + + R - + - + g1 : G1 - + - + g3 : G3 & - + - + g4 : std::shared_ptr<G4> diff --git a/docs/test_cases/t00029_class_mermaid.svg b/docs/test_cases/t00029_class_mermaid.svg index 661f5958..a3c04f55 100644 --- a/docs/test_cases/t00029_class_mermaid.svg +++ b/docs/test_cases/t00029_class_mermaid.svg @@ -78,7 +78,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -145,7 +145,7 @@ - + @@ -179,7 +179,7 @@ - + @@ -198,7 +198,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -255,7 +255,7 @@ - + diff --git a/docs/test_cases/t00030.md b/docs/test_cases/t00030.md index 152fb07d..1eead785 100644 --- a/docs/test_cases/t00030.md +++ b/docs/test_cases/t00030.md @@ -1,15 +1,12 @@ # t00030 - PlantUML relationship decorators test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00030_class: type: class glob: - - ../../tests/t00030/t00030.cc - using_namespace: - - clanguml::t00030 + - t00030.cc + using_namespace: clanguml::t00030 include: namespaces: - clanguml::t00030 @@ -79,9 +76,9 @@ struct R { "namespace": "clanguml::t00030", "source_location": { "column": 7, - "file": "../../tests/t00030/t00030.cc", + "file": "t00030.cc", "line": 7, - "translation_unit": "../../tests/t00030/t00030.cc" + "translation_unit": "t00030.cc" }, "template_parameters": [], "type": "class" @@ -101,9 +98,9 @@ struct R { "namespace": "clanguml::t00030", "source_location": { "column": 7, - "file": "../../tests/t00030/t00030.cc", + "file": "t00030.cc", "line": 9, - "translation_unit": "../../tests/t00030/t00030.cc" + "translation_unit": "t00030.cc" }, "template_parameters": [], "type": "class" @@ -123,9 +120,9 @@ struct R { "namespace": "clanguml::t00030", "source_location": { "column": 7, - "file": "../../tests/t00030/t00030.cc", + "file": "t00030.cc", "line": 11, - "translation_unit": "../../tests/t00030/t00030.cc" + "translation_unit": "t00030.cc" }, "template_parameters": [], "type": "class" @@ -145,9 +142,9 @@ struct R { "namespace": "clanguml::t00030", "source_location": { "column": 7, - "file": "../../tests/t00030/t00030.cc", + "file": "t00030.cc", "line": 13, - "translation_unit": "../../tests/t00030/t00030.cc" + "translation_unit": "t00030.cc" }, "template_parameters": [], "type": "class" @@ -167,9 +164,9 @@ struct R { "namespace": "clanguml::t00030", "source_location": { "column": 7, - "file": "../../tests/t00030/t00030.cc", + "file": "t00030.cc", "line": 15, - "translation_unit": "../../tests/t00030/t00030.cc" + "translation_unit": "t00030.cc" }, "template_parameters": [], "type": "class" @@ -194,9 +191,9 @@ struct R { "name": "aaa", "source_location": { "column": 7, - "file": "../../tests/t00030/t00030.cc", + "file": "t00030.cc", "line": 19, - "translation_unit": "../../tests/t00030/t00030.cc" + "translation_unit": "t00030.cc" }, "type": "A" }, @@ -210,9 +207,9 @@ struct R { "name": "bbb", "source_location": { "column": 20, - "file": "../../tests/t00030/t00030.cc", + "file": "t00030.cc", "line": 22, - "translation_unit": "../../tests/t00030/t00030.cc" + "translation_unit": "t00030.cc" }, "type": "std::vector" }, @@ -226,9 +223,9 @@ struct R { "name": "ccc", "source_location": { "column": 20, - "file": "../../tests/t00030/t00030.cc", + "file": "t00030.cc", "line": 25, - "translation_unit": "../../tests/t00030/t00030.cc" + "translation_unit": "t00030.cc" }, "type": "std::vector" }, @@ -242,9 +239,9 @@ struct R { "name": "ddd", "source_location": { "column": 7, - "file": "../../tests/t00030/t00030.cc", + "file": "t00030.cc", "line": 28, - "translation_unit": "../../tests/t00030/t00030.cc" + "translation_unit": "t00030.cc" }, "type": "D" }, @@ -258,9 +255,9 @@ struct R { "name": "eee", "source_location": { "column": 8, - "file": "../../tests/t00030/t00030.cc", + "file": "t00030.cc", "line": 31, - "translation_unit": "../../tests/t00030/t00030.cc" + "translation_unit": "t00030.cc" }, "type": "E *" } @@ -270,19 +267,14 @@ struct R { "namespace": "clanguml::t00030", "source_location": { "column": 8, - "file": "../../tests/t00030/t00030.cc", + "file": "t00030.cc", "line": 17, - "translation_unit": "../../tests/t00030/t00030.cc" + "translation_unit": "t00030.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00030_class", "relationships": [ { diff --git a/docs/test_cases/t00030_class.svg b/docs/test_cases/t00030_class.svg index 2eea75d4..5050658a 100644 --- a/docs/test_cases/t00030_class.svg +++ b/docs/test_cases/t00030_class.svg @@ -1,6 +1,6 @@ - + @@ -9,87 +9,87 @@ - - + + A - - + + B - - + + C - - + + D - - + + E - - + + R - + - + aaa : A - + - + bbb : std::vector<B> - + - + ccc : std::vector<C> - + - + ddd : D - + - + eee : E * diff --git a/docs/test_cases/t00030_class_mermaid.svg b/docs/test_cases/t00030_class_mermaid.svg index b4b1d756..f24d28df 100644 --- a/docs/test_cases/t00030_class_mermaid.svg +++ b/docs/test_cases/t00030_class_mermaid.svg @@ -164,7 +164,7 @@ - + @@ -183,7 +183,7 @@ - + @@ -202,7 +202,7 @@ - + @@ -221,7 +221,7 @@ - + @@ -240,7 +240,7 @@ - + @@ -259,7 +259,7 @@ - + diff --git a/docs/test_cases/t00031.md b/docs/test_cases/t00031.md index 8dbfcb8b..206097d3 100644 --- a/docs/test_cases/t00031.md +++ b/docs/test_cases/t00031.md @@ -1,16 +1,13 @@ # t00031 - PlantUML style decorator test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00031_class: type: class glob: - - ../../tests/t00031/t00031.cc + - t00031.cc skip_redundant_dependencies: false - using_namespace: - - clanguml::t00031 + using_namespace: clanguml::t00031 include: namespaces: - clanguml::t00031 @@ -87,9 +84,9 @@ struct R { "namespace": "clanguml::t00031", "source_location": { "column": 7, - "file": "../../tests/t00031/t00031.cc", + "file": "t00031.cc", "line": 8, - "translation_unit": "../../tests/t00031/t00031.cc" + "translation_unit": "t00031.cc" }, "template_parameters": [], "type": "class" @@ -111,9 +108,9 @@ struct R { "namespace": "clanguml::t00031", "source_location": { "column": 6, - "file": "../../tests/t00031/t00031.cc", + "file": "t00031.cc", "line": 11, - "translation_unit": "../../tests/t00031/t00031.cc" + "translation_unit": "t00031.cc" }, "type": "enum" }, @@ -137,9 +134,9 @@ struct R { "name": "ttt", "source_location": { "column": 7, - "file": "../../tests/t00031/t00031.cc", + "file": "t00031.cc", "line": 15, - "translation_unit": "../../tests/t00031/t00031.cc" + "translation_unit": "t00031.cc" }, "type": "T" } @@ -149,9 +146,9 @@ struct R { "namespace": "clanguml::t00031", "source_location": { "column": 29, - "file": "../../tests/t00031/t00031.cc", + "file": "t00031.cc", "line": 14, - "translation_unit": "../../tests/t00031/t00031.cc" + "translation_unit": "t00031.cc" }, "template_parameters": [ { @@ -178,9 +175,9 @@ struct R { "namespace": "clanguml::t00031", "source_location": { "column": 7, - "file": "../../tests/t00031/t00031.cc", + "file": "t00031.cc", "line": 18, - "translation_unit": "../../tests/t00031/t00031.cc" + "translation_unit": "t00031.cc" }, "template_parameters": [], "type": "class" @@ -200,9 +197,9 @@ struct R { "namespace": "clanguml::t00031", "source_location": { "column": 29, - "file": "../../tests/t00031/t00031.cc", + "file": "t00031.cc", "line": 14, - "translation_unit": "../../tests/t00031/t00031.cc" + "translation_unit": "t00031.cc" }, "template_parameters": [ { @@ -234,9 +231,9 @@ struct R { "name": "aaa", "source_location": { "column": 8, - "file": "../../tests/t00031/t00031.cc", + "file": "t00031.cc", "line": 22, - "translation_unit": "../../tests/t00031/t00031.cc" + "translation_unit": "t00031.cc" }, "type": "A *" }, @@ -250,9 +247,9 @@ struct R { "name": "bbb", "source_location": { "column": 20, - "file": "../../tests/t00031/t00031.cc", + "file": "t00031.cc", "line": 26, - "translation_unit": "../../tests/t00031/t00031.cc" + "translation_unit": "t00031.cc" }, "type": "std::vector" }, @@ -266,9 +263,9 @@ struct R { "name": "ccc", "source_location": { "column": 12, - "file": "../../tests/t00031/t00031.cc", + "file": "t00031.cc", "line": 31, - "translation_unit": "../../tests/t00031/t00031.cc" + "translation_unit": "t00031.cc" }, "type": "C" }, @@ -282,9 +279,9 @@ struct R { "name": "ddd", "source_location": { "column": 8, - "file": "../../tests/t00031/t00031.cc", + "file": "t00031.cc", "line": 34, - "translation_unit": "../../tests/t00031/t00031.cc" + "translation_unit": "t00031.cc" }, "type": "D *" } @@ -314,9 +311,9 @@ struct R { ], "source_location": { "column": 10, - "file": "../../tests/t00031/t00031.cc", + "file": "t00031.cc", "line": 28, - "translation_unit": "../../tests/t00031/t00031.cc" + "translation_unit": "t00031.cc" }, "type": "void" } @@ -325,19 +322,14 @@ struct R { "namespace": "clanguml::t00031", "source_location": { "column": 8, - "file": "../../tests/t00031/t00031.cc", + "file": "t00031.cc", "line": 20, - "translation_unit": "../../tests/t00031/t00031.cc" + "translation_unit": "t00031.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00031_class", "relationships": [ { diff --git a/docs/test_cases/t00031_class.svg b/docs/test_cases/t00031_class.svg index e4853156..46e10b4f 100644 --- a/docs/test_cases/t00031_class.svg +++ b/docs/test_cases/t00031_class.svg @@ -1,33 +1,33 @@ - + - + - + - - - + + + A - - + + B @@ -37,8 +37,8 @@ three - - + + @@ -48,23 +48,23 @@ - + - + ttt : T - - + + D - - + + C @@ -73,47 +73,47 @@ - - + + R - + - + add_b(B b) : void - + - + aaa : A * - + - + bbb : std::vector<B> - + - + ccc : C<int> - + - + ddd : D * diff --git a/docs/test_cases/t00031_class_mermaid.svg b/docs/test_cases/t00031_class_mermaid.svg index f822d4be..32141302 100644 --- a/docs/test_cases/t00031_class_mermaid.svg +++ b/docs/test_cases/t00031_class_mermaid.svg @@ -126,7 +126,7 @@ - + @@ -145,7 +145,7 @@ - + @@ -179,7 +179,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -222,7 +222,7 @@ - + @@ -241,7 +241,7 @@ - + diff --git a/docs/test_cases/t00032.md b/docs/test_cases/t00032.md index dea7dbc5..8cdb6f9a 100644 --- a/docs/test_cases/t00032.md +++ b/docs/test_cases/t00032.md @@ -1,15 +1,12 @@ # t00032 - Class template with template base classes test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00032_class: type: class glob: - - ../../tests/t00032/t00032.cc - using_namespace: - - clanguml::t00032 + - t00032.cc + using_namespace: clanguml::t00032 include: namespaces: - clanguml::t00032 @@ -80,9 +77,9 @@ struct R { "namespace": "clanguml::t00032", "source_location": { "column": 8, - "file": "../../tests/t00032/t00032.cc", + "file": "t00032.cc", "line": 7, - "translation_unit": "../../tests/t00032/t00032.cc" + "translation_unit": "t00032.cc" }, "template_parameters": [], "type": "class" @@ -102,9 +99,9 @@ struct R { "namespace": "clanguml::t00032", "source_location": { "column": 8, - "file": "../../tests/t00032/t00032.cc", + "file": "t00032.cc", "line": 9, - "translation_unit": "../../tests/t00032/t00032.cc" + "translation_unit": "t00032.cc" }, "template_parameters": [], "type": "class" @@ -139,9 +136,9 @@ struct R { "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00032/t00032.cc", + "file": "t00032.cc", "line": 12, - "translation_unit": "../../tests/t00032/t00032.cc" + "translation_unit": "t00032.cc" }, "type": "void" } @@ -150,9 +147,9 @@ struct R { "namespace": "clanguml::t00032", "source_location": { "column": 8, - "file": "../../tests/t00032/t00032.cc", + "file": "t00032.cc", "line": 11, - "translation_unit": "../../tests/t00032/t00032.cc" + "translation_unit": "t00032.cc" }, "template_parameters": [], "type": "class" @@ -187,9 +184,9 @@ struct R { "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00032/t00032.cc", + "file": "t00032.cc", "line": 16, - "translation_unit": "../../tests/t00032/t00032.cc" + "translation_unit": "t00032.cc" }, "type": "void" } @@ -198,9 +195,9 @@ struct R { "namespace": "clanguml::t00032", "source_location": { "column": 8, - "file": "../../tests/t00032/t00032.cc", + "file": "t00032.cc", "line": 15, - "translation_unit": "../../tests/t00032/t00032.cc" + "translation_unit": "t00032.cc" }, "template_parameters": [], "type": "class" @@ -235,9 +232,9 @@ struct R { "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00032/t00032.cc", + "file": "t00032.cc", "line": 20, - "translation_unit": "../../tests/t00032/t00032.cc" + "translation_unit": "t00032.cc" }, "type": "void" } @@ -246,9 +243,9 @@ struct R { "namespace": "clanguml::t00032", "source_location": { "column": 8, - "file": "../../tests/t00032/t00032.cc", + "file": "t00032.cc", "line": 19, - "translation_unit": "../../tests/t00032/t00032.cc" + "translation_unit": "t00032.cc" }, "template_parameters": [], "type": "class" @@ -276,9 +273,9 @@ struct R { "name": "counter", "source_location": { "column": 7, - "file": "../../tests/t00032/t00032.cc", + "file": "t00032.cc", "line": 26, - "translation_unit": "../../tests/t00032/t00032.cc" + "translation_unit": "t00032.cc" }, "type": "L" } @@ -288,9 +285,9 @@ struct R { "namespace": "clanguml::t00032", "source_location": { "column": 8, - "file": "../../tests/t00032/t00032.cc", + "file": "t00032.cc", "line": 24, - "translation_unit": "../../tests/t00032/t00032.cc" + "translation_unit": "t00032.cc" }, "template_parameters": [ { @@ -354,9 +351,9 @@ struct R { "namespace": "clanguml::t00032", "source_location": { "column": 8, - "file": "../../tests/t00032/t00032.cc", + "file": "t00032.cc", "line": 24, - "translation_unit": "../../tests/t00032/t00032.cc" + "translation_unit": "t00032.cc" }, "template_parameters": [ { @@ -408,9 +405,9 @@ struct R { "name": "overload", "source_location": { "column": 35, - "file": "../../tests/t00032/t00032.cc", + "file": "t00032.cc", "line": 32, - "translation_unit": "../../tests/t00032/t00032.cc" + "translation_unit": "t00032.cc" }, "type": "Overload" } @@ -420,19 +417,14 @@ struct R { "namespace": "clanguml::t00032", "source_location": { "column": 8, - "file": "../../tests/t00032/t00032.cc", + "file": "t00032.cc", "line": 31, - "translation_unit": "../../tests/t00032/t00032.cc" + "translation_unit": "t00032.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00032_class", "relationships": [ { diff --git a/docs/test_cases/t00032_class.svg b/docs/test_cases/t00032_class.svg index 09d19950..f8f929f2 100644 --- a/docs/test_cases/t00032_class.svg +++ b/docs/test_cases/t00032_class.svg @@ -1,6 +1,6 @@ - + @@ -9,69 +9,69 @@ - - + + Base - - + + TBase - - + + A - + - + operator()() : void - - + + B - + - + operator()() : void - - + + C - + - + operator()() : void - - + + Overload @@ -80,15 +80,15 @@ - + - + counter : L - - + + Overload @@ -97,19 +97,19 @@ - - + + R - + - + overload : Overload<TBase,int,A,B,C> diff --git a/docs/test_cases/t00032_class_mermaid.svg b/docs/test_cases/t00032_class_mermaid.svg index 7f389b09..9f9ced41 100644 --- a/docs/test_cases/t00032_class_mermaid.svg +++ b/docs/test_cases/t00032_class_mermaid.svg @@ -128,7 +128,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -166,7 +166,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -214,7 +214,7 @@ - + @@ -238,7 +238,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -281,7 +281,7 @@ - + diff --git a/docs/test_cases/t00033.md b/docs/test_cases/t00033.md index d2aefb4d..1f0be1a2 100644 --- a/docs/test_cases/t00033.md +++ b/docs/test_cases/t00033.md @@ -1,15 +1,12 @@ # t00033 - Nested template instantiation dependency test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00033_class: type: class glob: - - ../../tests/t00033/t00033.cc - using_namespace: - - clanguml::t00033 + - t00033.cc + using_namespace: clanguml::t00033 include: namespaces: - clanguml::t00033 @@ -73,9 +70,9 @@ struct R { "name": "aaa", "source_location": { "column": 7, - "file": "../../tests/t00033/t00033.cc", + "file": "t00033.cc", "line": 8, - "translation_unit": "../../tests/t00033/t00033.cc" + "translation_unit": "t00033.cc" }, "type": "T" } @@ -85,9 +82,9 @@ struct R { "namespace": "clanguml::t00033", "source_location": { "column": 30, - "file": "../../tests/t00033/t00033.cc", + "file": "t00033.cc", "line": 7, - "translation_unit": "../../tests/t00033/t00033.cc" + "translation_unit": "t00033.cc" }, "template_parameters": [ { @@ -115,9 +112,9 @@ struct R { "name": "bbb", "source_location": { "column": 7, - "file": "../../tests/t00033/t00033.cc", + "file": "t00033.cc", "line": 12, - "translation_unit": "../../tests/t00033/t00033.cc" + "translation_unit": "t00033.cc" }, "type": "T" } @@ -127,9 +124,9 @@ struct R { "namespace": "clanguml::t00033", "source_location": { "column": 30, - "file": "../../tests/t00033/t00033.cc", + "file": "t00033.cc", "line": 11, - "translation_unit": "../../tests/t00033/t00033.cc" + "translation_unit": "t00033.cc" }, "template_parameters": [ { @@ -157,9 +154,9 @@ struct R { "name": "ccc", "source_location": { "column": 7, - "file": "../../tests/t00033/t00033.cc", + "file": "t00033.cc", "line": 16, - "translation_unit": "../../tests/t00033/t00033.cc" + "translation_unit": "t00033.cc" }, "type": "T" } @@ -169,9 +166,9 @@ struct R { "namespace": "clanguml::t00033", "source_location": { "column": 30, - "file": "../../tests/t00033/t00033.cc", + "file": "t00033.cc", "line": 15, - "translation_unit": "../../tests/t00033/t00033.cc" + "translation_unit": "t00033.cc" }, "template_parameters": [ { @@ -199,9 +196,9 @@ struct R { "name": "ddd", "source_location": { "column": 9, - "file": "../../tests/t00033/t00033.cc", + "file": "t00033.cc", "line": 20, - "translation_unit": "../../tests/t00033/t00033.cc" + "translation_unit": "t00033.cc" }, "type": "int" } @@ -211,9 +208,9 @@ struct R { "namespace": "clanguml::t00033", "source_location": { "column": 8, - "file": "../../tests/t00033/t00033.cc", + "file": "t00033.cc", "line": 19, - "translation_unit": "../../tests/t00033/t00033.cc" + "translation_unit": "t00033.cc" }, "template_parameters": [], "type": "class" @@ -232,10 +229,10 @@ struct R { "name": "C", "namespace": "clanguml::t00033", "source_location": { - "column": 11, - "file": "../../../../../../usr/include/c++/11/bits/unique_ptr.h", - "line": 242, - "translation_unit": "../../tests/t00033/t00033.cc" + "column": 30, + "file": "t00033.cc", + "line": 15, + "translation_unit": "t00033.cc" }, "template_parameters": [ { @@ -262,9 +259,9 @@ struct R { "namespace": "clanguml::t00033", "source_location": { "column": 30, - "file": "../../tests/t00033/t00033.cc", + "file": "t00033.cc", "line": 7, - "translation_unit": "../../tests/t00033/t00033.cc" + "translation_unit": "t00033.cc" }, "template_parameters": [ { @@ -305,9 +302,9 @@ struct R { "namespace": "clanguml::t00033", "source_location": { "column": 30, - "file": "../../tests/t00033/t00033.cc", + "file": "t00033.cc", "line": 7, - "translation_unit": "../../tests/t00033/t00033.cc" + "translation_unit": "t00033.cc" }, "template_parameters": [ { @@ -356,9 +353,9 @@ struct R { "name": "abc", "source_location": { "column": 33, - "file": "../../tests/t00033/t00033.cc", + "file": "t00033.cc", "line": 24, - "translation_unit": "../../tests/t00033/t00033.cc" + "translation_unit": "t00033.cc" }, "type": "A>>>" } @@ -368,19 +365,14 @@ struct R { "namespace": "clanguml::t00033", "source_location": { "column": 8, - "file": "../../tests/t00033/t00033.cc", + "file": "t00033.cc", "line": 23, - "translation_unit": "../../tests/t00033/t00033.cc" + "translation_unit": "t00033.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00033_class", "relationships": [ { diff --git a/docs/test_cases/t00033_class.svg b/docs/test_cases/t00033_class.svg index 84285709..5a79faf3 100644 --- a/docs/test_cases/t00033_class.svg +++ b/docs/test_cases/t00033_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + A @@ -19,15 +19,15 @@ - + - + aaa : T - - + + B @@ -36,15 +36,15 @@ - + - + bbb : T - - + + C @@ -53,30 +53,30 @@ - + - + ccc : T - - + + D - + - + ddd : int - - + + C @@ -85,8 +85,8 @@ - - + + B @@ -95,8 +95,8 @@ - - + + A @@ -105,19 +105,19 @@ - - + + R - + - + abc : A<B<std::unique_ptr<C<D>>>> diff --git a/docs/test_cases/t00033_class_mermaid.svg b/docs/test_cases/t00033_class_mermaid.svg index e7490650..0e8e71b0 100644 --- a/docs/test_cases/t00033_class_mermaid.svg +++ b/docs/test_cases/t00033_class_mermaid.svg @@ -138,7 +138,7 @@ - + @@ -162,7 +162,7 @@ - + @@ -186,7 +186,7 @@ - + @@ -210,7 +210,7 @@ - + @@ -234,7 +234,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -272,7 +272,7 @@ - + @@ -291,7 +291,7 @@ - + diff --git a/docs/test_cases/t00034.md b/docs/test_cases/t00034.md index 1b660bd2..4c37dd94 100644 --- a/docs/test_cases/t00034.md +++ b/docs/test_cases/t00034.md @@ -1,15 +1,12 @@ # t00034 - Template metaprogramming type function test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00034_class: type: class glob: - - ../../tests/t00034/t00034.cc - using_namespace: - - clanguml::t00034 + - t00034.cc + using_namespace: clanguml::t00034 include: namespaces: - clanguml::t00034 @@ -118,9 +115,9 @@ struct R { ], "source_location": { "column": 20, - "file": "../../tests/t00034/t00034.cc", + "file": "t00034.cc", "line": 10, - "translation_unit": "../../tests/t00034/t00034.cc" + "translation_unit": "t00034.cc" }, "type": "bool" }, @@ -148,9 +145,9 @@ struct R { ], "source_location": { "column": 20, - "file": "../../tests/t00034/t00034.cc", + "file": "t00034.cc", "line": 11, - "translation_unit": "../../tests/t00034/t00034.cc" + "translation_unit": "t00034.cc" }, "type": "bool" } @@ -159,9 +156,9 @@ struct R { "namespace": "clanguml::t00034", "source_location": { "column": 8, - "file": "../../tests/t00034/t00034.cc", + "file": "t00034.cc", "line": 9, - "translation_unit": "../../tests/t00034/t00034.cc" + "translation_unit": "t00034.cc" }, "template_parameters": [], "type": "class" @@ -181,9 +178,9 @@ struct R { "namespace": "clanguml::t00034", "source_location": { "column": 30, - "file": "../../tests/t00034/t00034.cc", + "file": "t00034.cc", "line": 16, - "translation_unit": "../../tests/t00034/t00034.cc" + "translation_unit": "t00034.cc" }, "template_parameters": [ { @@ -210,9 +207,9 @@ struct R { "namespace": "clanguml::t00034", "source_location": { "column": 20, - "file": "../../tests/t00034/t00034.cc", + "file": "t00034.cc", "line": 20, - "translation_unit": "../../tests/t00034/t00034.cc" + "translation_unit": "t00034.cc" }, "template_parameters": [ { @@ -239,9 +236,9 @@ struct R { "namespace": "clanguml::t00034", "source_location": { "column": 30, - "file": "../../tests/t00034/t00034.cc", + "file": "t00034.cc", "line": 33, - "translation_unit": "../../tests/t00034/t00034.cc" + "translation_unit": "t00034.cc" }, "template_parameters": [ { @@ -268,9 +265,9 @@ struct R { "namespace": "clanguml::t00034", "source_location": { "column": 20, - "file": "../../tests/t00034/t00034.cc", + "file": "t00034.cc", "line": 37, - "translation_unit": "../../tests/t00034/t00034.cc" + "translation_unit": "t00034.cc" }, "template_parameters": [ { @@ -297,9 +294,9 @@ struct R { "namespace": "clanguml::t00034", "source_location": { "column": 8, - "file": "../../tests/t00034/t00034.cc", + "file": "t00034.cc", "line": 43, - "translation_unit": "../../tests/t00034/t00034.cc" + "translation_unit": "t00034.cc" }, "template_parameters": [], "type": "class" @@ -320,9 +317,9 @@ struct R { "name": "la", "source_location": { "column": 21, - "file": "../../tests/t00034/t00034.cc", + "file": "t00034.cc", "line": 46, - "translation_unit": "../../tests/t00034/t00034.cc" + "translation_unit": "t00034.cc" }, "type": "lift_void_t *" }, @@ -332,9 +329,9 @@ struct R { "name": "lv", "source_location": { "column": 24, - "file": "../../tests/t00034/t00034.cc", + "file": "t00034.cc", "line": 47, - "translation_unit": "../../tests/t00034/t00034.cc" + "translation_unit": "t00034.cc" }, "type": "lift_void_t *" } @@ -344,19 +341,14 @@ struct R { "namespace": "clanguml::t00034", "source_location": { "column": 8, - "file": "../../tests/t00034/t00034.cc", + "file": "t00034.cc", "line": 45, - "translation_unit": "../../tests/t00034/t00034.cc" + "translation_unit": "t00034.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00034_class", "relationships": [ { diff --git a/docs/test_cases/t00034_class.svg b/docs/test_cases/t00034_class.svg index 6afedaaf..c1af1339 100644 --- a/docs/test_cases/t00034_class.svg +++ b/docs/test_cases/t00034_class.svg @@ -1,6 +1,6 @@ - + @@ -9,30 +9,30 @@ - - + + Void - + - + operator!=(const Void &) constexpr const : bool - + - + operator==(const Void &) constexpr const : bool - - + + lift_void @@ -41,8 +41,8 @@ - - + + lift_void @@ -51,8 +51,8 @@ - - + + drop_void @@ -61,8 +61,8 @@ - - + + drop_void @@ -71,34 +71,34 @@ - - + + A - - + + R - + - + la : lift_void_t<A> * - + - + lv : lift_void_t<void> * diff --git a/docs/test_cases/t00034_class_mermaid.svg b/docs/test_cases/t00034_class_mermaid.svg index 41afc283..77b0413a 100644 --- a/docs/test_cases/t00034_class_mermaid.svg +++ b/docs/test_cases/t00034_class_mermaid.svg @@ -102,7 +102,7 @@ - + @@ -131,7 +131,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -169,7 +169,7 @@ - + @@ -188,7 +188,7 @@ - + @@ -207,7 +207,7 @@ - + @@ -226,7 +226,7 @@ - + diff --git a/docs/test_cases/t00035.md b/docs/test_cases/t00035.md index ee998141..135a60d1 100644 --- a/docs/test_cases/t00035.md +++ b/docs/test_cases/t00035.md @@ -1,15 +1,12 @@ # t00035 - PlantUML class diagram layout hints test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00035_class: type: class glob: - - ../../tests/t00035/t00035.cc - using_namespace: - - clanguml::t00035 + - t00035.cc + using_namespace: clanguml::t00035 include: namespaces: - clanguml::t00035 @@ -65,9 +62,9 @@ struct Right { }; "namespace": "clanguml::t00035", "source_location": { "column": 8, - "file": "../../tests/t00035/t00035.cc", + "file": "t00035.cc", "line": 4, - "translation_unit": "../../tests/t00035/t00035.cc" + "translation_unit": "t00035.cc" }, "template_parameters": [], "type": "class" @@ -87,9 +84,9 @@ struct Right { }; "namespace": "clanguml::t00035", "source_location": { "column": 8, - "file": "../../tests/t00035/t00035.cc", + "file": "t00035.cc", "line": 6, - "translation_unit": "../../tests/t00035/t00035.cc" + "translation_unit": "t00035.cc" }, "template_parameters": [], "type": "class" @@ -109,9 +106,9 @@ struct Right { }; "namespace": "clanguml::t00035", "source_location": { "column": 8, - "file": "../../tests/t00035/t00035.cc", + "file": "t00035.cc", "line": 8, - "translation_unit": "../../tests/t00035/t00035.cc" + "translation_unit": "t00035.cc" }, "template_parameters": [], "type": "class" @@ -131,9 +128,9 @@ struct Right { }; "namespace": "clanguml::t00035", "source_location": { "column": 8, - "file": "../../tests/t00035/t00035.cc", + "file": "t00035.cc", "line": 10, - "translation_unit": "../../tests/t00035/t00035.cc" + "translation_unit": "t00035.cc" }, "template_parameters": [], "type": "class" @@ -153,19 +150,14 @@ struct Right { }; "namespace": "clanguml::t00035", "source_location": { "column": 8, - "file": "../../tests/t00035/t00035.cc", + "file": "t00035.cc", "line": 12, - "translation_unit": "../../tests/t00035/t00035.cc" + "translation_unit": "t00035.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00035_class", "relationships": [], "using_namespace": "clanguml::t00035" diff --git a/docs/test_cases/t00035_class.svg b/docs/test_cases/t00035_class.svg index 98fc936b..278b38c2 100644 --- a/docs/test_cases/t00035_class.svg +++ b/docs/test_cases/t00035_class.svg @@ -1,6 +1,6 @@ - + @@ -9,40 +9,40 @@ - - + + Top - - + + Left - - + + Center - - + + Bottom - - + + Right diff --git a/docs/test_cases/t00035_class_mermaid.svg b/docs/test_cases/t00035_class_mermaid.svg index 58840c6a..466f29dd 100644 --- a/docs/test_cases/t00035_class_mermaid.svg +++ b/docs/test_cases/t00035_class_mermaid.svg @@ -52,7 +52,7 @@ - + @@ -71,7 +71,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -128,7 +128,7 @@ - + diff --git a/docs/test_cases/t00036.md b/docs/test_cases/t00036.md index f01cc999..956a311f 100644 --- a/docs/test_cases/t00036.md +++ b/docs/test_cases/t00036.md @@ -1,16 +1,13 @@ # t00036 - Class diagram with namespaces generated as packages ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00036_class: type: class generate_packages: true glob: - - ../../tests/t00036/t00036.cc - using_namespace: - - clanguml::t00036 + - t00036.cc + using_namespace: clanguml::t00036 include: namespaces: - clanguml::t00036 @@ -91,9 +88,9 @@ struct DImpl : public ns2::ns22::D { }; "namespace": "clanguml::t00036::ns1", "source_location": { "column": 12, - "file": "../../tests/t00036/t00036.cc", + "file": "t00036.cc", "line": 6, - "translation_unit": "../../tests/t00036/t00036.cc" + "translation_unit": "t00036.cc" }, "type": "enum" }, @@ -116,9 +113,9 @@ struct DImpl : public ns2::ns22::D { }; "name": "a", "source_location": { "column": 7, - "file": "../../tests/t00036/t00036.cc", + "file": "t00036.cc", "line": 11, - "translation_unit": "../../tests/t00036/t00036.cc" + "translation_unit": "t00036.cc" }, "type": "T" } @@ -128,9 +125,9 @@ struct DImpl : public ns2::ns22::D { }; "namespace": "clanguml::t00036::ns1::ns11", "source_location": { "column": 30, - "file": "../../tests/t00036/t00036.cc", + "file": "t00036.cc", "line": 10, - "translation_unit": "../../tests/t00036/t00036.cc" + "translation_unit": "t00036.cc" }, "template_parameters": [ { @@ -161,9 +158,9 @@ struct DImpl : public ns2::ns22::D { }; "name": "a_int", "source_location": { "column": 12, - "file": "../../tests/t00036/t00036.cc", + "file": "t00036.cc", "line": 17, - "translation_unit": "../../tests/t00036/t00036.cc" + "translation_unit": "t00036.cc" }, "type": "A" } @@ -173,9 +170,9 @@ struct DImpl : public ns2::ns22::D { }; "namespace": "clanguml::t00036::ns1::ns11::ns111", "source_location": { "column": 8, - "file": "../../tests/t00036/t00036.cc", + "file": "t00036.cc", "line": 16, - "translation_unit": "../../tests/t00036/t00036.cc" + "translation_unit": "t00036.cc" }, "template_parameters": [], "type": "class" @@ -199,9 +196,9 @@ struct DImpl : public ns2::ns22::D { }; "namespace": "clanguml::t00036::ns1::ns11", "source_location": { "column": 30, - "file": "../../tests/t00036/t00036.cc", + "file": "t00036.cc", "line": 10, - "translation_unit": "../../tests/t00036/t00036.cc" + "translation_unit": "t00036.cc" }, "template_parameters": [ { @@ -242,9 +239,9 @@ struct DImpl : public ns2::ns22::D { }; "namespace": "clanguml::t00036::ns2::ns22", "source_location": { "column": 8, - "file": "../../tests/t00036/t00036.cc", + "file": "t00036.cc", "line": 28, - "translation_unit": "../../tests/t00036/t00036.cc" + "translation_unit": "t00036.cc" }, "template_parameters": [], "type": "class" @@ -277,11 +274,6 @@ struct DImpl : public ns2::ns22::D { }; "type": "namespace" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00036_class", "relationships": [ { diff --git a/docs/test_cases/t00036_class.svg b/docs/test_cases/t00036_class.svg index c3bc2c07..ed47401f 100644 --- a/docs/test_cases/t00036_class.svg +++ b/docs/test_cases/t00036_class.svg @@ -1,6 +1,6 @@ - + @@ -9,23 +9,23 @@ - + ns1 - + ns11 - + ns111 - + ns2 - + ns22 - - + + E @@ -34,8 +34,8 @@ yellow - - + + A @@ -44,15 +44,15 @@ - + - + a : T - - + + A @@ -61,23 +61,23 @@ - - + + B - + - + a_int : A<int> - - + + C diff --git a/docs/test_cases/t00036_class_mermaid.svg b/docs/test_cases/t00036_class_mermaid.svg index f96a32b4..fd7f03e4 100644 --- a/docs/test_cases/t00036_class_mermaid.svg +++ b/docs/test_cases/t00036_class_mermaid.svg @@ -78,7 +78,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -131,7 +131,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -174,7 +174,7 @@ - + diff --git a/docs/test_cases/t00037.md b/docs/test_cases/t00037.md index f8e5b284..63199dca 100644 --- a/docs/test_cases/t00037.md +++ b/docs/test_cases/t00037.md @@ -1,16 +1,13 @@ # t00037 - Anonymous nested struct test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00037_class: type: class generate_packages: true glob: - - ../../tests/t00037/t00037.cc - using_namespace: - - clanguml::t00037 + - t00037.cc + using_namespace: clanguml::t00037 include: namespaces: - clanguml::t00037 @@ -78,9 +75,9 @@ struct A { "name": "dimensions", "source_location": { "column": 7, - "file": "../../tests/t00037/t00037.cc", + "file": "t00037.cc", "line": 11, - "translation_unit": "../../tests/t00037/t00037.cc" + "translation_unit": "t00037.cc" }, "type": "ST##(anonymous_662)" }, @@ -90,9 +87,9 @@ struct A { "name": "units", "source_location": { "column": 7, - "file": "../../tests/t00037/t00037.cc", + "file": "t00037.cc", "line": 17, - "translation_unit": "../../tests/t00037/t00037.cc" + "translation_unit": "t00037.cc" }, "type": "ST##(anonymous_792)" } @@ -102,9 +99,9 @@ struct A { "namespace": "clanguml::t00037", "source_location": { "column": 7, - "file": "../../tests/t00037/t00037.cc", + "file": "t00037.cc", "line": 4, - "translation_unit": "../../tests/t00037/t00037.cc" + "translation_unit": "t00037.cc" }, "template_parameters": [], "type": "class" @@ -125,9 +122,9 @@ struct A { "name": "t", "source_location": { "column": 16, - "file": "../../tests/t00037/t00037.cc", + "file": "t00037.cc", "line": 7, - "translation_unit": "../../tests/t00037/t00037.cc" + "translation_unit": "t00037.cc" }, "type": "double" }, @@ -137,9 +134,9 @@ struct A { "name": "x", "source_location": { "column": 16, - "file": "../../tests/t00037/t00037.cc", + "file": "t00037.cc", "line": 8, - "translation_unit": "../../tests/t00037/t00037.cc" + "translation_unit": "t00037.cc" }, "type": "double" }, @@ -149,9 +146,9 @@ struct A { "name": "y", "source_location": { "column": 16, - "file": "../../tests/t00037/t00037.cc", + "file": "t00037.cc", "line": 9, - "translation_unit": "../../tests/t00037/t00037.cc" + "translation_unit": "t00037.cc" }, "type": "double" }, @@ -161,9 +158,9 @@ struct A { "name": "z", "source_location": { "column": 16, - "file": "../../tests/t00037/t00037.cc", + "file": "t00037.cc", "line": 10, - "translation_unit": "../../tests/t00037/t00037.cc" + "translation_unit": "t00037.cc" }, "type": "double" } @@ -173,9 +170,9 @@ struct A { "namespace": "clanguml::t00037", "source_location": { "column": 5, - "file": "../../tests/t00037/t00037.cc", + "file": "t00037.cc", "line": 6, - "translation_unit": "../../tests/t00037/t00037.cc" + "translation_unit": "t00037.cc" }, "template_parameters": [], "type": "class" @@ -196,9 +193,9 @@ struct A { "name": "c", "source_location": { "column": 16, - "file": "../../tests/t00037/t00037.cc", + "file": "t00037.cc", "line": 15, - "translation_unit": "../../tests/t00037/t00037.cc" + "translation_unit": "t00037.cc" }, "type": "double" }, @@ -208,9 +205,9 @@ struct A { "name": "h", "source_location": { "column": 16, - "file": "../../tests/t00037/t00037.cc", + "file": "t00037.cc", "line": 16, - "translation_unit": "../../tests/t00037/t00037.cc" + "translation_unit": "t00037.cc" }, "type": "double" } @@ -220,9 +217,9 @@ struct A { "namespace": "clanguml::t00037", "source_location": { "column": 5, - "file": "../../tests/t00037/t00037.cc", + "file": "t00037.cc", "line": 14, - "translation_unit": "../../tests/t00037/t00037.cc" + "translation_unit": "t00037.cc" }, "template_parameters": [], "type": "class" @@ -243,9 +240,9 @@ struct A { "name": "st", "source_location": { "column": 8, - "file": "../../tests/t00037/t00037.cc", + "file": "t00037.cc", "line": 29, - "translation_unit": "../../tests/t00037/t00037.cc" + "translation_unit": "t00037.cc" }, "type": "ST" } @@ -270,9 +267,9 @@ struct A { "parameters": [], "source_location": { "column": 5, - "file": "../../tests/t00037/t00037.cc", + "file": "t00037.cc", "line": 21, - "translation_unit": "../../tests/t00037/t00037.cc" + "translation_unit": "t00037.cc" }, "type": "void" } @@ -281,19 +278,14 @@ struct A { "namespace": "clanguml::t00037", "source_location": { "column": 8, - "file": "../../tests/t00037/t00037.cc", + "file": "t00037.cc", "line": 20, - "translation_unit": "../../tests/t00037/t00037.cc" + "translation_unit": "t00037.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00037_class", "relationships": [ { diff --git a/docs/test_cases/t00037_class.svg b/docs/test_cases/t00037_class.svg index 5977141b..68b7f1fa 100644 --- a/docs/test_cases/t00037_class.svg +++ b/docs/test_cases/t00037_class.svg @@ -1,6 +1,6 @@ - + @@ -9,106 +9,106 @@ - - + + ST - + - + dimensions : ST::(anonymous_662) - + - + 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 diff --git a/docs/test_cases/t00037_class_mermaid.svg b/docs/test_cases/t00037_class_mermaid.svg index 75fdd725..06cff85b 100644 --- a/docs/test_cases/t00037_class_mermaid.svg +++ b/docs/test_cases/t00037_class_mermaid.svg @@ -90,7 +90,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -187,7 +187,7 @@ - + diff --git a/docs/test_cases/t00038.md b/docs/test_cases/t00038.md index 3b835233..e7e758ff 100644 --- a/docs/test_cases/t00038.md +++ b/docs/test_cases/t00038.md @@ -1,16 +1,13 @@ # t00038 - Template instantiation with unexposed nested templates ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00038_class: type: class generate_packages: false glob: - - ../../tests/t00038/t00038.cc - using_namespace: - - clanguml::t00038 + - t00038.cc + using_namespace: clanguml::t00038 include: namespaces: - clanguml::t00038 @@ -94,9 +91,9 @@ struct map - + @@ -9,8 +9,8 @@ - - + + thirdparty::ns1::color_t @@ -20,16 +20,16 @@ blue - - + + thirdparty::ns1::E - - + + property_t @@ -39,47 +39,47 @@ property_c - - + + A - - + + B - - + + C - - + + key_t - + - + key : std::string - - + + map @@ -88,8 +88,8 @@ - - + + map @@ -98,8 +98,8 @@ - - + + map @@ -108,8 +108,8 @@ - - + + map @@ -118,8 +118,8 @@ - - + + map diff --git a/docs/test_cases/t00038_class_mermaid.svg b/docs/test_cases/t00038_class_mermaid.svg index 49b730dd..af22827f 100644 --- a/docs/test_cases/t00038_class_mermaid.svg +++ b/docs/test_cases/t00038_class_mermaid.svg @@ -202,7 +202,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -289,7 +289,7 @@ - + @@ -308,7 +308,7 @@ - + @@ -327,7 +327,7 @@ - + @@ -346,7 +346,7 @@ - + @@ -370,7 +370,7 @@ - + @@ -389,7 +389,7 @@ - + @@ -408,7 +408,7 @@ - + @@ -427,7 +427,7 @@ - + @@ -446,7 +446,7 @@ - + diff --git a/docs/test_cases/t00039.md b/docs/test_cases/t00039.md index 31832829..8419df21 100644 --- a/docs/test_cases/t00039.md +++ b/docs/test_cases/t00039.md @@ -1,16 +1,13 @@ # t00039 - Subclass class diagram filter test ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00039_class: type: class generate_packages: false glob: - - ../../tests/t00039/t00039.cc - using_namespace: - - clanguml::t00039 + - t00039.cc + using_namespace: clanguml::t00039 include: subclasses: - clanguml::t00039::A @@ -111,9 +108,9 @@ template struct FFF : public FF { "namespace": "clanguml::t00039", "source_location": { "column": 8, - "file": "../../tests/t00039/t00039.cc", + "file": "t00039.cc", "line": 6, - "translation_unit": "../../tests/t00039/t00039.cc" + "translation_unit": "t00039.cc" }, "template_parameters": [], "type": "class" @@ -133,9 +130,9 @@ template struct FFF : public FF { "namespace": "clanguml::t00039", "source_location": { "column": 8, - "file": "../../tests/t00039/t00039.cc", + "file": "t00039.cc", "line": 8, - "translation_unit": "../../tests/t00039/t00039.cc" + "translation_unit": "t00039.cc" }, "template_parameters": [], "type": "class" @@ -155,9 +152,9 @@ template struct FFF : public FF { "namespace": "clanguml::t00039", "source_location": { "column": 8, - "file": "../../tests/t00039/t00039.cc", + "file": "t00039.cc", "line": 10, - "translation_unit": "../../tests/t00039/t00039.cc" + "translation_unit": "t00039.cc" }, "template_parameters": [], "type": "class" @@ -190,9 +187,9 @@ template struct FFF : public FF { "namespace": "clanguml::t00039", "source_location": { "column": 8, - "file": "../../tests/t00039/t00039.cc", + "file": "t00039.cc", "line": 16, - "translation_unit": "../../tests/t00039/t00039.cc" + "translation_unit": "t00039.cc" }, "template_parameters": [], "type": "class" @@ -225,9 +222,9 @@ template struct FFF : public FF { "namespace": "clanguml::t00039", "source_location": { "column": 8, - "file": "../../tests/t00039/t00039.cc", + "file": "t00039.cc", "line": 18, - "translation_unit": "../../tests/t00039/t00039.cc" + "translation_unit": "t00039.cc" }, "template_parameters": [], "type": "class" @@ -266,9 +263,9 @@ template struct FFF : public FF { "namespace": "clanguml::t00039", "source_location": { "column": 8, - "file": "../../tests/t00039/t00039.cc", + "file": "t00039.cc", "line": 20, - "translation_unit": "../../tests/t00039/t00039.cc" + "translation_unit": "t00039.cc" }, "template_parameters": [], "type": "class" @@ -288,9 +285,9 @@ template struct FFF : public FF { "namespace": "clanguml::t00039", "source_location": { "column": 8, - "file": "../../tests/t00039/t00039.cc", + "file": "t00039.cc", "line": 22, - "translation_unit": "../../tests/t00039/t00039.cc" + "translation_unit": "t00039.cc" }, "template_parameters": [], "type": "class" @@ -317,9 +314,9 @@ template struct FFF : public FF { "namespace": "clanguml::t00039", "source_location": { "column": 8, - "file": "../../tests/t00039/t00039.cc", + "file": "t00039.cc", "line": 24, - "translation_unit": "../../tests/t00039/t00039.cc" + "translation_unit": "t00039.cc" }, "template_parameters": [], "type": "class" @@ -347,9 +344,9 @@ template struct FFF : public FF { "name": "b", "source_location": { "column": 8, - "file": "../../tests/t00039/t00039.cc", + "file": "t00039.cc", "line": 27, - "translation_unit": "../../tests/t00039/t00039.cc" + "translation_unit": "t00039.cc" }, "type": "B *" } @@ -359,9 +356,9 @@ template struct FFF : public FF { "namespace": "clanguml::t00039", "source_location": { "column": 8, - "file": "../../tests/t00039/t00039.cc", + "file": "t00039.cc", "line": 26, - "translation_unit": "../../tests/t00039/t00039.cc" + "translation_unit": "t00039.cc" }, "template_parameters": [], "type": "class" @@ -388,9 +385,9 @@ template struct FFF : public FF { "namespace": "clanguml::t00039::ns2", "source_location": { "column": 8, - "file": "../../tests/t00039/t00039.cc", + "file": "t00039.cc", "line": 31, - "translation_unit": "../../tests/t00039/t00039.cc" + "translation_unit": "t00039.cc" }, "template_parameters": [], "type": "class" @@ -411,9 +408,9 @@ template struct FFF : public FF { "name": "t", "source_location": { "column": 8, - "file": "../../tests/t00039/t00039.cc", + "file": "t00039.cc", "line": 40, - "translation_unit": "../../tests/t00039/t00039.cc" + "translation_unit": "t00039.cc" }, "type": "T *" } @@ -423,9 +420,9 @@ template struct FFF : public FF { "namespace": "clanguml::t00039::ns3", "source_location": { "column": 30, - "file": "../../tests/t00039/t00039.cc", + "file": "t00039.cc", "line": 39, - "translation_unit": "../../tests/t00039/t00039.cc" + "translation_unit": "t00039.cc" }, "template_parameters": [ { @@ -460,9 +457,9 @@ template struct FFF : public FF { "name": "m", "source_location": { "column": 8, - "file": "../../tests/t00039/t00039.cc", + "file": "t00039.cc", "line": 44, - "translation_unit": "../../tests/t00039/t00039.cc" + "translation_unit": "t00039.cc" }, "type": "M *" } @@ -472,9 +469,9 @@ template struct FFF : public FF { "namespace": "clanguml::t00039::ns3", "source_location": { "column": 42, - "file": "../../tests/t00039/t00039.cc", + "file": "t00039.cc", "line": 43, - "translation_unit": "../../tests/t00039/t00039.cc" + "translation_unit": "t00039.cc" }, "template_parameters": [ { @@ -515,9 +512,9 @@ template struct FFF : public FF { "name": "m", "source_location": { "column": 8, - "file": "../../tests/t00039/t00039.cc", + "file": "t00039.cc", "line": 48, - "translation_unit": "../../tests/t00039/t00039.cc" + "translation_unit": "t00039.cc" }, "type": "M *" } @@ -527,9 +524,9 @@ template struct FFF : public FF { "namespace": "clanguml::t00039::ns3", "source_location": { "column": 42, - "file": "../../tests/t00039/t00039.cc", + "file": "t00039.cc", "line": 47, - "translation_unit": "../../tests/t00039/t00039.cc" + "translation_unit": "t00039.cc" }, "template_parameters": [ { @@ -570,9 +567,9 @@ template struct FFF : public FF { "name": "n", "source_location": { "column": 8, - "file": "../../tests/t00039/t00039.cc", + "file": "t00039.cc", "line": 52, - "translation_unit": "../../tests/t00039/t00039.cc" + "translation_unit": "t00039.cc" }, "type": "N *" } @@ -582,9 +579,9 @@ template struct FFF : public FF { "namespace": "clanguml::t00039::ns3", "source_location": { "column": 54, - "file": "../../tests/t00039/t00039.cc", + "file": "t00039.cc", "line": 51, - "translation_unit": "../../tests/t00039/t00039.cc" + "translation_unit": "t00039.cc" }, "template_parameters": [ { @@ -609,11 +606,6 @@ template struct FFF : public FF { "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00039_class", "relationships": [ { diff --git a/docs/test_cases/t00039_class.svg b/docs/test_cases/t00039_class.svg index 90858fb1..884ce36b 100644 --- a/docs/test_cases/t00039_class.svg +++ b/docs/test_cases/t00039_class.svg @@ -1,6 +1,6 @@ - + @@ -9,95 +9,95 @@ - - + + C - - + + D - - + + E - - + + CD - - + + DE - - + + CDE - - + + A - - + + AA - - + + AAA - + - + b : B * - - + + ns2::AAAA - - + + ns3::F @@ -106,15 +106,15 @@ - + - + t : T * - - + + ns3::FF @@ -123,15 +123,15 @@ - + - + m : M * - - + + ns3::FE @@ -140,15 +140,15 @@ - + - + m : M * - - + + ns3::FFF @@ -157,11 +157,11 @@ - + - + n : N * diff --git a/docs/test_cases/t00039_class_mermaid.svg b/docs/test_cases/t00039_class_mermaid.svg index 2c9daeed..4e2f9077 100644 --- a/docs/test_cases/t00039_class_mermaid.svg +++ b/docs/test_cases/t00039_class_mermaid.svg @@ -184,7 +184,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -222,7 +222,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -260,7 +260,7 @@ - + @@ -279,7 +279,7 @@ - + @@ -298,7 +298,7 @@ - + @@ -317,7 +317,7 @@ - + @@ -336,7 +336,7 @@ - + @@ -360,7 +360,7 @@ - + @@ -379,7 +379,7 @@ - + @@ -403,7 +403,7 @@ - + @@ -427,7 +427,7 @@ - + @@ -451,7 +451,7 @@ - + diff --git a/docs/test_cases/t00040.md b/docs/test_cases/t00040.md index ceec39fc..c3826184 100644 --- a/docs/test_cases/t00040.md +++ b/docs/test_cases/t00040.md @@ -1,16 +1,13 @@ # t00040 - Relationship and access filter test ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00040_class: type: class generate_packages: false glob: - - ../../tests/t00040/t00040.cc - using_namespace: - - clanguml::t00040 + - t00040.cc + using_namespace: clanguml::t00040 include: namespaces: - clanguml::t00040 @@ -88,9 +85,9 @@ struct R { "name": "ii_", "source_location": { "column": 9, - "file": "../../tests/t00040/t00040.cc", + "file": "t00040.cc", "line": 10, - "translation_unit": "../../tests/t00040/t00040.cc" + "translation_unit": "t00040.cc" }, "type": "int" }, @@ -100,9 +97,9 @@ struct R { "name": "hidden_a_", "source_location": { "column": 9, - "file": "../../tests/t00040/t00040.cc", + "file": "t00040.cc", "line": 15, - "translation_unit": "../../tests/t00040/t00040.cc" + "translation_unit": "t00040.cc" }, "type": "int" } @@ -127,9 +124,9 @@ struct R { "parameters": [], "source_location": { "column": 9, - "file": "../../tests/t00040/t00040.cc", + "file": "t00040.cc", "line": 7, - "translation_unit": "../../tests/t00040/t00040.cc" + "translation_unit": "t00040.cc" }, "type": "int" } @@ -138,9 +135,9 @@ struct R { "namespace": "clanguml::t00040", "source_location": { "column": 8, - "file": "../../tests/t00040/t00040.cc", + "file": "t00040.cc", "line": 5, - "translation_unit": "../../tests/t00040/t00040.cc" + "translation_unit": "t00040.cc" }, "template_parameters": [], "type": "class" @@ -167,9 +164,9 @@ struct R { "namespace": "clanguml::t00040", "source_location": { "column": 7, - "file": "../../tests/t00040/t00040.cc", + "file": "t00040.cc", "line": 18, - "translation_unit": "../../tests/t00040/t00040.cc" + "translation_unit": "t00040.cc" }, "template_parameters": [], "type": "class" @@ -197,9 +194,9 @@ struct R { "name": "b", "source_location": { "column": 8, - "file": "../../tests/t00040/t00040.cc", + "file": "t00040.cc", "line": 25, - "translation_unit": "../../tests/t00040/t00040.cc" + "translation_unit": "t00040.cc" }, "type": "B *" }, @@ -209,9 +206,9 @@ struct R { "name": "hidden_aaa_", "source_location": { "column": 9, - "file": "../../tests/t00040/t00040.cc", + "file": "t00040.cc", "line": 28, - "translation_unit": "../../tests/t00040/t00040.cc" + "translation_unit": "t00040.cc" }, "type": "int" } @@ -236,9 +233,9 @@ struct R { "parameters": [], "source_location": { "column": 9, - "file": "../../tests/t00040/t00040.cc", + "file": "t00040.cc", "line": 24, - "translation_unit": "../../tests/t00040/t00040.cc" + "translation_unit": "t00040.cc" }, "type": "int" } @@ -247,9 +244,9 @@ struct R { "namespace": "clanguml::t00040", "source_location": { "column": 7, - "file": "../../tests/t00040/t00040.cc", + "file": "t00040.cc", "line": 22, - "translation_unit": "../../tests/t00040/t00040.cc" + "translation_unit": "t00040.cc" }, "template_parameters": [], "type": "class" @@ -289,9 +286,9 @@ struct R { ], "source_location": { "column": 10, - "file": "../../tests/t00040/t00040.cc", + "file": "t00040.cc", "line": 32, - "translation_unit": "../../tests/t00040/t00040.cc" + "translation_unit": "t00040.cc" }, "type": "void" } @@ -300,19 +297,14 @@ struct R { "namespace": "clanguml::t00040", "source_location": { "column": 8, - "file": "../../tests/t00040/t00040.cc", + "file": "t00040.cc", "line": 31, - "translation_unit": "../../tests/t00040/t00040.cc" + "translation_unit": "t00040.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00040_class", "relationships": [ { diff --git a/docs/test_cases/t00040_class.svg b/docs/test_cases/t00040_class.svg index cd0c6951..dddcc566 100644 --- a/docs/test_cases/t00040_class.svg +++ b/docs/test_cases/t00040_class.svg @@ -1,6 +1,6 @@ - + @@ -9,70 +9,70 @@ - - + + A - + - + get_a() : int - + - + 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 dc11fcad..a3e4f755 100644 --- a/docs/test_cases/t00040_class_mermaid.svg +++ b/docs/test_cases/t00040_class_mermaid.svg @@ -74,7 +74,7 @@ - + @@ -103,7 +103,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -151,7 +151,7 @@ - + diff --git a/docs/test_cases/t00041.md b/docs/test_cases/t00041.md index 480f03d6..970ddd93 100644 --- a/docs/test_cases/t00041.md +++ b/docs/test_cases/t00041.md @@ -1,16 +1,13 @@ # t00041 - Context diagram filter test ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00041_class: type: class generate_packages: false glob: - - ../../tests/t00041/t00041.cc - using_namespace: - - clanguml::t00041 + - t00041.cc + using_namespace: clanguml::t00041 include: namespaces: - clanguml::t00041 @@ -98,9 +95,9 @@ struct NM : public N { }; "namespace": "clanguml::t00041", "source_location": { "column": 8, - "file": "../../tests/t00041/t00041.cc", + "file": "t00041.cc", "line": 9, - "translation_unit": "../../tests/t00041/t00041.cc" + "translation_unit": "t00041.cc" }, "template_parameters": [], "type": "class" @@ -121,9 +118,9 @@ struct NM : public N { }; "name": "rr", "source_location": { "column": 9, - "file": "../../tests/t00041/t00041.cc", + "file": "t00041.cc", "line": 14, - "translation_unit": "../../tests/t00041/t00041.cc" + "translation_unit": "t00041.cc" }, "type": "RR *" } @@ -133,9 +130,9 @@ struct NM : public N { }; "namespace": "clanguml::t00041", "source_location": { "column": 8, - "file": "../../tests/t00041/t00041.cc", + "file": "t00041.cc", "line": 13, - "translation_unit": "../../tests/t00041/t00041.cc" + "translation_unit": "t00041.cc" }, "template_parameters": [], "type": "class" @@ -155,9 +152,9 @@ struct NM : public N { }; "namespace": "clanguml::t00041", "source_location": { "column": 8, - "file": "../../tests/t00041/t00041.cc", + "file": "t00041.cc", "line": 17, - "translation_unit": "../../tests/t00041/t00041.cc" + "translation_unit": "t00041.cc" }, "template_parameters": [], "type": "class" @@ -177,9 +174,9 @@ struct NM : public N { }; "namespace": "clanguml::t00041", "source_location": { "column": 8, - "file": "../../tests/t00041/t00041.cc", + "file": "t00041.cc", "line": 19, - "translation_unit": "../../tests/t00041/t00041.cc" + "translation_unit": "t00041.cc" }, "template_parameters": [], "type": "class" @@ -207,9 +204,9 @@ struct NM : public N { }; "name": "e", "source_location": { "column": 8, - "file": "../../tests/t00041/t00041.cc", + "file": "t00041.cc", "line": 28, - "translation_unit": "../../tests/t00041/t00041.cc" + "translation_unit": "t00041.cc" }, "type": "E *" }, @@ -219,9 +216,9 @@ struct NM : public N { }; "name": "f", "source_location": { "column": 8, - "file": "../../tests/t00041/t00041.cc", + "file": "t00041.cc", "line": 29, - "translation_unit": "../../tests/t00041/t00041.cc" + "translation_unit": "t00041.cc" }, "type": "F *" }, @@ -231,9 +228,9 @@ struct NM : public N { }; "name": "g", "source_location": { "column": 16, - "file": "../../tests/t00041/t00041.cc", + "file": "t00041.cc", "line": 30, - "translation_unit": "../../tests/t00041/t00041.cc" + "translation_unit": "t00041.cc" }, "type": "detail::G *" } @@ -263,9 +260,9 @@ struct NM : public N { }; ], "source_location": { "column": 10, - "file": "../../tests/t00041/t00041.cc", + "file": "t00041.cc", "line": 32, - "translation_unit": "../../tests/t00041/t00041.cc" + "translation_unit": "t00041.cc" }, "type": "void" } @@ -274,9 +271,9 @@ struct NM : public N { }; "namespace": "clanguml::t00041", "source_location": { "column": 8, - "file": "../../tests/t00041/t00041.cc", + "file": "t00041.cc", "line": 27, - "translation_unit": "../../tests/t00041/t00041.cc" + "translation_unit": "t00041.cc" }, "template_parameters": [], "type": "class" @@ -303,9 +300,9 @@ struct NM : public N { }; "namespace": "clanguml::t00041", "source_location": { "column": 8, - "file": "../../tests/t00041/t00041.cc", + "file": "t00041.cc", "line": 35, - "translation_unit": "../../tests/t00041/t00041.cc" + "translation_unit": "t00041.cc" }, "template_parameters": [], "type": "class" @@ -325,9 +322,9 @@ struct NM : public N { }; "namespace": "clanguml::t00041::ns1", "source_location": { "column": 8, - "file": "../../tests/t00041/t00041.cc", + "file": "t00041.cc", "line": 38, - "translation_unit": "../../tests/t00041/t00041.cc" + "translation_unit": "t00041.cc" }, "template_parameters": [], "type": "class" @@ -354,9 +351,9 @@ struct NM : public N { }; "namespace": "clanguml::t00041::ns1", "source_location": { "column": 8, - "file": "../../tests/t00041/t00041.cc", + "file": "t00041.cc", "line": 40, - "translation_unit": "../../tests/t00041/t00041.cc" + "translation_unit": "t00041.cc" }, "template_parameters": [], "type": "class" @@ -383,19 +380,14 @@ struct NM : public N { }; "namespace": "clanguml::t00041::ns1", "source_location": { "column": 8, - "file": "../../tests/t00041/t00041.cc", + "file": "t00041.cc", "line": 42, - "translation_unit": "../../tests/t00041/t00041.cc" + "translation_unit": "t00041.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00041_class", "relationships": [ { diff --git a/docs/test_cases/t00041_class.svg b/docs/test_cases/t00041_class.svg index 3347be02..212289ef 100644 --- a/docs/test_cases/t00041_class.svg +++ b/docs/test_cases/t00041_class.svg @@ -1,6 +1,6 @@ - + @@ -9,107 +9,107 @@ - - + + R - - + + D - + - + rr : RR * - - + + E - - + + F - - + + RR - + - + foo(H * h) : void - + - + e : E * - + - + f : F * - + - + g : detail::G * - - + + RRR - - + + ns1::N - - + + ns1::NN - - + + ns1::NM diff --git a/docs/test_cases/t00041_class_mermaid.svg b/docs/test_cases/t00041_class_mermaid.svg index bebc4017..ec70aec9 100644 --- a/docs/test_cases/t00041_class_mermaid.svg +++ b/docs/test_cases/t00041_class_mermaid.svg @@ -130,7 +130,7 @@ - + @@ -149,7 +149,7 @@ - + @@ -173,7 +173,7 @@ - + @@ -192,7 +192,7 @@ - + @@ -211,7 +211,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -269,7 +269,7 @@ - + @@ -288,7 +288,7 @@ - + @@ -307,7 +307,7 @@ - + diff --git a/docs/test_cases/t00042.md b/docs/test_cases/t00042.md index a55adf37..d3f37dca 100644 --- a/docs/test_cases/t00042.md +++ b/docs/test_cases/t00042.md @@ -1,16 +1,13 @@ # t00042 - Specialization class template diagram filter test ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00042_class: type: class generate_packages: false glob: - - ../../tests/t00042/t00042.cc - using_namespace: - - clanguml::t00042 + - t00042.cc + using_namespace: clanguml::t00042 include: specializations: - clanguml::t00042::A @@ -84,9 +81,9 @@ struct R { "name": "a", "source_location": { "column": 7, - "file": "../../tests/t00042/t00042.cc", + "file": "t00042.cc", "line": 6, - "translation_unit": "../../tests/t00042/t00042.cc" + "translation_unit": "t00042.cc" }, "type": "T" } @@ -96,9 +93,9 @@ struct R { "namespace": "clanguml::t00042", "source_location": { "column": 30, - "file": "../../tests/t00042/t00042.cc", + "file": "t00042.cc", "line": 5, - "translation_unit": "../../tests/t00042/t00042.cc" + "translation_unit": "t00042.cc" }, "template_parameters": [ { @@ -126,9 +123,9 @@ struct R { "name": "a", "source_location": { "column": 11, - "file": "../../tests/t00042/t00042.cc", + "file": "t00042.cc", "line": 10, - "translation_unit": "../../tests/t00042/t00042.cc" + "translation_unit": "t00042.cc" }, "type": "void *" } @@ -138,9 +135,9 @@ struct R { "namespace": "clanguml::t00042", "source_location": { "column": 20, - "file": "../../tests/t00042/t00042.cc", + "file": "t00042.cc", "line": 9, - "translation_unit": "../../tests/t00042/t00042.cc" + "translation_unit": "t00042.cc" }, "template_parameters": [ { @@ -168,9 +165,9 @@ struct R { "name": "b", "source_location": { "column": 7, - "file": "../../tests/t00042/t00042.cc", + "file": "t00042.cc", "line": 14, - "translation_unit": "../../tests/t00042/t00042.cc" + "translation_unit": "t00042.cc" }, "type": "T" }, @@ -180,9 +177,9 @@ struct R { "name": "bb", "source_location": { "column": 7, - "file": "../../tests/t00042/t00042.cc", + "file": "t00042.cc", "line": 15, - "translation_unit": "../../tests/t00042/t00042.cc" + "translation_unit": "t00042.cc" }, "type": "K" } @@ -192,9 +189,9 @@ struct R { "namespace": "clanguml::t00042", "source_location": { "column": 42, - "file": "../../tests/t00042/t00042.cc", + "file": "t00042.cc", "line": 13, - "translation_unit": "../../tests/t00042/t00042.cc" + "translation_unit": "t00042.cc" }, "template_parameters": [ { @@ -227,9 +224,9 @@ struct R { "namespace": "clanguml::t00042", "source_location": { "column": 30, - "file": "../../tests/t00042/t00042.cc", + "file": "t00042.cc", "line": 5, - "translation_unit": "../../tests/t00042/t00042.cc" + "translation_unit": "t00042.cc" }, "template_parameters": [ { @@ -256,9 +253,9 @@ struct R { "namespace": "clanguml::t00042", "source_location": { "column": 30, - "file": "../../tests/t00042/t00042.cc", + "file": "t00042.cc", "line": 5, - "translation_unit": "../../tests/t00042/t00042.cc" + "translation_unit": "t00042.cc" }, "template_parameters": [ { @@ -285,9 +282,9 @@ struct R { "namespace": "clanguml::t00042", "source_location": { "column": 42, - "file": "../../tests/t00042/t00042.cc", + "file": "t00042.cc", "line": 13, - "translation_unit": "../../tests/t00042/t00042.cc" + "translation_unit": "t00042.cc" }, "template_parameters": [ { @@ -306,11 +303,6 @@ struct R { "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00042_class", "relationships": [ { diff --git a/docs/test_cases/t00042_class.svg b/docs/test_cases/t00042_class.svg index 066e2b3f..0b4e3541 100644 --- a/docs/test_cases/t00042_class.svg +++ b/docs/test_cases/t00042_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + A @@ -19,15 +19,15 @@ - + - + a : T - - + + A @@ -36,15 +36,15 @@ - + - + a : void * - - + + B @@ -53,22 +53,22 @@ - + - + b : T - + - + bb : K - - + + A @@ -77,8 +77,8 @@ - - + + A @@ -87,8 +87,8 @@ - - + + B diff --git a/docs/test_cases/t00042_class_mermaid.svg b/docs/test_cases/t00042_class_mermaid.svg index dd4918e1..12f7fdd3 100644 --- a/docs/test_cases/t00042_class_mermaid.svg +++ b/docs/test_cases/t00042_class_mermaid.svg @@ -102,7 +102,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -179,7 +179,7 @@ - + @@ -198,7 +198,7 @@ - + @@ -217,7 +217,7 @@ - + diff --git a/docs/test_cases/t00043.md b/docs/test_cases/t00043.md index 8c8582d9..e2557d36 100644 --- a/docs/test_cases/t00043.md +++ b/docs/test_cases/t00043.md @@ -1,16 +1,13 @@ # t00043 - Dependants and dependencies class diagram filter test ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00043_class: type: class generate_packages: true glob: - - ../../tests/t00043/t00043.cc - using_namespace: - - clanguml::t00043 + - t00043.cc + using_namespace: clanguml::t00043 include: dependants: - clanguml::t00043::dependants::A @@ -105,9 +102,9 @@ struct J { "namespace": "clanguml::t00043::dependants", "source_location": { "column": 8, - "file": "../../tests/t00043/t00043.cc", + "file": "t00043.cc", "line": 4, - "translation_unit": "../../tests/t00043/t00043.cc" + "translation_unit": "t00043.cc" }, "template_parameters": [], "type": "class" @@ -147,9 +144,9 @@ struct J { ], "source_location": { "column": 10, - "file": "../../tests/t00043/t00043.cc", + "file": "t00043.cc", "line": 7, - "translation_unit": "../../tests/t00043/t00043.cc" + "translation_unit": "t00043.cc" }, "type": "void" } @@ -158,9 +155,9 @@ struct J { "namespace": "clanguml::t00043::dependants", "source_location": { "column": 8, - "file": "../../tests/t00043/t00043.cc", + "file": "t00043.cc", "line": 6, - "translation_unit": "../../tests/t00043/t00043.cc" + "translation_unit": "t00043.cc" }, "template_parameters": [], "type": "class" @@ -200,9 +197,9 @@ struct J { ], "source_location": { "column": 10, - "file": "../../tests/t00043/t00043.cc", + "file": "t00043.cc", "line": 11, - "translation_unit": "../../tests/t00043/t00043.cc" + "translation_unit": "t00043.cc" }, "type": "void" } @@ -211,9 +208,9 @@ struct J { "namespace": "clanguml::t00043::dependants", "source_location": { "column": 8, - "file": "../../tests/t00043/t00043.cc", + "file": "t00043.cc", "line": 10, - "translation_unit": "../../tests/t00043/t00043.cc" + "translation_unit": "t00043.cc" }, "template_parameters": [], "type": "class" @@ -253,9 +250,9 @@ struct J { ], "source_location": { "column": 10, - "file": "../../tests/t00043/t00043.cc", + "file": "t00043.cc", "line": 15, - "translation_unit": "../../tests/t00043/t00043.cc" + "translation_unit": "t00043.cc" }, "type": "void" } @@ -264,9 +261,9 @@ struct J { "namespace": "clanguml::t00043::dependants", "source_location": { "column": 8, - "file": "../../tests/t00043/t00043.cc", + "file": "t00043.cc", "line": 14, - "translation_unit": "../../tests/t00043/t00043.cc" + "translation_unit": "t00043.cc" }, "template_parameters": [], "type": "class" @@ -306,9 +303,9 @@ struct J { ], "source_location": { "column": 10, - "file": "../../tests/t00043/t00043.cc", + "file": "t00043.cc", "line": 19, - "translation_unit": "../../tests/t00043/t00043.cc" + "translation_unit": "t00043.cc" }, "type": "void" }, @@ -336,9 +333,9 @@ struct J { ], "source_location": { "column": 10, - "file": "../../tests/t00043/t00043.cc", + "file": "t00043.cc", "line": 20, - "translation_unit": "../../tests/t00043/t00043.cc" + "translation_unit": "t00043.cc" }, "type": "void" } @@ -347,9 +344,9 @@ struct J { "namespace": "clanguml::t00043::dependants", "source_location": { "column": 8, - "file": "../../tests/t00043/t00043.cc", + "file": "t00043.cc", "line": 18, - "translation_unit": "../../tests/t00043/t00043.cc" + "translation_unit": "t00043.cc" }, "template_parameters": [], "type": "class" @@ -389,9 +386,9 @@ struct J { ], "source_location": { "column": 10, - "file": "../../tests/t00043/t00043.cc", + "file": "t00043.cc", "line": 24, - "translation_unit": "../../tests/t00043/t00043.cc" + "translation_unit": "t00043.cc" }, "type": "void" } @@ -400,9 +397,9 @@ struct J { "namespace": "clanguml::t00043::dependants", "source_location": { "column": 8, - "file": "../../tests/t00043/t00043.cc", + "file": "t00043.cc", "line": 23, - "translation_unit": "../../tests/t00043/t00043.cc" + "translation_unit": "t00043.cc" }, "template_parameters": [], "type": "class" @@ -429,9 +426,9 @@ struct J { "namespace": "clanguml::t00043::dependencies", "source_location": { "column": 8, - "file": "../../tests/t00043/t00043.cc", + "file": "t00043.cc", "line": 32, - "translation_unit": "../../tests/t00043/t00043.cc" + "translation_unit": "t00043.cc" }, "template_parameters": [], "type": "class" @@ -451,9 +448,9 @@ struct J { "namespace": "clanguml::t00043::dependencies", "source_location": { "column": 8, - "file": "../../tests/t00043/t00043.cc", + "file": "t00043.cc", "line": 34, - "translation_unit": "../../tests/t00043/t00043.cc" + "translation_unit": "t00043.cc" }, "template_parameters": [], "type": "class" @@ -493,9 +490,9 @@ struct J { ], "source_location": { "column": 10, - "file": "../../tests/t00043/t00043.cc", + "file": "t00043.cc", "line": 37, - "translation_unit": "../../tests/t00043/t00043.cc" + "translation_unit": "t00043.cc" }, "type": "void" }, @@ -523,9 +520,9 @@ struct J { ], "source_location": { "column": 10, - "file": "../../tests/t00043/t00043.cc", + "file": "t00043.cc", "line": 38, - "translation_unit": "../../tests/t00043/t00043.cc" + "translation_unit": "t00043.cc" }, "type": "void" } @@ -534,9 +531,9 @@ struct J { "namespace": "clanguml::t00043::dependencies", "source_location": { "column": 8, - "file": "../../tests/t00043/t00043.cc", + "file": "t00043.cc", "line": 36, - "translation_unit": "../../tests/t00043/t00043.cc" + "translation_unit": "t00043.cc" }, "template_parameters": [], "type": "class" @@ -576,9 +573,9 @@ struct J { ], "source_location": { "column": 10, - "file": "../../tests/t00043/t00043.cc", + "file": "t00043.cc", "line": 46, - "translation_unit": "../../tests/t00043/t00043.cc" + "translation_unit": "t00043.cc" }, "type": "void" } @@ -587,9 +584,9 @@ struct J { "namespace": "clanguml::t00043::dependencies", "source_location": { "column": 8, - "file": "../../tests/t00043/t00043.cc", + "file": "t00043.cc", "line": 45, - "translation_unit": "../../tests/t00043/t00043.cc" + "translation_unit": "t00043.cc" }, "template_parameters": [], "type": "class" @@ -629,9 +626,9 @@ struct J { ], "source_location": { "column": 10, - "file": "../../tests/t00043/t00043.cc", + "file": "t00043.cc", "line": 50, - "translation_unit": "../../tests/t00043/t00043.cc" + "translation_unit": "t00043.cc" }, "type": "void" } @@ -640,9 +637,9 @@ struct J { "namespace": "clanguml::t00043::dependencies", "source_location": { "column": 8, - "file": "../../tests/t00043/t00043.cc", + "file": "t00043.cc", "line": 49, - "translation_unit": "../../tests/t00043/t00043.cc" + "translation_unit": "t00043.cc" }, "template_parameters": [], "type": "class" @@ -652,11 +649,6 @@ struct J { "type": "namespace" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00043_class", "relationships": [ { diff --git a/docs/test_cases/t00043_class.svg b/docs/test_cases/t00043_class.svg index fbc22074..5d6b8237 100644 --- a/docs/test_cases/t00043_class.svg +++ b/docs/test_cases/t00043_class.svg @@ -1,6 +1,6 @@ - + @@ -9,167 +9,167 @@ - + dependants - + dependencies - - + + A - - + + B - + - + b(A * a) : void - - + + BB - + - + bb(A * a) : void - - + + C - + - + c(B * b) : 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 9eaccc71..44bad4eb 100644 --- a/docs/test_cases/t00043_class_mermaid.svg +++ b/docs/test_cases/t00043_class_mermaid.svg @@ -174,7 +174,7 @@ - + @@ -193,7 +193,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -265,7 +265,7 @@ - + @@ -294,7 +294,7 @@ - + @@ -318,7 +318,7 @@ - + @@ -337,7 +337,7 @@ - + @@ -356,7 +356,7 @@ - + @@ -385,7 +385,7 @@ - + @@ -409,7 +409,7 @@ - + diff --git a/docs/test_cases/t00044.md b/docs/test_cases/t00044.md index 722f6872..1c45eed4 100644 --- a/docs/test_cases/t00044.md +++ b/docs/test_cases/t00044.md @@ -1,16 +1,13 @@ # t00044 - Test case for inner type aliases with parent class template args ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00044_class: type: class generate_packages: true glob: - - ../../tests/t00044/t00044.cc - using_namespace: - - clanguml::t00044 + - t00044.cc + using_namespace: clanguml::t00044 include: namespaces: - clanguml::t00044 @@ -81,9 +78,9 @@ struct R { "namespace": "clanguml::t00044", "source_location": { "column": 29, - "file": "../../tests/t00044/t00044.cc", + "file": "t00044.cc", "line": 4, - "translation_unit": "../../tests/t00044/t00044.cc" + "translation_unit": "t00044.cc" }, "template_parameters": [ { @@ -129,9 +126,9 @@ struct R { "name": "signal", "source_location": { "column": 15, - "file": "../../tests/t00044/t00044.cc", + "file": "t00044.cc", "line": 21, - "translation_unit": "../../tests/t00044/t00044.cc" + "translation_unit": "t00044.cc" }, "type": "signal_t *" } @@ -161,9 +158,9 @@ struct R { ], "source_location": { "column": 5, - "file": "../../tests/t00044/t00044.cc", + "file": "t00044.cc", "line": 13, - "translation_unit": "../../tests/t00044/t00044.cc" + "translation_unit": "t00044.cc" }, "type": "void" }, @@ -191,9 +188,9 @@ struct R { "namespace": "clanguml::t00044", "source_location": { "column": 7, - "file": "../../tests/t00044/t00044.cc", + "file": "t00044.cc", "line": 9, - "translation_unit": "../../tests/t00044/t00044.cc" + "translation_unit": "t00044.cc" }, "template_parameters": [ { @@ -245,9 +242,9 @@ struct R { "namespace": "clanguml::t00044", "source_location": { "column": 29, - "file": "../../tests/t00044/t00044.cc", + "file": "t00044.cc", "line": 4, - "translation_unit": "../../tests/t00044/t00044.cc" + "translation_unit": "t00044.cc" }, "template_parameters": [ { @@ -292,9 +289,9 @@ struct R { "namespace": "clanguml::t00044", "source_location": { "column": 29, - "file": "../../tests/t00044/t00044.cc", + "file": "t00044.cc", "line": 4, - "translation_unit": "../../tests/t00044/t00044.cc" + "translation_unit": "t00044.cc" }, "template_parameters": [ { @@ -347,9 +344,9 @@ struct R { "name": "sink1", "source_location": { "column": 43, - "file": "../../tests/t00044/t00044.cc", + "file": "t00044.cc", "line": 34, - "translation_unit": "../../tests/t00044/t00044.cc" + "translation_unit": "t00044.cc" }, "type": "sink>" } @@ -359,9 +356,9 @@ struct R { "namespace": "clanguml::t00044", "source_location": { "column": 8, - "file": "../../tests/t00044/t00044.cc", + "file": "t00044.cc", "line": 33, - "translation_unit": "../../tests/t00044/t00044.cc" + "translation_unit": "t00044.cc" }, "template_parameters": [], "type": "class" @@ -381,9 +378,9 @@ struct R { "namespace": "clanguml::t00044", "source_location": { "column": 41, - "file": "../../tests/t00044/t00044.cc", + "file": "t00044.cc", "line": 6, - "translation_unit": "../../tests/t00044/t00044.cc" + "translation_unit": "t00044.cc" }, "template_parameters": [ { @@ -416,9 +413,9 @@ struct R { "namespace": "clanguml::t00044", "source_location": { "column": 29, - "file": "../../tests/t00044/t00044.cc", + "file": "t00044.cc", "line": 4, - "translation_unit": "../../tests/t00044/t00044.cc" + "translation_unit": "t00044.cc" }, "template_parameters": [ { @@ -431,11 +428,6 @@ struct R { "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00044_class", "relationships": [ { diff --git a/docs/test_cases/t00044_class.svg b/docs/test_cases/t00044_class.svg index c26fc53a..8a6f904a 100644 --- a/docs/test_cases/t00044_class.svg +++ b/docs/test_cases/t00044_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + signal_handler @@ -19,8 +19,8 @@ - - + + sink @@ -28,26 +28,26 @@ signal_handler<Ret(Args...),A> - + - + sink(signal_t & sh) : void get_signal<CastTo>() : CastTo * - + - + signal : signal_t * - - + + signal_handler @@ -56,8 +56,8 @@ - - + + sink @@ -66,23 +66,23 @@ - - + + R - + - + sink1 : sink<signal_handler<void (int),bool>> - - + + signal_handler @@ -91,8 +91,8 @@ - - + + sink diff --git a/docs/test_cases/t00044_class_mermaid.svg b/docs/test_cases/t00044_class_mermaid.svg index ea0e5474..f1b116a4 100644 --- a/docs/test_cases/t00044_class_mermaid.svg +++ b/docs/test_cases/t00044_class_mermaid.svg @@ -138,7 +138,7 @@ - + @@ -157,7 +157,7 @@ - + @@ -191,7 +191,7 @@ - + @@ -210,7 +210,7 @@ - + @@ -229,7 +229,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -272,7 +272,7 @@ - + diff --git a/docs/test_cases/t00045.md b/docs/test_cases/t00045.md index 3ef3405b..f5372bcc 100644 --- a/docs/test_cases/t00045.md +++ b/docs/test_cases/t00045.md @@ -1,13 +1,11 @@ # t00045 - Test case for root namespace handling ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00045_class: type: class glob: - - ../../tests/t00045/t00045.cc + - t00045.cc exclude: namespaces: - std @@ -84,9 +82,9 @@ public: "namespace": "", "source_location": { "column": 7, - "file": "../../tests/t00045/t00045.cc", + "file": "t00045.cc", "line": 1, - "translation_unit": "../../tests/t00045/t00045.cc" + "translation_unit": "t00045.cc" }, "template_parameters": [], "type": "class" @@ -106,9 +104,9 @@ public: "namespace": "", "source_location": { "column": 7, - "file": "../../tests/t00045/t00045.cc", + "file": "t00045.cc", "line": 3, - "translation_unit": "../../tests/t00045/t00045.cc" + "translation_unit": "t00045.cc" }, "template_parameters": [], "type": "class" @@ -128,9 +126,9 @@ public: "namespace": "", "source_location": { "column": 7, - "file": "../../tests/t00045/t00045.cc", + "file": "t00045.cc", "line": 5, - "translation_unit": "../../tests/t00045/t00045.cc" + "translation_unit": "t00045.cc" }, "template_parameters": [], "type": "class" @@ -151,9 +149,9 @@ public: "name": "t", "source_location": { "column": 7, - "file": "../../tests/t00045/t00045.cc", + "file": "t00045.cc", "line": 8, - "translation_unit": "../../tests/t00045/t00045.cc" + "translation_unit": "t00045.cc" }, "type": "T" } @@ -163,9 +161,9 @@ public: "namespace": "", "source_location": { "column": 29, - "file": "../../tests/t00045/t00045.cc", + "file": "t00045.cc", "line": 7, - "translation_unit": "../../tests/t00045/t00045.cc" + "translation_unit": "t00045.cc" }, "template_parameters": [ { @@ -192,9 +190,9 @@ public: "namespace": "ns1", "source_location": { "column": 7, - "file": "../../tests/t00045/t00045.cc", + "file": "t00045.cc", "line": 13, - "translation_unit": "../../tests/t00045/t00045.cc" + "translation_unit": "t00045.cc" }, "template_parameters": [], "type": "class" @@ -214,9 +212,9 @@ public: "namespace": "ns1::ns2", "source_location": { "column": 7, - "file": "../../tests/t00045/t00045.cc", + "file": "t00045.cc", "line": 17, - "translation_unit": "../../tests/t00045/t00045.cc" + "translation_unit": "t00045.cc" }, "template_parameters": [], "type": "class" @@ -243,9 +241,9 @@ public: "namespace": "ns1::ns2", "source_location": { "column": 7, - "file": "../../tests/t00045/t00045.cc", + "file": "t00045.cc", "line": 19, - "translation_unit": "../../tests/t00045/t00045.cc" + "translation_unit": "t00045.cc" }, "template_parameters": [], "type": "class" @@ -272,9 +270,9 @@ public: "namespace": "ns1::ns2", "source_location": { "column": 7, - "file": "../../tests/t00045/t00045.cc", + "file": "t00045.cc", "line": 21, - "translation_unit": "../../tests/t00045/t00045.cc" + "translation_unit": "t00045.cc" }, "template_parameters": [], "type": "class" @@ -301,9 +299,9 @@ public: "namespace": "ns1::ns2", "source_location": { "column": 7, - "file": "../../tests/t00045/t00045.cc", + "file": "t00045.cc", "line": 23, - "translation_unit": "../../tests/t00045/t00045.cc" + "translation_unit": "t00045.cc" }, "template_parameters": [], "type": "class" @@ -330,9 +328,9 @@ public: "namespace": "ns1::ns2", "source_location": { "column": 7, - "file": "../../tests/t00045/t00045.cc", + "file": "t00045.cc", "line": 25, - "translation_unit": "../../tests/t00045/t00045.cc" + "translation_unit": "t00045.cc" }, "template_parameters": [], "type": "class" @@ -352,9 +350,9 @@ public: "namespace": "ns1::ns2", "source_location": { "column": 7, - "file": "../../tests/t00045/t00045.cc", + "file": "t00045.cc", "line": 27, - "translation_unit": "../../tests/t00045/t00045.cc" + "translation_unit": "t00045.cc" }, "template_parameters": [], "type": "class" @@ -375,9 +373,9 @@ public: "name": "a", "source_location": { "column": 8, - "file": "../../tests/t00045/t00045.cc", + "file": "t00045.cc", "line": 31, - "translation_unit": "../../tests/t00045/t00045.cc" + "translation_unit": "t00045.cc" }, "type": "A *" }, @@ -387,9 +385,9 @@ public: "name": "ns1_a", "source_location": { "column": 13, - "file": "../../tests/t00045/t00045.cc", + "file": "t00045.cc", "line": 32, - "translation_unit": "../../tests/t00045/t00045.cc" + "translation_unit": "t00045.cc" }, "type": "ns1::A *" }, @@ -399,9 +397,9 @@ public: "name": "ns1_ns2_a", "source_location": { "column": 18, - "file": "../../tests/t00045/t00045.cc", + "file": "t00045.cc", "line": 33, - "translation_unit": "../../tests/t00045/t00045.cc" + "translation_unit": "t00045.cc" }, "type": "ns1::ns2::A *" }, @@ -411,9 +409,9 @@ public: "name": "root_a", "source_location": { "column": 10, - "file": "../../tests/t00045/t00045.cc", + "file": "t00045.cc", "line": 34, - "translation_unit": "../../tests/t00045/t00045.cc" + "translation_unit": "t00045.cc" }, "type": "::A *" } @@ -443,9 +441,9 @@ public: ], "source_location": { "column": 10, - "file": "../../tests/t00045/t00045.cc", + "file": "t00045.cc", "line": 40, - "translation_unit": "../../tests/t00045/t00045.cc" + "translation_unit": "t00045.cc" }, "type": "void" } @@ -454,19 +452,14 @@ public: "namespace": "ns1::ns2", "source_location": { "column": 7, - "file": "../../tests/t00045/t00045.cc", + "file": "t00045.cc", "line": 29, - "translation_unit": "../../tests/t00045/t00045.cc" + "translation_unit": "t00045.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00045_class", "relationships": [ { diff --git a/docs/test_cases/t00045_class.svg b/docs/test_cases/t00045_class.svg index 5917c645..f0e757bd 100644 --- a/docs/test_cases/t00045_class.svg +++ b/docs/test_cases/t00045_class.svg @@ -1,6 +1,6 @@ - + @@ -9,32 +9,32 @@ - - + + A - - + + AA - - + + AAA - - + + AAAA @@ -43,110 +43,110 @@ - + - + t : T - - + + ns1::A - - + + ns1::ns2::A - - + + ns1::ns2::B - - + + ns1::ns2::C - - + + ns1::ns2::D - - + + ns1::ns2::E - - + + 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 * diff --git a/docs/test_cases/t00045_class_mermaid.svg b/docs/test_cases/t00045_class_mermaid.svg index 49250f7b..6be2ea49 100644 --- a/docs/test_cases/t00045_class_mermaid.svg +++ b/docs/test_cases/t00045_class_mermaid.svg @@ -166,7 +166,7 @@ - + @@ -185,7 +185,7 @@ - + @@ -204,7 +204,7 @@ - + @@ -223,7 +223,7 @@ - + @@ -247,7 +247,7 @@ - + @@ -266,7 +266,7 @@ - + @@ -285,7 +285,7 @@ - + @@ -304,7 +304,7 @@ - + @@ -323,7 +323,7 @@ - + @@ -342,7 +342,7 @@ - + @@ -361,7 +361,7 @@ - + @@ -380,7 +380,7 @@ - + diff --git a/docs/test_cases/t00046.md b/docs/test_cases/t00046.md index 5948e23b..8db7f304 100644 --- a/docs/test_cases/t00046.md +++ b/docs/test_cases/t00046.md @@ -1,14 +1,12 @@ # t00046 - Test case for root namespace handling with packages ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00046_class: type: class generate_packages: true glob: - - ../../tests/t00046/t00046.cc + - t00046.cc exclude: namespaces: - std @@ -77,9 +75,9 @@ public: "namespace": "", "source_location": { "column": 7, - "file": "../../tests/t00046/t00046.cc", + "file": "t00046.cc", "line": 4, - "translation_unit": "../../tests/t00046/t00046.cc" + "translation_unit": "t00046.cc" }, "template_parameters": [], "type": "class" @@ -99,9 +97,9 @@ public: "namespace": "", "source_location": { "column": 7, - "file": "../../tests/t00046/t00046.cc", + "file": "t00046.cc", "line": 6, - "translation_unit": "../../tests/t00046/t00046.cc" + "translation_unit": "t00046.cc" }, "template_parameters": [], "type": "class" @@ -124,9 +122,9 @@ public: "namespace": "ns1", "source_location": { "column": 7, - "file": "../../tests/t00046/t00046.cc", + "file": "t00046.cc", "line": 10, - "translation_unit": "../../tests/t00046/t00046.cc" + "translation_unit": "t00046.cc" }, "template_parameters": [], "type": "class" @@ -149,9 +147,9 @@ public: "namespace": "ns1::ns2", "source_location": { "column": 7, - "file": "../../tests/t00046/t00046.cc", + "file": "t00046.cc", "line": 14, - "translation_unit": "../../tests/t00046/t00046.cc" + "translation_unit": "t00046.cc" }, "template_parameters": [], "type": "class" @@ -178,9 +176,9 @@ public: "namespace": "ns1::ns2", "source_location": { "column": 7, - "file": "../../tests/t00046/t00046.cc", + "file": "t00046.cc", "line": 16, - "translation_unit": "../../tests/t00046/t00046.cc" + "translation_unit": "t00046.cc" }, "template_parameters": [], "type": "class" @@ -207,9 +205,9 @@ public: "namespace": "ns1::ns2", "source_location": { "column": 7, - "file": "../../tests/t00046/t00046.cc", + "file": "t00046.cc", "line": 18, - "translation_unit": "../../tests/t00046/t00046.cc" + "translation_unit": "t00046.cc" }, "template_parameters": [], "type": "class" @@ -236,9 +234,9 @@ public: "namespace": "ns1::ns2", "source_location": { "column": 7, - "file": "../../tests/t00046/t00046.cc", + "file": "t00046.cc", "line": 20, - "translation_unit": "../../tests/t00046/t00046.cc" + "translation_unit": "t00046.cc" }, "template_parameters": [], "type": "class" @@ -265,9 +263,9 @@ public: "namespace": "ns1::ns2", "source_location": { "column": 7, - "file": "../../tests/t00046/t00046.cc", + "file": "t00046.cc", "line": 22, - "translation_unit": "../../tests/t00046/t00046.cc" + "translation_unit": "t00046.cc" }, "template_parameters": [], "type": "class" @@ -288,9 +286,9 @@ public: "name": "a", "source_location": { "column": 8, - "file": "../../tests/t00046/t00046.cc", + "file": "t00046.cc", "line": 26, - "translation_unit": "../../tests/t00046/t00046.cc" + "translation_unit": "t00046.cc" }, "type": "A *" }, @@ -300,9 +298,9 @@ public: "name": "ns1_a", "source_location": { "column": 13, - "file": "../../tests/t00046/t00046.cc", + "file": "t00046.cc", "line": 27, - "translation_unit": "../../tests/t00046/t00046.cc" + "translation_unit": "t00046.cc" }, "type": "ns1::A *" }, @@ -312,9 +310,9 @@ public: "name": "ns1_ns2_a", "source_location": { "column": 18, - "file": "../../tests/t00046/t00046.cc", + "file": "t00046.cc", "line": 28, - "translation_unit": "../../tests/t00046/t00046.cc" + "translation_unit": "t00046.cc" }, "type": "ns1::ns2::A *" }, @@ -324,9 +322,9 @@ public: "name": "root_a", "source_location": { "column": 10, - "file": "../../tests/t00046/t00046.cc", + "file": "t00046.cc", "line": 29, - "translation_unit": "../../tests/t00046/t00046.cc" + "translation_unit": "t00046.cc" }, "type": "::A *" }, @@ -336,9 +334,9 @@ public: "name": "i", "source_location": { "column": 31, - "file": "../../tests/t00046/t00046.cc", + "file": "t00046.cc", "line": 30, - "translation_unit": "../../tests/t00046/t00046.cc" + "translation_unit": "t00046.cc" }, "type": "std::vector" } @@ -368,9 +366,9 @@ public: ], "source_location": { "column": 10, - "file": "../../tests/t00046/t00046.cc", + "file": "t00046.cc", "line": 32, - "translation_unit": "../../tests/t00046/t00046.cc" + "translation_unit": "t00046.cc" }, "type": "void" } @@ -379,9 +377,9 @@ public: "namespace": "ns1::ns2", "source_location": { "column": 7, - "file": "../../tests/t00046/t00046.cc", + "file": "t00046.cc", "line": 24, - "translation_unit": "../../tests/t00046/t00046.cc" + "translation_unit": "t00046.cc" }, "template_parameters": [], "type": "class" @@ -395,11 +393,6 @@ public: "type": "namespace" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00046_class", "relationships": [ { diff --git a/docs/test_cases/t00046_class.svg b/docs/test_cases/t00046_class.svg index ee3e58f0..30edd2e6 100644 --- a/docs/test_cases/t00046_class.svg +++ b/docs/test_cases/t00046_class.svg @@ -1,6 +1,6 @@ - + @@ -9,120 +9,120 @@ - + ns1 - + ns2 - - + + A - - + + A - - + + B - - + + C - - + + D - - + + 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 * - - + + A - - + + AA diff --git a/docs/test_cases/t00046_class_mermaid.svg b/docs/test_cases/t00046_class_mermaid.svg index 82a786e6..93847d3b 100644 --- a/docs/test_cases/t00046_class_mermaid.svg +++ b/docs/test_cases/t00046_class_mermaid.svg @@ -154,7 +154,7 @@ - + @@ -173,7 +173,7 @@ - + @@ -192,7 +192,7 @@ - + @@ -211,7 +211,7 @@ - + @@ -230,7 +230,7 @@ - + @@ -249,7 +249,7 @@ - + @@ -268,7 +268,7 @@ - + @@ -287,7 +287,7 @@ - + @@ -306,7 +306,7 @@ - + diff --git a/docs/test_cases/t00047.md b/docs/test_cases/t00047.md index 246daa4d..f8f5093b 100644 --- a/docs/test_cases/t00047.md +++ b/docs/test_cases/t00047.md @@ -1,13 +1,11 @@ # t00047 - Test case for recursive variadic template ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00047_class: type: class glob: - - ../../tests/t00047/t00047.cc + - t00047.cc using_namespace: clanguml::t00047 include: namespaces: @@ -67,9 +65,9 @@ using conditional = typename conditional_t::type; "namespace": "clanguml::t00047", "source_location": { "column": 33, - "file": "../../tests/t00047/t00047.cc", + "file": "t00047.cc", "line": 8, - "translation_unit": "../../tests/t00047/t00047.cc" + "translation_unit": "t00047.cc" }, "template_parameters": [ { @@ -96,9 +94,9 @@ using conditional = typename conditional_t::type; "namespace": "clanguml::t00047", "source_location": { "column": 8, - "file": "../../tests/t00047/t00047.cc", + "file": "t00047.cc", "line": 13, - "translation_unit": "../../tests/t00047/t00047.cc" + "translation_unit": "t00047.cc" }, "template_parameters": [ { @@ -137,9 +135,9 @@ using conditional = typename conditional_t::type; "namespace": "clanguml::t00047", "source_location": { "column": 8, - "file": "../../tests/t00047/t00047.cc", + "file": "t00047.cc", "line": 18, - "translation_unit": "../../tests/t00047/t00047.cc" + "translation_unit": "t00047.cc" }, "template_parameters": [ { @@ -178,9 +176,9 @@ using conditional = typename conditional_t::type; "namespace": "clanguml::t00047", "source_location": { "column": 34, - "file": "../../tests/t00047/t00047.cc", + "file": "t00047.cc", "line": 6, - "translation_unit": "../../tests/t00047/t00047.cc" + "translation_unit": "t00047.cc" }, "template_parameters": [ { @@ -193,11 +191,6 @@ using conditional = typename conditional_t::type; "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00047_class", "relationships": [ { diff --git a/docs/test_cases/t00047_class.svg b/docs/test_cases/t00047_class.svg index 719f29cf..dc0ee2ea 100644 --- a/docs/test_cases/t00047_class.svg +++ b/docs/test_cases/t00047_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + conditional_t @@ -19,8 +19,8 @@ - - + + conditional_t @@ -29,8 +29,8 @@ - - + + conditional_t @@ -39,8 +39,8 @@ - - + + conditional_t diff --git a/docs/test_cases/t00047_class_mermaid.svg b/docs/test_cases/t00047_class_mermaid.svg index cb70766e..84c910c8 100644 --- a/docs/test_cases/t00047_class_mermaid.svg +++ b/docs/test_cases/t00047_class_mermaid.svg @@ -90,7 +90,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -147,7 +147,7 @@ - + diff --git a/docs/test_cases/t00048.md b/docs/test_cases/t00048.md index a3a8ef87..070fa091 100644 --- a/docs/test_cases/t00048.md +++ b/docs/test_cases/t00048.md @@ -1,15 +1,13 @@ # t00048 - Test case for unique entity id with multiple translation units ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00048_class: type: class glob: - - ../../tests/t00048/b_t00048.cc - - ../../tests/t00048/a_t00048.cc - - ../../tests/t00048/t00048.cc + - b_t00048.cc + - a_t00048.cc + - t00048.cc using_namespace: clanguml::t00048 include: namespaces: @@ -144,9 +142,9 @@ template struct BaseTemplate { "name": "base", "source_location": { "column": 9, - "file": "../../tests/t00048/t00048.h", + "file": "t00048.h", "line": 7, - "translation_unit": "../../tests/t00048/b_t00048.cc" + "translation_unit": "b_t00048.cc" }, "type": "int" } @@ -171,9 +169,9 @@ template struct BaseTemplate { "parameters": [], "source_location": { "column": 18, - "file": "../../tests/t00048/t00048.h", + "file": "t00048.h", "line": 9, - "translation_unit": "../../tests/t00048/b_t00048.cc" + "translation_unit": "b_t00048.cc" }, "type": "void" } @@ -182,9 +180,9 @@ template struct BaseTemplate { "namespace": "clanguml::t00048", "source_location": { "column": 8, - "file": "../../tests/t00048/t00048.h", + "file": "t00048.h", "line": 6, - "translation_unit": "../../tests/t00048/b_t00048.cc" + "translation_unit": "b_t00048.cc" }, "template_parameters": [], "type": "class" @@ -205,9 +203,9 @@ template struct BaseTemplate { "name": "base", "source_location": { "column": 7, - "file": "../../tests/t00048/t00048.h", + "file": "t00048.h", "line": 13, - "translation_unit": "../../tests/t00048/b_t00048.cc" + "translation_unit": "b_t00048.cc" }, "type": "T" } @@ -232,9 +230,9 @@ template struct BaseTemplate { "parameters": [], "source_location": { "column": 18, - "file": "../../tests/t00048/t00048.h", + "file": "t00048.h", "line": 15, - "translation_unit": "../../tests/t00048/b_t00048.cc" + "translation_unit": "b_t00048.cc" }, "type": "void" } @@ -243,9 +241,9 @@ template struct BaseTemplate { "namespace": "clanguml::t00048", "source_location": { "column": 30, - "file": "../../tests/t00048/t00048.h", + "file": "t00048.h", "line": 12, - "translation_unit": "../../tests/t00048/b_t00048.cc" + "translation_unit": "b_t00048.cc" }, "template_parameters": [ { @@ -280,9 +278,9 @@ template struct BaseTemplate { "name": "b", "source_location": { "column": 9, - "file": "../../tests/t00048/b_t00048.h", + "file": "b_t00048.h", "line": 9, - "translation_unit": "../../tests/t00048/b_t00048.cc" + "translation_unit": "b_t00048.cc" }, "type": "int" } @@ -307,9 +305,9 @@ template struct BaseTemplate { "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00048/b_t00048.h", + "file": "b_t00048.h", "line": 11, - "translation_unit": "../../tests/t00048/b_t00048.cc" + "translation_unit": "b_t00048.cc" }, "type": "void" } @@ -318,9 +316,9 @@ template struct BaseTemplate { "namespace": "clanguml::t00048", "source_location": { "column": 8, - "file": "../../tests/t00048/b_t00048.h", + "file": "b_t00048.h", "line": 8, - "translation_unit": "../../tests/t00048/b_t00048.cc" + "translation_unit": "b_t00048.cc" }, "template_parameters": [], "type": "class" @@ -348,9 +346,9 @@ template struct BaseTemplate { "name": "b", "source_location": { "column": 7, - "file": "../../tests/t00048/b_t00048.h", + "file": "b_t00048.h", "line": 15, - "translation_unit": "../../tests/t00048/b_t00048.cc" + "translation_unit": "b_t00048.cc" }, "type": "T" } @@ -375,9 +373,9 @@ template struct BaseTemplate { "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00048/b_t00048.h", + "file": "b_t00048.h", "line": 17, - "translation_unit": "../../tests/t00048/b_t00048.cc" + "translation_unit": "b_t00048.cc" }, "type": "void" } @@ -386,9 +384,9 @@ template struct BaseTemplate { "namespace": "clanguml::t00048", "source_location": { "column": 30, - "file": "../../tests/t00048/b_t00048.h", + "file": "b_t00048.h", "line": 14, - "translation_unit": "../../tests/t00048/b_t00048.cc" + "translation_unit": "b_t00048.cc" }, "template_parameters": [ { @@ -423,9 +421,9 @@ template struct BaseTemplate { "name": "a", "source_location": { "column": 9, - "file": "../../tests/t00048/a_t00048.h", + "file": "a_t00048.h", "line": 9, - "translation_unit": "../../tests/t00048/a_t00048.cc" + "translation_unit": "a_t00048.cc" }, "type": "int" } @@ -450,9 +448,9 @@ template struct BaseTemplate { "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00048/a_t00048.h", + "file": "a_t00048.h", "line": 11, - "translation_unit": "../../tests/t00048/a_t00048.cc" + "translation_unit": "a_t00048.cc" }, "type": "void" } @@ -461,9 +459,9 @@ template struct BaseTemplate { "namespace": "clanguml::t00048", "source_location": { "column": 8, - "file": "../../tests/t00048/a_t00048.h", + "file": "a_t00048.h", "line": 8, - "translation_unit": "../../tests/t00048/a_t00048.cc" + "translation_unit": "a_t00048.cc" }, "template_parameters": [], "type": "class" @@ -491,9 +489,9 @@ template struct BaseTemplate { "name": "a", "source_location": { "column": 7, - "file": "../../tests/t00048/a_t00048.h", + "file": "a_t00048.h", "line": 15, - "translation_unit": "../../tests/t00048/a_t00048.cc" + "translation_unit": "a_t00048.cc" }, "type": "T" } @@ -518,9 +516,9 @@ template struct BaseTemplate { "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00048/a_t00048.h", + "file": "a_t00048.h", "line": 17, - "translation_unit": "../../tests/t00048/a_t00048.cc" + "translation_unit": "a_t00048.cc" }, "type": "void" } @@ -529,9 +527,9 @@ template struct BaseTemplate { "namespace": "clanguml::t00048", "source_location": { "column": 30, - "file": "../../tests/t00048/a_t00048.h", + "file": "a_t00048.h", "line": 14, - "translation_unit": "../../tests/t00048/a_t00048.cc" + "translation_unit": "a_t00048.cc" }, "template_parameters": [ { @@ -544,11 +542,6 @@ template struct BaseTemplate { "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00048_class", "relationships": [ { diff --git a/docs/test_cases/t00048_class.svg b/docs/test_cases/t00048_class.svg index e850670f..00c0d174 100644 --- a/docs/test_cases/t00048_class.svg +++ b/docs/test_cases/t00048_class.svg @@ -1,6 +1,6 @@ - + @@ -9,30 +9,30 @@ - - + + Base - + - + foo() = 0 : void - + - + base : int - - + + BaseTemplate @@ -40,45 +40,45 @@ T - + - + foo() = 0 : void - + - + base : T - - + + B - + - + foo() : void - + - + b : int - - + + BTemplate @@ -86,45 +86,45 @@ T - + - + foo() : void - + - + b : T - - + + A - + - + foo() : void - + - + a : int - - + + ATemplate @@ -132,19 +132,19 @@ T - + - + foo() : void - + - + a : T diff --git a/docs/test_cases/t00048_class_mermaid.svg b/docs/test_cases/t00048_class_mermaid.svg index fcfc62ae..af6a7136 100644 --- a/docs/test_cases/t00048_class_mermaid.svg +++ b/docs/test_cases/t00048_class_mermaid.svg @@ -94,7 +94,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -152,7 +152,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -210,7 +210,7 @@ - + @@ -239,7 +239,7 @@ - + diff --git a/docs/test_cases/t00049.md b/docs/test_cases/t00049.md index 302add68..e70de0d7 100644 --- a/docs/test_cases/t00049.md +++ b/docs/test_cases/t00049.md @@ -1,8 +1,6 @@ # t00049 - Test case configurable type aliases ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00049_class: type: class @@ -14,7 +12,7 @@ diagrams: "std::vector": string_vector "std::map": intmap glob: - - ../../tests/t00049/t00049.cc + - t00049.cc include: namespaces: - clanguml::t00049 @@ -71,9 +69,9 @@ struct R { "name": "a", "source_location": { "column": 7, - "file": "../../tests/t00049/t00049.cc", + "file": "t00049.cc", "line": 8, - "translation_unit": "../../tests/t00049/t00049.cc" + "translation_unit": "t00049.cc" }, "type": "T" } @@ -98,9 +96,9 @@ struct R { "parameters": [], "source_location": { "column": 8, - "file": "../../tests/t00049/t00049.cc", + "file": "t00049.cc", "line": 10, - "translation_unit": "../../tests/t00049/t00049.cc" + "translation_unit": "t00049.cc" }, "type": "T &" } @@ -109,9 +107,9 @@ struct R { "namespace": "clanguml::t00049", "source_location": { "column": 30, - "file": "../../tests/t00049/t00049.cc", + "file": "t00049.cc", "line": 7, - "translation_unit": "../../tests/t00049/t00049.cc" + "translation_unit": "t00049.cc" }, "template_parameters": [ { @@ -138,9 +136,9 @@ struct R { "namespace": "clanguml::t00049", "source_location": { "column": 30, - "file": "../../tests/t00049/t00049.cc", + "file": "t00049.cc", "line": 7, - "translation_unit": "../../tests/t00049/t00049.cc" + "translation_unit": "t00049.cc" }, "template_parameters": [ { @@ -167,9 +165,9 @@ struct R { "namespace": "clanguml::t00049", "source_location": { "column": 30, - "file": "../../tests/t00049/t00049.cc", + "file": "t00049.cc", "line": 7, - "translation_unit": "../../tests/t00049/t00049.cc" + "translation_unit": "t00049.cc" }, "template_parameters": [ { @@ -196,9 +194,9 @@ struct R { "namespace": "clanguml::t00049", "source_location": { "column": 30, - "file": "../../tests/t00049/t00049.cc", + "file": "t00049.cc", "line": 7, - "translation_unit": "../../tests/t00049/t00049.cc" + "translation_unit": "t00049.cc" }, "template_parameters": [ { @@ -226,9 +224,9 @@ struct R { "name": "a_string", "source_location": { "column": 32, - "file": "../../tests/t00049/t00049.cc", + "file": "t00049.cc", "line": 14, - "translation_unit": "../../tests/t00049/t00049.cc" + "translation_unit": "t00049.cc" }, "type": "A>" }, @@ -238,9 +236,9 @@ struct R { "name": "a_vector_string", "source_location": { "column": 33, - "file": "../../tests/t00049/t00049.cc", + "file": "t00049.cc", "line": 15, - "translation_unit": "../../tests/t00049/t00049.cc" + "translation_unit": "t00049.cc" }, "type": "A>" }, @@ -250,9 +248,9 @@ struct R { "name": "a_int_map", "source_location": { "column": 27, - "file": "../../tests/t00049/t00049.cc", + "file": "t00049.cc", "line": 16, - "translation_unit": "../../tests/t00049/t00049.cc" + "translation_unit": "t00049.cc" }, "type": "A>" } @@ -277,9 +275,9 @@ struct R { "parameters": [], "source_location": { "column": 27, - "file": "../../tests/t00049/t00049.cc", + "file": "t00049.cc", "line": 18, - "translation_unit": "../../tests/t00049/t00049.cc" + "translation_unit": "t00049.cc" }, "type": "clanguml::t00049::A>" }, @@ -307,9 +305,9 @@ struct R { ], "source_location": { "column": 10, - "file": "../../tests/t00049/t00049.cc", + "file": "t00049.cc", "line": 20, - "translation_unit": "../../tests/t00049/t00049.cc" + "translation_unit": "t00049.cc" }, "type": "void" } @@ -318,19 +316,14 @@ struct R { "namespace": "clanguml::t00049", "source_location": { "column": 8, - "file": "../../tests/t00049/t00049.cc", + "file": "t00049.cc", "line": 13, - "translation_unit": "../../tests/t00049/t00049.cc" + "translation_unit": "t00049.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00049_class", "relationships": [ { diff --git a/docs/test_cases/t00049_class.svg b/docs/test_cases/t00049_class.svg index aae3c9e4..bda60243 100644 --- a/docs/test_cases/t00049_class.svg +++ b/docs/test_cases/t00049_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + A @@ -18,23 +18,23 @@ T - + - + get_a() : T & - + - + a : T - - + + A @@ -43,8 +43,8 @@ - - + + A @@ -53,8 +53,8 @@ - - + + A @@ -63,47 +63,47 @@ - - + + 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> diff --git a/docs/test_cases/t00049_class_mermaid.svg b/docs/test_cases/t00049_class_mermaid.svg index ae59b65b..648ea5cc 100644 --- a/docs/test_cases/t00049_class_mermaid.svg +++ b/docs/test_cases/t00049_class_mermaid.svg @@ -126,7 +126,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -174,7 +174,7 @@ - + @@ -193,7 +193,7 @@ - + @@ -212,7 +212,7 @@ - + diff --git a/docs/test_cases/t00050.md b/docs/test_cases/t00050.md index 9a1771dd..90a25345 100644 --- a/docs/test_cases/t00050.md +++ b/docs/test_cases/t00050.md @@ -1,13 +1,11 @@ # t00050 - Test case for generating notes from comments using jinja templates ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00050_class: type: class glob: - - ../../tests/t00050/t00050.cc + - t00050.cc comment_parser: clang include: namespaces: @@ -238,9 +236,9 @@ class NoComment { }; "namespace": "clanguml::t00050", "source_location": { "column": 7, - "file": "../../tests/t00050/t00050.cc", + "file": "t00050.cc", "line": 9, - "translation_unit": "../../tests/t00050/t00050.cc" + "translation_unit": "t00050.cc" }, "template_parameters": [], "type": "class" @@ -278,9 +276,9 @@ class NoComment { }; "namespace": "clanguml::t00050", "source_location": { "column": 7, - "file": "../../tests/t00050/t00050.cc", + "file": "t00050.cc", "line": 24, - "translation_unit": "../../tests/t00050/t00050.cc" + "translation_unit": "t00050.cc" }, "template_parameters": [], "type": "class" @@ -314,9 +312,9 @@ class NoComment { }; "namespace": "clanguml::t00050", "source_location": { "column": 7, - "file": "../../tests/t00050/t00050.cc", + "file": "t00050.cc", "line": 53, - "translation_unit": "../../tests/t00050/t00050.cc" + "translation_unit": "t00050.cc" }, "template_parameters": [], "type": "class" @@ -348,9 +346,9 @@ class NoComment { }; "namespace": "clanguml::t00050::utils", "source_location": { "column": 7, - "file": "../../tests/t00050/t00050.cc", + "file": "t00050.cc", "line": 65, - "translation_unit": "../../tests/t00050/t00050.cc" + "translation_unit": "t00050.cc" }, "template_parameters": [], "type": "class" @@ -376,9 +374,9 @@ class NoComment { }; "namespace": "clanguml::t00050", "source_location": { "column": 12, - "file": "../../tests/t00050/t00050.cc", + "file": "t00050.cc", "line": 70, - "translation_unit": "../../tests/t00050/t00050.cc" + "translation_unit": "t00050.cc" }, "type": "enum" }, @@ -425,9 +423,9 @@ class NoComment { }; "name": "t", "source_location": { "column": 7, - "file": "../../tests/t00050/t00050.cc", + "file": "t00050.cc", "line": 82, - "translation_unit": "../../tests/t00050/t00050.cc" + "translation_unit": "t00050.cc" }, "type": "T[N]" }, @@ -437,9 +435,9 @@ class NoComment { }; "name": "v", "source_location": { "column": 7, - "file": "../../tests/t00050/t00050.cc", + "file": "t00050.cc", "line": 83, - "translation_unit": "../../tests/t00050/t00050.cc" + "translation_unit": "t00050.cc" }, "type": "V" } @@ -449,9 +447,9 @@ class NoComment { }; "namespace": "clanguml::t00050", "source_location": { "column": 48, - "file": "../../tests/t00050/t00050.cc", + "file": "t00050.cc", "line": 81, - "translation_unit": "../../tests/t00050/t00050.cc" + "translation_unit": "t00050.cc" }, "template_parameters": [ { @@ -501,9 +499,9 @@ class NoComment { }; "namespace": "clanguml::t00050", "source_location": { "column": 7, - "file": "../../tests/t00050/t00050.cc", + "file": "t00050.cc", "line": 91, - "translation_unit": "../../tests/t00050/t00050.cc" + "translation_unit": "t00050.cc" }, "template_parameters": [], "type": "class" @@ -523,19 +521,14 @@ class NoComment { }; "namespace": "clanguml::t00050", "source_location": { "column": 7, - "file": "../../tests/t00050/t00050.cc", + "file": "t00050.cc", "line": 93, - "translation_unit": "../../tests/t00050/t00050.cc" + "translation_unit": "t00050.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00050_class", "relationships": [], "using_namespace": "clanguml::t00050" diff --git a/docs/test_cases/t00050_class.svg b/docs/test_cases/t00050_class.svg index 449b3037..f5d5d9e4 100644 --- a/docs/test_cases/t00050_class.svg +++ b/docs/test_cases/t00050_class.svg @@ -1,6 +1,6 @@ - + @@ -9,40 +9,40 @@ - - + + A - - + + B - - + + C - - + + utils::D - - + + E @@ -52,8 +52,8 @@ E3 - - + + F @@ -62,43 +62,43 @@ - + - + t : T[N] - + - + 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. @@ -125,50 +125,50 @@ 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 @@ -181,6 +181,6 @@ N Size of T array. - + diff --git a/docs/test_cases/t00050_class_mermaid.svg b/docs/test_cases/t00050_class_mermaid.svg index d6ba0266..41e5f4ed 100644 --- a/docs/test_cases/t00050_class_mermaid.svg +++ b/docs/test_cases/t00050_class_mermaid.svg @@ -184,7 +184,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -222,7 +222,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -260,7 +260,7 @@ - + @@ -294,7 +294,7 @@ - + @@ -323,7 +323,7 @@ - + @@ -342,7 +342,7 @@ - + diff --git a/docs/test_cases/t00051.md b/docs/test_cases/t00051.md index bd773ca3..0f6587fa 100644 --- a/docs/test_cases/t00051.md +++ b/docs/test_cases/t00051.md @@ -1,18 +1,15 @@ # t00051 - Test case for relative paths in lambda names ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00051_class: type: class glob: - - ../../tests/t00051/t00051.cc + - t00051.cc include: namespaces: - clanguml::t00051 - using_namespace: - - clanguml::t00051 + using_namespace: clanguml::t00051 ``` ## Source code File t00051.cc @@ -114,9 +111,9 @@ A::custom_thread2 A::start_thread2() "name": "f_", "source_location": { "column": 7, - "file": "../../tests/t00051/t00051.cc", + "file": "t00051.cc", "line": 16, - "translation_unit": "../../tests/t00051/t00051.cc" + "translation_unit": "t00051.cc" }, "type": "F" }, @@ -126,9 +123,9 @@ A::custom_thread2 A::start_thread2() "name": "ff_", "source_location": { "column": 8, - "file": "../../tests/t00051/t00051.cc", + "file": "t00051.cc", "line": 17, - "translation_unit": "../../tests/t00051/t00051.cc" + "translation_unit": "t00051.cc" }, "type": "FF" } @@ -162,9 +159,9 @@ A::custom_thread2 A::start_thread2() ], "source_location": { "column": 5, - "file": "../../tests/t00051/t00051.cc", + "file": "t00051.cc", "line": 7, - "translation_unit": "../../tests/t00051/t00051.cc" + "translation_unit": "t00051.cc" }, "type": "void" }, @@ -187,9 +184,9 @@ A::custom_thread2 A::start_thread2() "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00051/t00051.cc", + "file": "t00051.cc", "line": 13, - "translation_unit": "../../tests/t00051/t00051.cc" + "translation_unit": "t00051.cc" }, "type": "void" }, @@ -212,9 +209,9 @@ A::custom_thread2 A::start_thread2() "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00051/t00051.cc", + "file": "t00051.cc", "line": 14, - "translation_unit": "../../tests/t00051/t00051.cc" + "translation_unit": "t00051.cc" }, "type": "void" } @@ -223,9 +220,9 @@ A::custom_thread2 A::start_thread2() "namespace": "clanguml::t00051", "source_location": { "column": 47, - "file": "../../tests/t00051/t00051.cc", + "file": "t00051.cc", "line": 6, - "translation_unit": "../../tests/t00051/t00051.cc" + "translation_unit": "t00051.cc" }, "template_parameters": [ { @@ -253,8 +250,8 @@ A::custom_thread2 A::start_thread2() "name": "std::thread" } ], - "display_name": "clanguml::t00051::B<(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda at ../../tests/t00051/t00051.cc:43:27)>", - "id": "129489662928342298", + "display_name": "clanguml::t00051::B<(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)>", + "id": "1969502737237579476", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -267,11 +264,11 @@ A::custom_thread2 A::start_thread2() "name": "f_", "source_location": { "column": 7, - "file": "../../tests/t00051/t00051.cc", + "file": "t00051.cc", "line": 16, - "translation_unit": "../../tests/t00051/t00051.cc" + "translation_unit": "t00051.cc" }, - "type": "(lambda at ../../tests/t00051/t00051.cc:43:18)" + "type": "(lambda at t00051.cc:43:18)" }, { "access": "public", @@ -279,11 +276,11 @@ A::custom_thread2 A::start_thread2() "name": "ff_", "source_location": { "column": 8, - "file": "../../tests/t00051/t00051.cc", + "file": "t00051.cc", "line": 17, - "translation_unit": "../../tests/t00051/t00051.cc" + "translation_unit": "t00051.cc" }, - "type": "(lambda at ../../tests/t00051/t00051.cc:43:27)" + "type": "(lambda at t00051.cc:43:27)" } ], "methods": [ @@ -306,18 +303,18 @@ A::custom_thread2 A::start_thread2() "parameters": [ { "name": "f", - "type": "(lambda at ../../tests/t00051/t00051.cc:43:18) &&" + "type": "(lambda at t00051.cc:43:18) &&" }, { "name": "ff", - "type": "(lambda at ../../tests/t00051/t00051.cc:43:27) &&" + "type": "(lambda at t00051.cc:43:27) &&" } ], "source_location": { "column": 5, - "file": "../../tests/t00051/t00051.cc", + "file": "t00051.cc", "line": 7, - "translation_unit": "../../tests/t00051/t00051.cc" + "translation_unit": "t00051.cc" }, "type": "void" }, @@ -340,9 +337,9 @@ A::custom_thread2 A::start_thread2() "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00051/t00051.cc", + "file": "t00051.cc", "line": 13, - "translation_unit": "../../tests/t00051/t00051.cc" + "translation_unit": "t00051.cc" }, "type": "void" }, @@ -365,9 +362,9 @@ A::custom_thread2 A::start_thread2() "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00051/t00051.cc", + "file": "t00051.cc", "line": 14, - "translation_unit": "../../tests/t00051/t00051.cc" + "translation_unit": "t00051.cc" }, "type": "void" } @@ -376,22 +373,22 @@ A::custom_thread2 A::start_thread2() "namespace": "clanguml::t00051", "source_location": { "column": 47, - "file": "../../tests/t00051/t00051.cc", + "file": "t00051.cc", "line": 6, - "translation_unit": "../../tests/t00051/t00051.cc" + "translation_unit": "t00051.cc" }, "template_parameters": [ { "is_variadic": false, "kind": "argument", "template_parameters": [], - "type": "(lambda at ../../tests/t00051/t00051.cc:43:18)" + "type": "(lambda at t00051.cc:43:18)" }, { "is_variadic": false, "kind": "argument", "template_parameters": [], - "type": "(lambda at ../../tests/t00051/t00051.cc:43:27)" + "type": "(lambda at t00051.cc:43:27)" } ], "type": "class" @@ -426,9 +423,9 @@ A::custom_thread2 A::start_thread2() "parameters": [], "source_location": { "column": 27, - "file": "../../tests/t00051/t00051.cc", + "file": "t00051.cc", "line": 33, - "translation_unit": "../../tests/t00051/t00051.cc" + "translation_unit": "t00051.cc" }, "type": "custom_thread1" }, @@ -451,9 +448,9 @@ A::custom_thread2 A::start_thread2() "parameters": [], "source_location": { "column": 27, - "file": "../../tests/t00051/t00051.cc", + "file": "t00051.cc", "line": 39, - "translation_unit": "../../tests/t00051/t00051.cc" + "translation_unit": "t00051.cc" }, "type": "custom_thread2" }, @@ -476,11 +473,11 @@ A::custom_thread2 A::start_thread2() "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00051/t00051.cc", + "file": "t00051.cc", "line": 41, - "translation_unit": "../../tests/t00051/t00051.cc" + "translation_unit": "t00051.cc" }, - "type": "clanguml::t00051::B<(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda at ../../tests/t00051/t00051.cc:43:27)>" + "type": "clanguml::t00051::B<(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)>" }, { "access": "private", @@ -501,20 +498,20 @@ A::custom_thread2 A::start_thread2() "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00051/t00051.cc", + "file": "t00051.cc", "line": 46, - "translation_unit": "../../tests/t00051/t00051.cc" + "translation_unit": "t00051.cc" }, - "type": "(lambda at ../../tests/t00051/t00051.cc:48:16)" + "type": "(lambda at t00051.cc:48:16)" } ], "name": "A", "namespace": "clanguml::t00051", "source_location": { "column": 7, - "file": "../../tests/t00051/t00051.cc", + "file": "t00051.cc", "line": 20, - "translation_unit": "../../tests/t00051/t00051.cc" + "translation_unit": "t00051.cc" }, "template_parameters": [], "type": "class" @@ -570,9 +567,9 @@ A::custom_thread2 A::start_thread2() "namespace": "clanguml::t00051", "source_location": { "column": 11, - "file": "../../tests/t00051/t00051.cc", + "file": "t00051.cc", "line": 23, - "translation_unit": "../../tests/t00051/t00051.cc" + "translation_unit": "t00051.cc" }, "template_parameters": [], "type": "class" @@ -614,14 +611,14 @@ A::custom_thread2 A::start_thread2() "parameters": [ { "name": "", - "type": "(lambda at ../../tests/t00051/t00051.cc:59:27) &&" + "type": "(lambda at t00051.cc:59:27) &&" } ], "source_location": { "column": 28, - "file": "../../tests/t00051/t00051.cc", + "file": "t00051.cc", "line": 36, - "translation_unit": "../../tests/t00051/t00051.cc" + "translation_unit": "t00051.cc" }, "type": "void" } @@ -630,19 +627,14 @@ A::custom_thread2 A::start_thread2() "namespace": "clanguml::t00051", "source_location": { "column": 11, - "file": "../../tests/t00051/t00051.cc", + "file": "t00051.cc", "line": 35, - "translation_unit": "../../tests/t00051/t00051.cc" + "translation_unit": "t00051.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00051_class", "relationships": [ { @@ -654,18 +646,18 @@ A::custom_thread2 A::start_thread2() { "access": "public", "destination": "486675674447050206", - "source": "129489662928342298", + "source": "1969502737237579476", "type": "instantiation" }, { "access": "private", "destination": "1911564114172366679", - "source": "129489662928342298", + "source": "1969502737237579476", "type": "extension" }, { "access": "public", - "destination": "129489662928342298", + "destination": "1969502737237579476", "source": "1064663612772326174", "type": "dependency" }, diff --git a/docs/test_cases/t00051_class.svg b/docs/test_cases/t00051_class.svg index 34a8ffb7..5f1e7a2f 100644 --- a/docs/test_cases/t00051_class.svg +++ b/docs/test_cases/t00051_class.svg @@ -1,6 +1,6 @@ - + - + @@ -9,134 +9,136 @@ - - - - - B - - F,FF=F - + + + + + B + + F,FF=F + - - - + + + - - B(F && f, FF && ff) : void + + B(F && f, FF && ff) : void - - - - + + + + - - f() : void + + f() : void - - - + + + - - ff() : void + + ff() : void - - - - + + + + - - f_ : F + + f_ : F - - - + + + - - ff_ : FF + + ff_ : FF - - - - - B<(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda at ../../tests/t00051/t00051.cc:43:27)> - + + + + + B + + (lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27) + - - - + + + - - B((lambda at ../../tests/t00051/t00051.cc:43:18) && f, (lambda at ../../tests/t00051/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 - - - - + + + + - - f_ : (lambda at ../../tests/t00051/t00051.cc:43:18) + + f_ : (lambda at t00051.cc:43:18) - - - + + + - - ff_ : (lambda at ../../tests/t00051/t00051.cc:43:27) + + ff_ : (lambda at t00051.cc:43:27) - - - - - A - + + + + + A + - - - + + + - - get_function() : (lambda at ../../tests/t00051/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 ../../tests/t00051/t00051.cc:43:18),(lambda at ../../tests/t00051/t00051.cc:43:27)> + + start_thread3() : B<(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)> - - - + + + A::custom_thread1 @@ -145,32 +147,32 @@ custom_thread1<Function,Args...>(Function && f, Args &&... args) : void - - - - - A::custom_thread2 - + + + + + A::custom_thread2 + - + - - thread((lambda at ../../tests/t00051/t00051.cc:59:27) &&) : void + + 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 d9b2b0cb..ea1b82ab 100644 --- a/docs/test_cases/t00051_class_mermaid.svg +++ b/docs/test_cases/t00051_class_mermaid.svg @@ -1,4 +1,4 @@ - + @@ -50,10 +50,10 @@ - - - - + + + + @@ -102,7 +102,7 @@ - + @@ -146,43 +146,43 @@ - - - - - + + + + +
- +
- B<(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda at ../../tests/t00051/t00051.cc:43:27)> + B<(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)>
- +
- +f_ : (lambda at ../../tests/t00051/t00051.cc:43:18) + +f_ : (lambda at t00051.cc:43:18)
- +
- +ff_ : (lambda at ../../tests/t00051/t00051.cc:43:27) + +ff_ : (lambda at t00051.cc:43:27)
- +
- +B((lambda at ../../tests/t00051/t00051.cc:43:18) && f, (lambda at ../../tests/t00051/t00051.cc:43:27) && ff) : void + +B((lambda at t00051.cc:43:18) && f, (lambda at t00051.cc:43:27) && ff) : void
- +
+f() : void
- +
+ff() : void
@@ -190,11 +190,11 @@ - + - - - + + +
@@ -206,30 +206,30 @@ A
- +
- -get_function() : (lambda at ../../tests/t00051/t00051.cc:48:16) + -get_function() : (lambda at t00051.cc:48:16)
- +
-start_thread1() : custom_thread1
- +
-start_thread2() : custom_thread2
- +
- -start_thread3() : B<(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda at ../../tests/t00051/t00051.cc:43:27)> + -start_thread3() : B<(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)>
- + @@ -253,11 +253,11 @@ - + - - - + + +
@@ -269,9 +269,9 @@ A::custom_thread2
- +
- +thread((lambda at ../../tests/t00051/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 29d81d70..93ab2c7b 100644 --- a/docs/test_cases/t00052.md +++ b/docs/test_cases/t00052.md @@ -1,18 +1,15 @@ # t00052 - Test case for template methods rendering ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00052_class: type: class glob: - - ../../tests/t00052/t00052.cc + - t00052.cc include: namespaces: - clanguml::t00052 - using_namespace: - - clanguml::t00052 + using_namespace: clanguml::t00052 ``` ## Source code File t00052.cc @@ -130,9 +127,9 @@ struct R { "namespace": "clanguml::t00052", "source_location": { "column": 7, - "file": "../../tests/t00052/t00052.cc", + "file": "t00052.cc", "line": 6, - "translation_unit": "../../tests/t00052/t00052.cc" + "translation_unit": "t00052.cc" }, "template_parameters": [], "type": "class" @@ -172,9 +169,9 @@ struct R { ], "source_location": { "column": 7, - "file": "../../tests/t00052/t00052.cc", + "file": "t00052.cc", "line": 15, - "translation_unit": "../../tests/t00052/t00052.cc" + "translation_unit": "t00052.cc" }, "type": "T" }, @@ -211,9 +208,9 @@ struct R { "namespace": "clanguml::t00052", "source_location": { "column": 29, - "file": "../../tests/t00052/t00052.cc", + "file": "t00052.cc", "line": 13, - "translation_unit": "../../tests/t00052/t00052.cc" + "translation_unit": "t00052.cc" }, "template_parameters": [ { @@ -265,9 +262,9 @@ struct R { "namespace": "clanguml::t00052", "source_location": { "column": 29, - "file": "../../tests/t00052/t00052.cc", + "file": "t00052.cc", "line": 20, - "translation_unit": "../../tests/t00052/t00052.cc" + "translation_unit": "t00052.cc" }, "template_parameters": [ { @@ -294,9 +291,9 @@ struct R { "namespace": "clanguml::t00052", "source_location": { "column": 29, - "file": "../../tests/t00052/t00052.cc", + "file": "t00052.cc", "line": 13, - "translation_unit": "../../tests/t00052/t00052.cc" + "translation_unit": "t00052.cc" }, "template_parameters": [ { @@ -323,9 +320,9 @@ struct R { "namespace": "clanguml::t00052", "source_location": { "column": 29, - "file": "../../tests/t00052/t00052.cc", + "file": "t00052.cc", "line": 20, - "translation_unit": "../../tests/t00052/t00052.cc" + "translation_unit": "t00052.cc" }, "template_parameters": [ { @@ -353,9 +350,9 @@ struct R { "name": "a", "source_location": { "column": 7, - "file": "../../tests/t00052/t00052.cc", + "file": "t00052.cc", "line": 30, - "translation_unit": "../../tests/t00052/t00052.cc" + "translation_unit": "t00052.cc" }, "type": "A" }, @@ -365,9 +362,9 @@ struct R { "name": "b", "source_location": { "column": 12, - "file": "../../tests/t00052/t00052.cc", + "file": "t00052.cc", "line": 31, - "translation_unit": "../../tests/t00052/t00052.cc" + "translation_unit": "t00052.cc" }, "type": "B" }, @@ -377,9 +374,9 @@ struct R { "name": "c", "source_location": { "column": 12, - "file": "../../tests/t00052/t00052.cc", + "file": "t00052.cc", "line": 32, - "translation_unit": "../../tests/t00052/t00052.cc" + "translation_unit": "t00052.cc" }, "type": "C" } @@ -389,19 +386,14 @@ struct R { "namespace": "clanguml::t00052", "source_location": { "column": 8, - "file": "../../tests/t00052/t00052.cc", + "file": "t00052.cc", "line": 29, - "translation_unit": "../../tests/t00052/t00052.cc" + "translation_unit": "t00052.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00052_class", "relationships": [ { diff --git a/docs/test_cases/t00052_class.svg b/docs/test_cases/t00052_class.svg index 4db0d19e..68532f2d 100644 --- a/docs/test_cases/t00052_class.svg +++ b/docs/test_cases/t00052_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + A @@ -21,8 +21,8 @@ aa<F,Q>(F && f, Q q) : void - - + + B @@ -30,18 +30,18 @@ T - + - + b(T t) : T bb<F>(F && f, T t) : T - - + + C @@ -52,8 +52,8 @@ c<P>(P p) : T - - + + B @@ -62,8 +62,8 @@ - - + + C @@ -72,33 +72,33 @@ - - + + R - + - + a : A - + - + b : B<int> - + - + c : C<int> diff --git a/docs/test_cases/t00052_class_mermaid.svg b/docs/test_cases/t00052_class_mermaid.svg index 2544cd0d..1651b0f9 100644 --- a/docs/test_cases/t00052_class_mermaid.svg +++ b/docs/test_cases/t00052_class_mermaid.svg @@ -114,7 +114,7 @@ - + @@ -143,7 +143,7 @@ - + @@ -172,7 +172,7 @@ - + @@ -196,7 +196,7 @@ - + @@ -215,7 +215,7 @@ - + @@ -234,7 +234,7 @@ - + diff --git a/docs/test_cases/t00053.md b/docs/test_cases/t00053.md index 9ea8d587..d9b65f96 100644 --- a/docs/test_cases/t00053.md +++ b/docs/test_cases/t00053.md @@ -1,18 +1,15 @@ # t00053 - Test case for `together` layout hint in class diagram ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00053_class: type: class glob: - - ../../tests/t00053/t00053.cc + - t00053.cc include: namespaces: - clanguml::t00053 - using_namespace: - - clanguml::t00053 + using_namespace: clanguml::t00053 layout: a: - together: [c,e,f] @@ -74,9 +71,9 @@ enum class j { jjj }; "namespace": "clanguml::t00053", "source_location": { "column": 8, - "file": "../../tests/t00053/t00053.cc", + "file": "t00053.cc", "line": 3, - "translation_unit": "../../tests/t00053/t00053.cc" + "translation_unit": "t00053.cc" }, "template_parameters": [], "type": "class" @@ -96,9 +93,9 @@ enum class j { jjj }; "namespace": "clanguml::t00053", "source_location": { "column": 8, - "file": "../../tests/t00053/t00053.cc", + "file": "t00053.cc", "line": 4, - "translation_unit": "../../tests/t00053/t00053.cc" + "translation_unit": "t00053.cc" }, "template_parameters": [], "type": "class" @@ -118,9 +115,9 @@ enum class j { jjj }; "namespace": "clanguml::t00053", "source_location": { "column": 8, - "file": "../../tests/t00053/t00053.cc", + "file": "t00053.cc", "line": 5, - "translation_unit": "../../tests/t00053/t00053.cc" + "translation_unit": "t00053.cc" }, "template_parameters": [], "type": "class" @@ -140,9 +137,9 @@ enum class j { jjj }; "namespace": "clanguml::t00053", "source_location": { "column": 8, - "file": "../../tests/t00053/t00053.cc", + "file": "t00053.cc", "line": 6, - "translation_unit": "../../tests/t00053/t00053.cc" + "translation_unit": "t00053.cc" }, "template_parameters": [], "type": "class" @@ -162,9 +159,9 @@ enum class j { jjj }; "namespace": "clanguml::t00053", "source_location": { "column": 8, - "file": "../../tests/t00053/t00053.cc", + "file": "t00053.cc", "line": 7, - "translation_unit": "../../tests/t00053/t00053.cc" + "translation_unit": "t00053.cc" }, "template_parameters": [], "type": "class" @@ -184,9 +181,9 @@ enum class j { jjj }; "namespace": "clanguml::t00053", "source_location": { "column": 8, - "file": "../../tests/t00053/t00053.cc", + "file": "t00053.cc", "line": 8, - "translation_unit": "../../tests/t00053/t00053.cc" + "translation_unit": "t00053.cc" }, "template_parameters": [], "type": "class" @@ -206,9 +203,9 @@ enum class j { jjj }; "namespace": "clanguml::t00053", "source_location": { "column": 8, - "file": "../../tests/t00053/t00053.cc", + "file": "t00053.cc", "line": 9, - "translation_unit": "../../tests/t00053/t00053.cc" + "translation_unit": "t00053.cc" }, "template_parameters": [], "type": "class" @@ -228,9 +225,9 @@ enum class j { jjj }; "namespace": "clanguml::t00053", "source_location": { "column": 8, - "file": "../../tests/t00053/t00053.cc", + "file": "t00053.cc", "line": 11, - "translation_unit": "../../tests/t00053/t00053.cc" + "translation_unit": "t00053.cc" }, "template_parameters": [], "type": "class" @@ -250,9 +247,9 @@ enum class j { jjj }; "namespace": "clanguml::t00053", "source_location": { "column": 8, - "file": "../../tests/t00053/t00053.cc", + "file": "t00053.cc", "line": 12, - "translation_unit": "../../tests/t00053/t00053.cc" + "translation_unit": "t00053.cc" }, "template_parameters": [], "type": "class" @@ -272,9 +269,9 @@ enum class j { jjj }; "namespace": "clanguml::t00053", "source_location": { "column": 8, - "file": "../../tests/t00053/t00053.cc", + "file": "t00053.cc", "line": 13, - "translation_unit": "../../tests/t00053/t00053.cc" + "translation_unit": "t00053.cc" }, "template_parameters": [], "type": "class" @@ -294,9 +291,9 @@ enum class j { jjj }; "namespace": "clanguml::t00053", "source_location": { "column": 8, - "file": "../../tests/t00053/t00053.cc", + "file": "t00053.cc", "line": 14, - "translation_unit": "../../tests/t00053/t00053.cc" + "translation_unit": "t00053.cc" }, "template_parameters": [], "type": "class" @@ -316,9 +313,9 @@ enum class j { jjj }; "namespace": "clanguml::t00053", "source_location": { "column": 8, - "file": "../../tests/t00053/t00053.cc", + "file": "t00053.cc", "line": 15, - "translation_unit": "../../tests/t00053/t00053.cc" + "translation_unit": "t00053.cc" }, "template_parameters": [], "type": "class" @@ -338,9 +335,9 @@ enum class j { jjj }; "namespace": "clanguml::t00053", "source_location": { "column": 8, - "file": "../../tests/t00053/t00053.cc", + "file": "t00053.cc", "line": 16, - "translation_unit": "../../tests/t00053/t00053.cc" + "translation_unit": "t00053.cc" }, "template_parameters": [], "type": "class" @@ -360,9 +357,9 @@ enum class j { jjj }; "namespace": "clanguml::t00053", "source_location": { "column": 8, - "file": "../../tests/t00053/t00053.cc", + "file": "t00053.cc", "line": 17, - "translation_unit": "../../tests/t00053/t00053.cc" + "translation_unit": "t00053.cc" }, "template_parameters": [], "type": "class" @@ -378,9 +375,9 @@ enum class j { jjj }; "namespace": "clanguml::t00053", "source_location": { "column": 12, - "file": "../../tests/t00053/t00053.cc", + "file": "t00053.cc", "line": 19, - "translation_unit": "../../tests/t00053/t00053.cc" + "translation_unit": "t00053.cc" }, "type": "enum" }, @@ -395,9 +392,9 @@ enum class j { jjj }; "namespace": "clanguml::t00053", "source_location": { "column": 12, - "file": "../../tests/t00053/t00053.cc", + "file": "t00053.cc", "line": 20, - "translation_unit": "../../tests/t00053/t00053.cc" + "translation_unit": "t00053.cc" }, "type": "enum" }, @@ -412,18 +409,13 @@ enum class j { jjj }; "namespace": "clanguml::t00053", "source_location": { "column": 12, - "file": "../../tests/t00053/t00053.cc", + "file": "t00053.cc", "line": 21, - "translation_unit": "../../tests/t00053/t00053.cc" + "translation_unit": "t00053.cc" }, "type": "enum" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00053_class", "relationships": [], "using_namespace": "clanguml::t00053" diff --git a/docs/test_cases/t00053_class.svg b/docs/test_cases/t00053_class.svg index a1143d41..14045d91 100644 --- a/docs/test_cases/t00053_class.svg +++ b/docs/test_cases/t00053_class.svg @@ -1,6 +1,6 @@ - + @@ -9,72 +9,72 @@ - - + + A - - + + C - - + + E - - + + F - - + + a - - + + c - - + + e - - + + f - - + + h @@ -82,8 +82,8 @@ hhh - - + + j @@ -91,56 +91,56 @@ jjj - - + + b - - + + d - - + + g - - + + B - - + + D - - + + G - - + + i diff --git a/docs/test_cases/t00053_class_mermaid.svg b/docs/test_cases/t00053_class_mermaid.svg index b5934781..dffe90d4 100644 --- a/docs/test_cases/t00053_class_mermaid.svg +++ b/docs/test_cases/t00053_class_mermaid.svg @@ -52,7 +52,7 @@ - + @@ -71,7 +71,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -166,7 +166,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -247,7 +247,7 @@ - + @@ -266,7 +266,7 @@ - + @@ -285,7 +285,7 @@ - + @@ -304,7 +304,7 @@ - + @@ -323,7 +323,7 @@ - + @@ -342,7 +342,7 @@ - + @@ -366,7 +366,7 @@ - + diff --git a/docs/test_cases/t00054.md b/docs/test_cases/t00054.md index 1a13b7e0..02353751 100644 --- a/docs/test_cases/t00054.md +++ b/docs/test_cases/t00054.md @@ -1,18 +1,15 @@ # t00054 - Test case for `together` layout hint in class diagram with rendered namespaces ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00054_class: type: class glob: - - ../../tests/t00054/t00054.cc + - t00054.cc include: namespaces: - clanguml::t00054 - using_namespace: - - clanguml::t00054 + using_namespace: clanguml::t00054 generate_packages: true layout: a: @@ -88,9 +85,9 @@ enum class j { jjj }; "namespace": "clanguml::t00054", "source_location": { "column": 8, - "file": "../../tests/t00054/t00054.cc", + "file": "t00054.cc", "line": 3, - "translation_unit": "../../tests/t00054/t00054.cc" + "translation_unit": "t00054.cc" }, "template_parameters": [], "type": "class" @@ -110,9 +107,9 @@ enum class j { jjj }; "namespace": "clanguml::t00054", "source_location": { "column": 8, - "file": "../../tests/t00054/t00054.cc", + "file": "t00054.cc", "line": 4, - "translation_unit": "../../tests/t00054/t00054.cc" + "translation_unit": "t00054.cc" }, "template_parameters": [], "type": "class" @@ -135,9 +132,9 @@ enum class j { jjj }; "namespace": "clanguml::t00054::detail", "source_location": { "column": 8, - "file": "../../tests/t00054/t00054.cc", + "file": "t00054.cc", "line": 7, - "translation_unit": "../../tests/t00054/t00054.cc" + "translation_unit": "t00054.cc" }, "template_parameters": [], "type": "class" @@ -157,9 +154,9 @@ enum class j { jjj }; "namespace": "clanguml::t00054::detail", "source_location": { "column": 8, - "file": "../../tests/t00054/t00054.cc", + "file": "t00054.cc", "line": 8, - "translation_unit": "../../tests/t00054/t00054.cc" + "translation_unit": "t00054.cc" }, "template_parameters": [], "type": "class" @@ -179,9 +176,9 @@ enum class j { jjj }; "namespace": "clanguml::t00054::detail", "source_location": { "column": 8, - "file": "../../tests/t00054/t00054.cc", + "file": "t00054.cc", "line": 9, - "translation_unit": "../../tests/t00054/t00054.cc" + "translation_unit": "t00054.cc" }, "template_parameters": [], "type": "class" @@ -205,9 +202,9 @@ enum class j { jjj }; "namespace": "clanguml::t00054", "source_location": { "column": 8, - "file": "../../tests/t00054/t00054.cc", + "file": "t00054.cc", "line": 11, - "translation_unit": "../../tests/t00054/t00054.cc" + "translation_unit": "t00054.cc" }, "template_parameters": [], "type": "class" @@ -227,9 +224,9 @@ enum class j { jjj }; "namespace": "clanguml::t00054", "source_location": { "column": 8, - "file": "../../tests/t00054/t00054.cc", + "file": "t00054.cc", "line": 12, - "translation_unit": "../../tests/t00054/t00054.cc" + "translation_unit": "t00054.cc" }, "template_parameters": [], "type": "class" @@ -249,9 +246,9 @@ enum class j { jjj }; "namespace": "clanguml::t00054", "source_location": { "column": 8, - "file": "../../tests/t00054/t00054.cc", + "file": "t00054.cc", "line": 14, - "translation_unit": "../../tests/t00054/t00054.cc" + "translation_unit": "t00054.cc" }, "template_parameters": [], "type": "class" @@ -271,9 +268,9 @@ enum class j { jjj }; "namespace": "clanguml::t00054", "source_location": { "column": 8, - "file": "../../tests/t00054/t00054.cc", + "file": "t00054.cc", "line": 15, - "translation_unit": "../../tests/t00054/t00054.cc" + "translation_unit": "t00054.cc" }, "template_parameters": [], "type": "class" @@ -296,9 +293,9 @@ enum class j { jjj }; "namespace": "clanguml::t00054::detail2", "source_location": { "column": 8, - "file": "../../tests/t00054/t00054.cc", + "file": "t00054.cc", "line": 18, - "translation_unit": "../../tests/t00054/t00054.cc" + "translation_unit": "t00054.cc" }, "template_parameters": [], "type": "class" @@ -321,9 +318,9 @@ enum class j { jjj }; "namespace": "clanguml::t00054::detail2::detail3", "source_location": { "column": 8, - "file": "../../tests/t00054/t00054.cc", + "file": "t00054.cc", "line": 20, - "translation_unit": "../../tests/t00054/t00054.cc" + "translation_unit": "t00054.cc" }, "template_parameters": [], "type": "class" @@ -343,9 +340,9 @@ enum class j { jjj }; "namespace": "clanguml::t00054::detail2::detail3", "source_location": { "column": 8, - "file": "../../tests/t00054/t00054.cc", + "file": "t00054.cc", "line": 21, - "translation_unit": "../../tests/t00054/t00054.cc" + "translation_unit": "t00054.cc" }, "template_parameters": [], "type": "class" @@ -369,9 +366,9 @@ enum class j { jjj }; "namespace": "clanguml::t00054::detail2", "source_location": { "column": 8, - "file": "../../tests/t00054/t00054.cc", + "file": "t00054.cc", "line": 23, - "translation_unit": "../../tests/t00054/t00054.cc" + "translation_unit": "t00054.cc" }, "template_parameters": [], "type": "class" @@ -395,9 +392,9 @@ enum class j { jjj }; "namespace": "clanguml::t00054", "source_location": { "column": 8, - "file": "../../tests/t00054/t00054.cc", + "file": "t00054.cc", "line": 25, - "translation_unit": "../../tests/t00054/t00054.cc" + "translation_unit": "t00054.cc" }, "template_parameters": [], "type": "class" @@ -416,9 +413,9 @@ enum class j { jjj }; "namespace": "clanguml::t00054::detail4", "source_location": { "column": 12, - "file": "../../tests/t00054/t00054.cc", + "file": "t00054.cc", "line": 28, - "translation_unit": "../../tests/t00054/t00054.cc" + "translation_unit": "t00054.cc" }, "type": "enum" }, @@ -433,9 +430,9 @@ enum class j { jjj }; "namespace": "clanguml::t00054::detail4", "source_location": { "column": 12, - "file": "../../tests/t00054/t00054.cc", + "file": "t00054.cc", "line": 29, - "translation_unit": "../../tests/t00054/t00054.cc" + "translation_unit": "t00054.cc" }, "type": "enum" }, @@ -450,9 +447,9 @@ enum class j { jjj }; "namespace": "clanguml::t00054::detail4", "source_location": { "column": 12, - "file": "../../tests/t00054/t00054.cc", + "file": "t00054.cc", "line": 30, - "translation_unit": "../../tests/t00054/t00054.cc" + "translation_unit": "t00054.cc" }, "type": "enum" } @@ -461,11 +458,6 @@ enum class j { jjj }; "type": "namespace" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00054_class", "relationships": [], "using_namespace": "clanguml::t00054" diff --git a/docs/test_cases/t00054_class.svg b/docs/test_cases/t00054_class.svg index 45fd451a..00f38a2c 100644 --- a/docs/test_cases/t00054_class.svg +++ b/docs/test_cases/t00054_class.svg @@ -1,6 +1,6 @@ - + @@ -9,28 +9,28 @@ - + detail - + detail2 - + detail3 - + detail4 - - + + d - - + + a @@ -40,8 +40,8 @@ - - + + c @@ -51,8 +51,8 @@ - - + + e @@ -62,40 +62,40 @@ - - + + C - - + + F - - + + D - - + + E - - + + A @@ -104,8 +104,8 @@ - - + + B @@ -114,8 +114,8 @@ - - + + f @@ -124,8 +124,8 @@ - - + + G @@ -133,8 +133,8 @@ - - + + h @@ -143,8 +143,8 @@ hhh - - + + i @@ -153,8 +153,8 @@ iii - - + + j @@ -163,16 +163,16 @@ jjj - - + + b - - + + g diff --git a/docs/test_cases/t00054_class_mermaid.svg b/docs/test_cases/t00054_class_mermaid.svg index 3dd1fb5e..29378f3e 100644 --- a/docs/test_cases/t00054_class_mermaid.svg +++ b/docs/test_cases/t00054_class_mermaid.svg @@ -52,7 +52,7 @@ - + @@ -71,7 +71,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -166,7 +166,7 @@ - + @@ -185,7 +185,7 @@ - + @@ -204,7 +204,7 @@ - + @@ -223,7 +223,7 @@ - + @@ -242,7 +242,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -304,7 +304,7 @@ - + @@ -328,7 +328,7 @@ - + @@ -352,7 +352,7 @@ - + @@ -371,7 +371,7 @@ - + diff --git a/docs/test_cases/t00055.md b/docs/test_cases/t00055.md index 1ebf1a0a..d6889792 100644 --- a/docs/test_cases/t00055.md +++ b/docs/test_cases/t00055.md @@ -1,18 +1,15 @@ # t00055 - Test case for `row` and `column` layout hints ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00055_class: type: class glob: - - ../../tests/t00055/t00055.cc + - t00055.cc include: namespaces: - clanguml::t00055 - using_namespace: - - clanguml::t00055 + using_namespace: clanguml::t00055 layout: A: - row: [C, E, G, I] @@ -61,9 +58,9 @@ struct J { }; "namespace": "clanguml::t00055", "source_location": { "column": 8, - "file": "../../tests/t00055/t00055.cc", + "file": "t00055.cc", "line": 3, - "translation_unit": "../../tests/t00055/t00055.cc" + "translation_unit": "t00055.cc" }, "template_parameters": [], "type": "class" @@ -83,9 +80,9 @@ struct J { }; "namespace": "clanguml::t00055", "source_location": { "column": 8, - "file": "../../tests/t00055/t00055.cc", + "file": "t00055.cc", "line": 4, - "translation_unit": "../../tests/t00055/t00055.cc" + "translation_unit": "t00055.cc" }, "template_parameters": [], "type": "class" @@ -105,9 +102,9 @@ struct J { }; "namespace": "clanguml::t00055", "source_location": { "column": 8, - "file": "../../tests/t00055/t00055.cc", + "file": "t00055.cc", "line": 5, - "translation_unit": "../../tests/t00055/t00055.cc" + "translation_unit": "t00055.cc" }, "template_parameters": [], "type": "class" @@ -127,9 +124,9 @@ struct J { }; "namespace": "clanguml::t00055", "source_location": { "column": 8, - "file": "../../tests/t00055/t00055.cc", + "file": "t00055.cc", "line": 6, - "translation_unit": "../../tests/t00055/t00055.cc" + "translation_unit": "t00055.cc" }, "template_parameters": [], "type": "class" @@ -149,9 +146,9 @@ struct J { }; "namespace": "clanguml::t00055", "source_location": { "column": 8, - "file": "../../tests/t00055/t00055.cc", + "file": "t00055.cc", "line": 7, - "translation_unit": "../../tests/t00055/t00055.cc" + "translation_unit": "t00055.cc" }, "template_parameters": [], "type": "class" @@ -171,9 +168,9 @@ struct J { }; "namespace": "clanguml::t00055", "source_location": { "column": 8, - "file": "../../tests/t00055/t00055.cc", + "file": "t00055.cc", "line": 8, - "translation_unit": "../../tests/t00055/t00055.cc" + "translation_unit": "t00055.cc" }, "template_parameters": [], "type": "class" @@ -193,9 +190,9 @@ struct J { }; "namespace": "clanguml::t00055", "source_location": { "column": 8, - "file": "../../tests/t00055/t00055.cc", + "file": "t00055.cc", "line": 9, - "translation_unit": "../../tests/t00055/t00055.cc" + "translation_unit": "t00055.cc" }, "template_parameters": [], "type": "class" @@ -215,9 +212,9 @@ struct J { }; "namespace": "clanguml::t00055", "source_location": { "column": 8, - "file": "../../tests/t00055/t00055.cc", + "file": "t00055.cc", "line": 10, - "translation_unit": "../../tests/t00055/t00055.cc" + "translation_unit": "t00055.cc" }, "template_parameters": [], "type": "class" @@ -237,9 +234,9 @@ struct J { }; "namespace": "clanguml::t00055", "source_location": { "column": 8, - "file": "../../tests/t00055/t00055.cc", + "file": "t00055.cc", "line": 11, - "translation_unit": "../../tests/t00055/t00055.cc" + "translation_unit": "t00055.cc" }, "template_parameters": [], "type": "class" @@ -259,19 +256,14 @@ struct J { }; "namespace": "clanguml::t00055", "source_location": { "column": 8, - "file": "../../tests/t00055/t00055.cc", + "file": "t00055.cc", "line": 12, - "translation_unit": "../../tests/t00055/t00055.cc" + "translation_unit": "t00055.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00055_class", "relationships": [], "using_namespace": "clanguml::t00055" diff --git a/docs/test_cases/t00055_class.svg b/docs/test_cases/t00055_class.svg index cdf72aef..5453b627 100644 --- a/docs/test_cases/t00055_class.svg +++ b/docs/test_cases/t00055_class.svg @@ -1,6 +1,6 @@ - + @@ -9,80 +9,80 @@ - - + + A - - + + B - - + + C - - + + D - - + + E - - + + F - - + + G - - + + H - - + + I - - + + J diff --git a/docs/test_cases/t00055_class_mermaid.svg b/docs/test_cases/t00055_class_mermaid.svg index 2a153423..0d553664 100644 --- a/docs/test_cases/t00055_class_mermaid.svg +++ b/docs/test_cases/t00055_class_mermaid.svg @@ -52,7 +52,7 @@ - + @@ -71,7 +71,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -166,7 +166,7 @@ - + @@ -185,7 +185,7 @@ - + @@ -204,7 +204,7 @@ - + @@ -223,7 +223,7 @@ - + diff --git a/docs/test_cases/t00056.md b/docs/test_cases/t00056.md index 42cb5d84..9c5f8104 100644 --- a/docs/test_cases/t00056.md +++ b/docs/test_cases/t00056.md @@ -1,18 +1,15 @@ # t00056 - Basic C++20 concepts test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00056_class: type: class glob: - - ../../tests/t00056/t00056.cc + - t00056.cc include: namespaces: - clanguml::t00056 - using_namespace: - - clanguml::t00056 + using_namespace: clanguml::t00056 ``` ## Source code File t00056.cc @@ -129,9 +126,9 @@ struct F { "parameters": [], "source_location": { "column": 9, - "file": "../../tests/t00056/t00056.cc", + "file": "t00056.cc", "line": 8, - "translation_unit": "../../tests/t00056/t00056.cc" + "translation_unit": "t00056.cc" }, "statements": [], "type": "concept" @@ -153,9 +150,9 @@ struct F { ], "source_location": { "column": 9, - "file": "../../tests/t00056/t00056.cc", + "file": "t00056.cc", "line": 11, - "translation_unit": "../../tests/t00056/t00056.cc" + "translation_unit": "t00056.cc" }, "statements": [ "sizeof (l) > sizeof (r)" @@ -170,9 +167,9 @@ struct F { "parameters": [], "source_location": { "column": 9, - "file": "../../tests/t00056/t00056.cc", + "file": "t00056.cc", "line": 16, - "translation_unit": "../../tests/t00056/t00056.cc" + "translation_unit": "t00056.cc" }, "statements": [], "type": "concept" @@ -190,9 +187,9 @@ struct F { ], "source_location": { "column": 9, - "file": "../../tests/t00056/t00056.cc", + "file": "t00056.cc", "line": 20, - "translation_unit": "../../tests/t00056/t00056.cc" + "translation_unit": "t00056.cc" }, "statements": [ "container.begin()", @@ -208,9 +205,9 @@ struct F { "parameters": [], "source_location": { "column": 9, - "file": "../../tests/t00056/t00056.cc", + "file": "t00056.cc", "line": 27, - "translation_unit": "../../tests/t00056/t00056.cc" + "translation_unit": "t00056.cc" }, "statements": [ "typename T::value_type" @@ -230,9 +227,9 @@ struct F { ], "source_location": { "column": 9, - "file": "../../tests/t00056/t00056.cc", + "file": "t00056.cc", "line": 30, - "translation_unit": "../../tests/t00056/t00056.cc" + "translation_unit": "t00056.cc" }, "statements": [ "std::string{s}", @@ -249,9 +246,9 @@ struct F { "parameters": [], "source_location": { "column": 9, - "file": "../../tests/t00056/t00056.cc", + "file": "t00056.cc", "line": 46, - "translation_unit": "../../tests/t00056/t00056.cc" + "translation_unit": "t00056.cc" }, "statements": [], "type": "concept" @@ -264,9 +261,9 @@ struct F { "parameters": [], "source_location": { "column": 9, - "file": "../../tests/t00056/t00056.cc", + "file": "t00056.cc", "line": 49, - "translation_unit": "../../tests/t00056/t00056.cc" + "translation_unit": "t00056.cc" }, "statements": [], "type": "concept" @@ -287,9 +284,9 @@ struct F { "name": "a", "source_location": { "column": 7, - "file": "../../tests/t00056/t00056.cc", + "file": "t00056.cc", "line": 54, - "translation_unit": "../../tests/t00056/t00056.cc" + "translation_unit": "t00056.cc" }, "type": "T" } @@ -299,9 +296,9 @@ struct F { "namespace": "clanguml::t00056", "source_location": { "column": 36, - "file": "../../tests/t00056/t00056.cc", + "file": "t00056.cc", "line": 53, - "translation_unit": "../../tests/t00056/t00056.cc" + "translation_unit": "t00056.cc" }, "template_parameters": [ { @@ -329,9 +326,9 @@ struct F { "name": "b", "source_location": { "column": 7, - "file": "../../tests/t00056/t00056.cc", + "file": "t00056.cc", "line": 61, - "translation_unit": "../../tests/t00056/t00056.cc" + "translation_unit": "t00056.cc" }, "type": "T" } @@ -341,9 +338,9 @@ struct F { "namespace": "clanguml::t00056", "source_location": { "column": 8, - "file": "../../tests/t00056/t00056.cc", + "file": "t00056.cc", "line": 60, - "translation_unit": "../../tests/t00056/t00056.cc" + "translation_unit": "t00056.cc" }, "template_parameters": [ { @@ -371,9 +368,9 @@ struct F { "name": "c", "source_location": { "column": 7, - "file": "../../tests/t00056/t00056.cc", + "file": "t00056.cc", "line": 71, - "translation_unit": "../../tests/t00056/t00056.cc" + "translation_unit": "t00056.cc" }, "type": "T" } @@ -383,9 +380,9 @@ struct F { "namespace": "clanguml::t00056", "source_location": { "column": 8, - "file": "../../tests/t00056/t00056.cc", + "file": "t00056.cc", "line": 70, - "translation_unit": "../../tests/t00056/t00056.cc" + "translation_unit": "t00056.cc" }, "template_parameters": [ { @@ -412,9 +409,9 @@ struct F { "namespace": "clanguml::t00056", "source_location": { "column": 8, - "file": "../../tests/t00056/t00056.cc", + "file": "t00056.cc", "line": 76, - "translation_unit": "../../tests/t00056/t00056.cc" + "translation_unit": "t00056.cc" }, "template_parameters": [ { @@ -466,9 +463,9 @@ struct F { "name": "e1", "source_location": { "column": 8, - "file": "../../tests/t00056/t00056.cc", + "file": "t00056.cc", "line": 81, - "translation_unit": "../../tests/t00056/t00056.cc" + "translation_unit": "t00056.cc" }, "type": "T1" }, @@ -478,9 +475,9 @@ struct F { "name": "e2", "source_location": { "column": 8, - "file": "../../tests/t00056/t00056.cc", + "file": "t00056.cc", "line": 82, - "translation_unit": "../../tests/t00056/t00056.cc" + "translation_unit": "t00056.cc" }, "type": "T2" }, @@ -490,9 +487,9 @@ struct F { "name": "e3", "source_location": { "column": 8, - "file": "../../tests/t00056/t00056.cc", + "file": "t00056.cc", "line": 83, - "translation_unit": "../../tests/t00056/t00056.cc" + "translation_unit": "t00056.cc" }, "type": "T3" } @@ -502,9 +499,9 @@ struct F { "namespace": "clanguml::t00056", "source_location": { "column": 8, - "file": "../../tests/t00056/t00056.cc", + "file": "t00056.cc", "line": 80, - "translation_unit": "../../tests/t00056/t00056.cc" + "translation_unit": "t00056.cc" }, "template_parameters": [ { @@ -544,9 +541,9 @@ struct F { "name": "f1", "source_location": { "column": 8, - "file": "../../tests/t00056/t00056.cc", + "file": "t00056.cc", "line": 89, - "translation_unit": "../../tests/t00056/t00056.cc" + "translation_unit": "t00056.cc" }, "type": "T1" }, @@ -556,9 +553,9 @@ struct F { "name": "f2", "source_location": { "column": 8, - "file": "../../tests/t00056/t00056.cc", + "file": "t00056.cc", "line": 90, - "translation_unit": "../../tests/t00056/t00056.cc" + "translation_unit": "t00056.cc" }, "type": "T2" }, @@ -568,9 +565,9 @@ struct F { "name": "f3", "source_location": { "column": 8, - "file": "../../tests/t00056/t00056.cc", + "file": "t00056.cc", "line": 91, - "translation_unit": "../../tests/t00056/t00056.cc" + "translation_unit": "t00056.cc" }, "type": "T3" } @@ -580,9 +577,9 @@ struct F { "namespace": "clanguml::t00056", "source_location": { "column": 8, - "file": "../../tests/t00056/t00056.cc", + "file": "t00056.cc", "line": 88, - "translation_unit": "../../tests/t00056/t00056.cc" + "translation_unit": "t00056.cc" }, "template_parameters": [ { @@ -607,11 +604,6 @@ struct F { "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00056_class", "relationships": [ { diff --git a/docs/test_cases/t00056_class.svg b/docs/test_cases/t00056_class.svg index 5294c446..6da13349 100644 --- a/docs/test_cases/t00056_class.svg +++ b/docs/test_cases/t00056_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + «concept» @@ -20,8 +20,8 @@ - - + + «concept» @@ -33,8 +33,8 @@ sizeof (l) > sizeof (r) - - + + «concept» @@ -44,8 +44,8 @@ - - + + «concept» @@ -58,8 +58,8 @@ container.begin() container.end() - - + + «concept» @@ -71,8 +71,8 @@ typename T::value_type - - + + «concept» @@ -86,8 +86,8 @@ {std::to_string(s)} noexcept {std::to_string(s)} -> std::same_as<std::string> - - + + «concept» @@ -97,8 +97,8 @@ - - + + «concept» @@ -108,8 +108,8 @@ - - + + A @@ -118,15 +118,15 @@ - + - + a : T - - + + B @@ -135,15 +135,15 @@ - + - + b : T - - + + C @@ -152,15 +152,15 @@ - + - + c : T - - + + D @@ -169,8 +169,8 @@ - - + + E @@ -179,29 +179,29 @@ - + - + e1 : T1 - + - + e2 : T2 - + - + e3 : T3 - - + + F @@ -210,25 +210,25 @@ - + - + f1 : T1 - + - + f2 : T2 - + - + f3 : T3 diff --git a/docs/test_cases/t00056_class_mermaid.svg b/docs/test_cases/t00056_class_mermaid.svg index baee519b..cfa0bf2f 100644 --- a/docs/test_cases/t00056_class_mermaid.svg +++ b/docs/test_cases/t00056_class_mermaid.svg @@ -222,7 +222,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -270,7 +270,7 @@ - + @@ -289,7 +289,7 @@ - + @@ -323,7 +323,7 @@ - + @@ -352,7 +352,7 @@ - + @@ -391,7 +391,7 @@ - + @@ -410,7 +410,7 @@ - + @@ -429,7 +429,7 @@ - + @@ -453,7 +453,7 @@ - + @@ -477,7 +477,7 @@ - + @@ -501,7 +501,7 @@ - + @@ -520,7 +520,7 @@ - + @@ -554,7 +554,7 @@ - + diff --git a/docs/test_cases/t00057.md b/docs/test_cases/t00057.md index ba8bc926..6dfe08c0 100644 --- a/docs/test_cases/t00057.md +++ b/docs/test_cases/t00057.md @@ -1,14 +1,12 @@ # t00057 - Test case C99/C11 translation units with structs and unions ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00057_class: type: class glob: - - ../../tests/t00057/t00057.c - - ../../tests/t00057/src/t00057_impl.c + - t00057.c + - src/t00057_impl.c ``` ## Source code File t00057.c @@ -84,9 +82,9 @@ struct t00057_R { "name": "a1", "source_location": { "column": 9, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 4, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "type": "int" } @@ -96,9 +94,9 @@ struct t00057_R { "namespace": "", "source_location": { "column": 8, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 3, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "template_parameters": [], "type": "class" @@ -119,9 +117,9 @@ struct t00057_R { "name": "b1", "source_location": { "column": 9, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 8, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "type": "int" } @@ -131,9 +129,9 @@ struct t00057_R { "namespace": "", "source_location": { "column": 16, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 7, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "template_parameters": [], "type": "class" @@ -154,9 +152,9 @@ struct t00057_R { "name": "c1", "source_location": { "column": 9, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 12, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "type": "int" } @@ -166,9 +164,9 @@ struct t00057_R { "namespace": "", "source_location": { "column": 8, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 11, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "template_parameters": [], "type": "class" @@ -189,9 +187,9 @@ struct t00057_R { "name": "d1", "source_location": { "column": 9, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 16, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "type": "int" }, @@ -201,9 +199,9 @@ struct t00057_R { "name": "d2", "source_location": { "column": 11, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 17, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "type": "float" } @@ -213,9 +211,9 @@ struct t00057_R { "namespace": "", "source_location": { "column": 7, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 15, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "template_parameters": [], "type": "class" @@ -236,9 +234,9 @@ struct t00057_R { "name": "e", "source_location": { "column": 9, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 21, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "type": "int" }, @@ -248,9 +246,9 @@ struct t00057_R { "name": "coordinates", "source_location": { "column": 7, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 25, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "type": "t00057_E##(anonymous_739)" }, @@ -260,9 +258,9 @@ struct t00057_R { "name": "height", "source_location": { "column": 7, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 29, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "type": "t00057_E##(anonymous_807)" } @@ -272,9 +270,9 @@ struct t00057_R { "namespace": "", "source_location": { "column": 8, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 20, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "template_parameters": [], "type": "class" @@ -295,9 +293,9 @@ struct t00057_R { "name": "x", "source_location": { "column": 13, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 23, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "type": "int" }, @@ -307,9 +305,9 @@ struct t00057_R { "name": "y", "source_location": { "column": 13, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 24, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "type": "int" } @@ -319,9 +317,9 @@ struct t00057_R { "namespace": "", "source_location": { "column": 5, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 22, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "template_parameters": [], "type": "class" @@ -342,9 +340,9 @@ struct t00057_R { "name": "z", "source_location": { "column": 13, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 27, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "type": "int" }, @@ -354,9 +352,9 @@ struct t00057_R { "name": "t", "source_location": { "column": 16, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 28, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "type": "double" } @@ -366,9 +364,9 @@ struct t00057_R { "namespace": "", "source_location": { "column": 5, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 26, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "template_parameters": [], "type": "class" @@ -389,9 +387,9 @@ struct t00057_R { "name": "g1", "source_location": { "column": 9, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 33, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "type": "int" } @@ -401,9 +399,9 @@ struct t00057_R { "namespace": "", "source_location": { "column": 9, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 32, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "template_parameters": [], "type": "class" @@ -424,9 +422,9 @@ struct t00057_R { "name": "a", "source_location": { "column": 21, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 37, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "type": "struct t00057_A" }, @@ -436,9 +434,9 @@ struct t00057_R { "name": "b", "source_location": { "column": 14, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 38, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "type": "t00057_B" }, @@ -448,9 +446,9 @@ struct t00057_R { "name": "c", "source_location": { "column": 22, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 39, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "type": "struct t00057_C *" }, @@ -460,9 +458,9 @@ struct t00057_R { "name": "d", "source_location": { "column": 20, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 40, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "type": "union t00057_D" }, @@ -472,9 +470,9 @@ struct t00057_R { "name": "e", "source_location": { "column": 22, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 41, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "type": "struct t00057_E *" }, @@ -484,9 +482,9 @@ struct t00057_R { "name": "f", "source_location": { "column": 22, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 42, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "type": "struct t00057_F *" }, @@ -496,9 +494,9 @@ struct t00057_R { "name": "g", "source_location": { "column": 22, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 43, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "type": "struct t00057_G *" } @@ -508,9 +506,9 @@ struct t00057_R { "namespace": "", "source_location": { "column": 8, - "file": "../../tests/t00057/t00057.c", + "file": "t00057.c", "line": 36, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "template_parameters": [], "type": "class" @@ -531,9 +529,9 @@ struct t00057_R { "name": "f1", "source_location": { "column": 9, - "file": "../../tests/t00057/src/t00057_impl.c", + "file": "src/t00057_impl.c", "line": 4, - "translation_unit": "../../tests/t00057/src/t00057_impl.c" + "translation_unit": "src/t00057_impl.c" }, "type": "int" } @@ -543,19 +541,14 @@ struct t00057_R { "namespace": "", "source_location": { "column": 8, - "file": "../../tests/t00057/include/t00057.h", + "file": "include/t00057.h", "line": 3, - "translation_unit": "../../tests/t00057/t00057.c" + "translation_unit": "t00057.c" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00057_class", "relationships": [ { diff --git a/docs/test_cases/t00057_class.svg b/docs/test_cases/t00057_class.svg index ce46217e..52dd0a43 100644 --- a/docs/test_cases/t00057_class.svg +++ b/docs/test_cases/t00057_class.svg @@ -1,6 +1,6 @@ - + @@ -9,53 +9,53 @@ - - + + t00057_A - + - + a1 : int - - + + t00057_B - + - + b1 : int - - + + t00057_C - + - + c1 : int - - + + «union» @@ -63,73 +63,73 @@ - + - + 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» @@ -137,105 +137,105 @@ - + - + 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 diff --git a/docs/test_cases/t00057_class_mermaid.svg b/docs/test_cases/t00057_class_mermaid.svg index 10faf4d7..6a83d182 100644 --- a/docs/test_cases/t00057_class_mermaid.svg +++ b/docs/test_cases/t00057_class_mermaid.svg @@ -162,7 +162,7 @@ - + @@ -186,7 +186,7 @@ - + @@ -210,7 +210,7 @@ - + @@ -234,7 +234,7 @@ - + @@ -263,7 +263,7 @@ - + @@ -297,7 +297,7 @@ - + @@ -326,7 +326,7 @@ - + @@ -355,7 +355,7 @@ - + @@ -379,7 +379,7 @@ - + @@ -433,7 +433,7 @@ - + diff --git a/docs/test_cases/t00058.md b/docs/test_cases/t00058.md index 524a04e8..a7e0966a 100644 --- a/docs/test_cases/t00058.md +++ b/docs/test_cases/t00058.md @@ -1,18 +1,15 @@ # t00058 - Test case for concepts with variadic parameters and type aliases ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00058_class: type: class glob: - - ../../tests/t00058/t00058.cc + - t00058.cc include: namespaces: - clanguml::t00058 - using_namespace: - - clanguml::t00058 + using_namespace: clanguml::t00058 plantuml: after: - '{{ alias("same_as_first_type") }} ..> {{ alias("first_type") }}' @@ -89,9 +86,9 @@ struct R { "namespace": "clanguml::t00058", "source_location": { "column": 48, - "file": "../../tests/t00058/t00058.cc", + "file": "t00058.cc", "line": 11, - "translation_unit": "../../tests/t00058/t00058.cc" + "translation_unit": "t00058.cc" }, "template_parameters": [ { @@ -117,9 +114,9 @@ struct R { "parameters": [], "source_location": { "column": 9, - "file": "../../tests/t00058/t00058.cc", + "file": "t00058.cc", "line": 22, - "translation_unit": "../../tests/t00058/t00058.cc" + "translation_unit": "t00058.cc" }, "statements": [], "type": "concept" @@ -140,9 +137,9 @@ struct R { "name": "a", "source_location": { "column": 20, - "file": "../../tests/t00058/t00058.cc", + "file": "t00058.cc", "line": 28, - "translation_unit": "../../tests/t00058/t00058.cc" + "translation_unit": "t00058.cc" }, "type": "std::vector" } @@ -152,9 +149,9 @@ struct R { "namespace": "clanguml::t00058", "source_location": { "column": 8, - "file": "../../tests/t00058/t00058.cc", + "file": "t00058.cc", "line": 27, - "translation_unit": "../../tests/t00058/t00058.cc" + "translation_unit": "t00058.cc" }, "template_parameters": [ { @@ -188,9 +185,9 @@ struct R { "name": "b", "source_location": { "column": 20, - "file": "../../tests/t00058/t00058.cc", + "file": "t00058.cc", "line": 34, - "translation_unit": "../../tests/t00058/t00058.cc" + "translation_unit": "t00058.cc" }, "type": "std::vector" }, @@ -200,9 +197,9 @@ struct R { "name": "bb", "source_location": { "column": 7, - "file": "../../tests/t00058/t00058.cc", + "file": "t00058.cc", "line": 35, - "translation_unit": "../../tests/t00058/t00058.cc" + "translation_unit": "t00058.cc" }, "type": "P" } @@ -212,9 +209,9 @@ struct R { "namespace": "clanguml::t00058", "source_location": { "column": 8, - "file": "../../tests/t00058/t00058.cc", + "file": "t00058.cc", "line": 33, - "translation_unit": "../../tests/t00058/t00058.cc" + "translation_unit": "t00058.cc" }, "template_parameters": [ { @@ -253,9 +250,9 @@ struct R { "namespace": "clanguml::t00058", "source_location": { "column": 8, - "file": "../../tests/t00058/t00058.cc", + "file": "t00058.cc", "line": 27, - "translation_unit": "../../tests/t00058/t00058.cc" + "translation_unit": "t00058.cc" }, "template_parameters": [ { @@ -300,9 +297,9 @@ struct R { "namespace": "clanguml::t00058", "source_location": { "column": 8, - "file": "../../tests/t00058/t00058.cc", + "file": "t00058.cc", "line": 33, - "translation_unit": "../../tests/t00058/t00058.cc" + "translation_unit": "t00058.cc" }, "template_parameters": [ { @@ -335,9 +332,9 @@ struct R { "namespace": "clanguml::t00058", "source_location": { "column": 8, - "file": "../../tests/t00058/t00058.cc", + "file": "t00058.cc", "line": 33, - "translation_unit": "../../tests/t00058/t00058.cc" + "translation_unit": "t00058.cc" }, "template_parameters": [ { @@ -402,9 +399,9 @@ struct R { "name": "aa", "source_location": { "column": 38, - "file": "../../tests/t00058/t00058.cc", + "file": "t00058.cc", "line": 39, - "translation_unit": "../../tests/t00058/t00058.cc" + "translation_unit": "t00058.cc" }, "type": "A" }, @@ -414,9 +411,9 @@ struct R { "name": "bb", "source_location": { "column": 51, - "file": "../../tests/t00058/t00058.cc", + "file": "t00058.cc", "line": 40, - "translation_unit": "../../tests/t00058/t00058.cc" + "translation_unit": "t00058.cc" }, "type": "B>" } @@ -426,19 +423,14 @@ struct R { "namespace": "clanguml::t00058", "source_location": { "column": 8, - "file": "../../tests/t00058/t00058.cc", + "file": "t00058.cc", "line": 38, - "translation_unit": "../../tests/t00058/t00058.cc" + "translation_unit": "t00058.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00058_class", "relationships": [ { diff --git a/docs/test_cases/t00058_class.svg b/docs/test_cases/t00058_class.svg index 4aff02a8..ae5c6c2a 100644 --- a/docs/test_cases/t00058_class.svg +++ b/docs/test_cases/t00058_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + first_type @@ -19,8 +19,8 @@ - - + + «concept» @@ -30,8 +30,8 @@ - - + + A @@ -40,15 +40,15 @@ - + - + a : std::vector<T> - - + + B @@ -57,22 +57,22 @@ - + - + b : std::vector<T> - + - + bb : P - - + + A @@ -81,8 +81,8 @@ - - + + A @@ -91,8 +91,8 @@ - - + + B @@ -101,26 +101,26 @@ - - + + R - + - + aa : A<int,int,double,std::string> - + - + bb : B<int,std::string,int,double,A<int,int>> diff --git a/docs/test_cases/t00058_class_mermaid.svg b/docs/test_cases/t00058_class_mermaid.svg index 283707cd..847339fd 100644 --- a/docs/test_cases/t00058_class_mermaid.svg +++ b/docs/test_cases/t00058_class_mermaid.svg @@ -150,7 +150,7 @@ - + @@ -169,7 +169,7 @@ - + @@ -188,7 +188,7 @@ - + @@ -212,7 +212,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -260,7 +260,7 @@ - + @@ -279,7 +279,7 @@ - + @@ -298,7 +298,7 @@ - + diff --git a/docs/test_cases/t00059.md b/docs/test_cases/t00059.md index 4f12922d..1686ab54 100644 --- a/docs/test_cases/t00059.md +++ b/docs/test_cases/t00059.md @@ -1,18 +1,15 @@ # t00059 - Non-virtual abstract factory pattern using concepts test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00059_class: type: class glob: - - ../../tests/t00059/t00059.cc + - t00059.cc include: namespaces: - clanguml::t00059 - using_namespace: - - clanguml::t00059 + using_namespace: clanguml::t00059 ``` ## Source code File t00059.cc @@ -96,9 +93,9 @@ struct R { ], "source_location": { "column": 9, - "file": "../../tests/t00059/t00059.cc", + "file": "t00059.cc", "line": 7, - "translation_unit": "../../tests/t00059/t00059.cc" + "translation_unit": "t00059.cc" }, "statements": [ "T{}", @@ -119,9 +116,9 @@ struct R { ], "source_location": { "column": 9, - "file": "../../tests/t00059/t00059.cc", + "file": "t00059.cc", "line": 13, - "translation_unit": "../../tests/t00059/t00059.cc" + "translation_unit": "t00059.cc" }, "statements": [ "t.get_sweetness()" @@ -141,9 +138,9 @@ struct R { ], "source_location": { "column": 9, - "file": "../../tests/t00059/t00059.cc", + "file": "t00059.cc", "line": 16, - "translation_unit": "../../tests/t00059/t00059.cc" + "translation_unit": "t00059.cc" }, "statements": [ "t.get_bitterness()" @@ -180,9 +177,9 @@ struct R { "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00059/t00059.cc", + "file": "t00059.cc", "line": 20, - "translation_unit": "../../tests/t00059/t00059.cc" + "translation_unit": "t00059.cc" }, "type": "std::string" }, @@ -205,9 +202,9 @@ struct R { "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00059/t00059.cc", + "file": "t00059.cc", "line": 21, - "translation_unit": "../../tests/t00059/t00059.cc" + "translation_unit": "t00059.cc" }, "type": "float" } @@ -216,9 +213,9 @@ struct R { "namespace": "clanguml::t00059", "source_location": { "column": 7, - "file": "../../tests/t00059/t00059.cc", + "file": "t00059.cc", "line": 18, - "translation_unit": "../../tests/t00059/t00059.cc" + "translation_unit": "t00059.cc" }, "template_parameters": [], "type": "class" @@ -253,9 +250,9 @@ struct R { "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00059/t00059.cc", + "file": "t00059.cc", "line": 26, - "translation_unit": "../../tests/t00059/t00059.cc" + "translation_unit": "t00059.cc" }, "type": "std::string" }, @@ -278,9 +275,9 @@ struct R { "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00059/t00059.cc", + "file": "t00059.cc", "line": 27, - "translation_unit": "../../tests/t00059/t00059.cc" + "translation_unit": "t00059.cc" }, "type": "float" } @@ -289,9 +286,9 @@ struct R { "namespace": "clanguml::t00059", "source_location": { "column": 7, - "file": "../../tests/t00059/t00059.cc", + "file": "t00059.cc", "line": 24, - "translation_unit": "../../tests/t00059/t00059.cc" + "translation_unit": "t00059.cc" }, "template_parameters": [], "type": "class" @@ -326,9 +323,9 @@ struct R { "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00059/t00059.cc", + "file": "t00059.cc", "line": 32, - "translation_unit": "../../tests/t00059/t00059.cc" + "translation_unit": "t00059.cc" }, "type": "std::string" }, @@ -351,9 +348,9 @@ struct R { "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00059/t00059.cc", + "file": "t00059.cc", "line": 33, - "translation_unit": "../../tests/t00059/t00059.cc" + "translation_unit": "t00059.cc" }, "type": "float" } @@ -362,9 +359,9 @@ struct R { "namespace": "clanguml::t00059", "source_location": { "column": 7, - "file": "../../tests/t00059/t00059.cc", + "file": "t00059.cc", "line": 30, - "translation_unit": "../../tests/t00059/t00059.cc" + "translation_unit": "t00059.cc" }, "template_parameters": [], "type": "class" @@ -399,9 +396,9 @@ struct R { "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00059/t00059.cc", + "file": "t00059.cc", "line": 38, - "translation_unit": "../../tests/t00059/t00059.cc" + "translation_unit": "t00059.cc" }, "type": "std::string" }, @@ -424,9 +421,9 @@ struct R { "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00059/t00059.cc", + "file": "t00059.cc", "line": 39, - "translation_unit": "../../tests/t00059/t00059.cc" + "translation_unit": "t00059.cc" }, "type": "float" } @@ -435,9 +432,9 @@ struct R { "namespace": "clanguml::t00059", "source_location": { "column": 7, - "file": "../../tests/t00059/t00059.cc", + "file": "t00059.cc", "line": 36, - "translation_unit": "../../tests/t00059/t00059.cc" + "translation_unit": "t00059.cc" }, "template_parameters": [], "type": "class" @@ -472,9 +469,9 @@ struct R { "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00059/t00059.cc", + "file": "t00059.cc", "line": 44, - "translation_unit": "../../tests/t00059/t00059.cc" + "translation_unit": "t00059.cc" }, "type": "TA" }, @@ -497,9 +494,9 @@ struct R { "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00059/t00059.cc", + "file": "t00059.cc", "line": 45, - "translation_unit": "../../tests/t00059/t00059.cc" + "translation_unit": "t00059.cc" }, "type": "TO" } @@ -508,9 +505,9 @@ struct R { "namespace": "clanguml::t00059", "source_location": { "column": 42, - "file": "../../tests/t00059/t00059.cc", + "file": "t00059.cc", "line": 42, - "translation_unit": "../../tests/t00059/t00059.cc" + "translation_unit": "t00059.cc" }, "template_parameters": [ { @@ -543,9 +540,9 @@ struct R { "namespace": "clanguml::t00059", "source_location": { "column": 42, - "file": "../../tests/t00059/t00059.cc", + "file": "t00059.cc", "line": 42, - "translation_unit": "../../tests/t00059/t00059.cc" + "translation_unit": "t00059.cc" }, "template_parameters": [ { @@ -578,9 +575,9 @@ struct R { "namespace": "clanguml::t00059", "source_location": { "column": 42, - "file": "../../tests/t00059/t00059.cc", + "file": "t00059.cc", "line": 42, - "translation_unit": "../../tests/t00059/t00059.cc" + "translation_unit": "t00059.cc" }, "template_parameters": [ { @@ -614,9 +611,9 @@ struct R { "name": "factory_1", "source_location": { "column": 21, - "file": "../../tests/t00059/t00059.cc", + "file": "t00059.cc", "line": 52, - "translation_unit": "../../tests/t00059/t00059.cc" + "translation_unit": "t00059.cc" }, "type": "fruit_factory_1" }, @@ -626,9 +623,9 @@ struct R { "name": "factory_2", "source_location": { "column": 21, - "file": "../../tests/t00059/t00059.cc", + "file": "t00059.cc", "line": 53, - "translation_unit": "../../tests/t00059/t00059.cc" + "translation_unit": "t00059.cc" }, "type": "fruit_factory_2" } @@ -638,19 +635,14 @@ struct R { "namespace": "clanguml::t00059", "source_location": { "column": 8, - "file": "../../tests/t00059/t00059.cc", + "file": "t00059.cc", "line": 51, - "translation_unit": "../../tests/t00059/t00059.cc" + "translation_unit": "t00059.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00059_class", "relationships": [ { diff --git a/docs/test_cases/t00059_class.svg b/docs/test_cases/t00059_class.svg index 9226f320..e4fa2175 100644 --- a/docs/test_cases/t00059_class.svg +++ b/docs/test_cases/t00059_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + «concept» @@ -23,8 +23,8 @@ T{} t.get_name() - - + + «concept» @@ -36,8 +36,8 @@ t.get_sweetness() - - + + «concept» @@ -49,96 +49,96 @@ t.get_bitterness() - - + + gala_apple - + - + get_name() const : std::string - + - + get_sweetness() const : float - - + + empire_apple - + - + get_name() const : std::string - + - + 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 @@ -146,23 +146,23 @@ apple_c TA,orange_c TO - + - + create_apple() const : TA - + - + create_orange() const : TO - - + + fruit_factory @@ -171,8 +171,8 @@ - - + + fruit_factory @@ -181,26 +181,26 @@ - - + + R - + - + factory_1 : fruit_factory_1 - + - + factory_2 : fruit_factory_2 diff --git a/docs/test_cases/t00059_class_mermaid.svg b/docs/test_cases/t00059_class_mermaid.svg index 22c99a02..3b4f8b53 100644 --- a/docs/test_cases/t00059_class_mermaid.svg +++ b/docs/test_cases/t00059_class_mermaid.svg @@ -198,7 +198,7 @@ - + @@ -232,7 +232,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -290,7 +290,7 @@ - + @@ -319,7 +319,7 @@ - + @@ -348,7 +348,7 @@ - + @@ -377,7 +377,7 @@ - + @@ -406,7 +406,7 @@ - + @@ -435,7 +435,7 @@ - + @@ -454,7 +454,7 @@ - + @@ -473,7 +473,7 @@ - + diff --git a/docs/test_cases/t00060.md b/docs/test_cases/t00060.md index 03bdabdd..d27d0768 100644 --- a/docs/test_cases/t00060.md +++ b/docs/test_cases/t00060.md @@ -1,21 +1,18 @@ # t00060 - Parents (base classes) diagram filter test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00060_class: type: class glob: - - ../../tests/t00060/t00060.cc + - t00060.cc include: namespaces: - clanguml::t00060 parents: - clanguml::t00060::D - clanguml::t00060::H - using_namespace: - - clanguml::t00060 + using_namespace: clanguml::t00060 ``` ## Source code File t00060.cc @@ -65,9 +62,9 @@ template struct H : public G { "namespace": "clanguml::t00060", "source_location": { "column": 8, - "file": "../../tests/t00060/t00060.cc", + "file": "t00060.cc", "line": 3, - "translation_unit": "../../tests/t00060/t00060.cc" + "translation_unit": "t00060.cc" }, "template_parameters": [], "type": "class" @@ -94,9 +91,9 @@ template struct H : public G { "namespace": "clanguml::t00060", "source_location": { "column": 8, - "file": "../../tests/t00060/t00060.cc", + "file": "t00060.cc", "line": 4, - "translation_unit": "../../tests/t00060/t00060.cc" + "translation_unit": "t00060.cc" }, "template_parameters": [], "type": "class" @@ -123,9 +120,9 @@ template struct H : public G { "namespace": "clanguml::t00060", "source_location": { "column": 8, - "file": "../../tests/t00060/t00060.cc", + "file": "t00060.cc", "line": 5, - "translation_unit": "../../tests/t00060/t00060.cc" + "translation_unit": "t00060.cc" }, "template_parameters": [], "type": "class" @@ -158,9 +155,9 @@ template struct H : public G { "namespace": "clanguml::t00060", "source_location": { "column": 8, - "file": "../../tests/t00060/t00060.cc", + "file": "t00060.cc", "line": 6, - "translation_unit": "../../tests/t00060/t00060.cc" + "translation_unit": "t00060.cc" }, "template_parameters": [], "type": "class" @@ -181,9 +178,9 @@ template struct H : public G { "name": "g", "source_location": { "column": 7, - "file": "../../tests/t00060/t00060.cc", + "file": "t00060.cc", "line": 11, - "translation_unit": "../../tests/t00060/t00060.cc" + "translation_unit": "t00060.cc" }, "type": "T" } @@ -193,9 +190,9 @@ template struct H : public G { "namespace": "clanguml::t00060", "source_location": { "column": 30, - "file": "../../tests/t00060/t00060.cc", + "file": "t00060.cc", "line": 10, - "translation_unit": "../../tests/t00060/t00060.cc" + "translation_unit": "t00060.cc" }, "template_parameters": [ { @@ -230,9 +227,9 @@ template struct H : public G { "name": "h", "source_location": { "column": 10, - "file": "../../tests/t00060/t00060.cc", + "file": "t00060.cc", "line": 15, - "translation_unit": "../../tests/t00060/t00060.cc" + "translation_unit": "t00060.cc" }, "type": "G" }, @@ -242,9 +239,9 @@ template struct H : public G { "name": "hh", "source_location": { "column": 7, - "file": "../../tests/t00060/t00060.cc", + "file": "t00060.cc", "line": 16, - "translation_unit": "../../tests/t00060/t00060.cc" + "translation_unit": "t00060.cc" }, "type": "P" } @@ -254,9 +251,9 @@ template struct H : public G { "namespace": "clanguml::t00060", "source_location": { "column": 42, - "file": "../../tests/t00060/t00060.cc", + "file": "t00060.cc", "line": 14, - "translation_unit": "../../tests/t00060/t00060.cc" + "translation_unit": "t00060.cc" }, "template_parameters": [ { @@ -275,11 +272,6 @@ template struct H : public G { "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00060_class", "relationships": [ { diff --git a/docs/test_cases/t00060_class.svg b/docs/test_cases/t00060_class.svg index 56ac3b47..0d38ba10 100644 --- a/docs/test_cases/t00060_class.svg +++ b/docs/test_cases/t00060_class.svg @@ -1,6 +1,6 @@ - + @@ -9,40 +9,40 @@ - - + + A - - + + B - - + + C - - + + D - - + + G @@ -51,15 +51,15 @@ - + - + g : T - - + + H @@ -68,18 +68,18 @@ - + - + h : G<T> - + - + hh : P diff --git a/docs/test_cases/t00060_class_mermaid.svg b/docs/test_cases/t00060_class_mermaid.svg index c09153c3..b97ae86e 100644 --- a/docs/test_cases/t00060_class_mermaid.svg +++ b/docs/test_cases/t00060_class_mermaid.svg @@ -116,7 +116,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -173,7 +173,7 @@ - + @@ -192,7 +192,7 @@ - + @@ -216,7 +216,7 @@ - + diff --git a/docs/test_cases/t00061.md b/docs/test_cases/t00061.md index 363b7458..a643b640 100644 --- a/docs/test_cases/t00061.md +++ b/docs/test_cases/t00061.md @@ -1,12 +1,9 @@ # t00061 - Paths diagram filter test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00061_class: type: class - relative_to: ../../../tests/t00061 glob: - t00061.cc include: @@ -14,8 +11,7 @@ diagrams: - clanguml::t00061 paths: - include/*_a.h - using_namespace: - - clanguml::t00061 + using_namespace: clanguml::t00061 ``` ## Source code File t00061.cc @@ -56,19 +52,14 @@ struct C { "namespace": "clanguml::t00061", "source_location": { "column": 8, - "file": "../../clang-uml/tests/t00061/include/t00061_a.h", + "file": "include/t00061_a.h", "line": 3, - "translation_unit": "../../clang-uml/tests/t00061/t00061.cc" + "translation_unit": "t00061.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00061_class", "relationships": [], "using_namespace": "clanguml::t00061" diff --git a/docs/test_cases/t00061_class.svg b/docs/test_cases/t00061_class.svg index 92f86c67..6bcb0171 100644 --- a/docs/test_cases/t00061_class.svg +++ b/docs/test_cases/t00061_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + A diff --git a/docs/test_cases/t00061_class_mermaid.svg b/docs/test_cases/t00061_class_mermaid.svg index ed77206c..808a18c8 100644 --- a/docs/test_cases/t00061_class_mermaid.svg +++ b/docs/test_cases/t00061_class_mermaid.svg @@ -52,7 +52,7 @@ - + diff --git a/docs/test_cases/t00062.md b/docs/test_cases/t00062.md index 20a14833..439ecaf9 100644 --- a/docs/test_cases/t00062.md +++ b/docs/test_cases/t00062.md @@ -1,18 +1,15 @@ # t00062 - Template specialization matching based on deduced context ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00062_class: type: class glob: - - ../../tests/t00062/t00062.cc + - t00062.cc include: namespaces: - clanguml::t00062 - using_namespace: - - clanguml::t00062 + using_namespace: clanguml::t00062 plantuml: before: - left to right direction @@ -147,9 +144,9 @@ struct A> { "name": "u", "source_location": { "column": 8, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 10, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "U &" } @@ -159,9 +156,9 @@ struct A> { "namespace": "clanguml::t00062", "source_location": { "column": 30, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 9, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "template_parameters": [ { @@ -189,9 +186,9 @@ struct A> { "name": "u", "source_location": { "column": 8, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 14, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "U &" } @@ -201,9 +198,9 @@ struct A> { "namespace": "clanguml::t00062", "source_location": { "column": 30, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 13, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "template_parameters": [ { @@ -243,9 +240,9 @@ struct A> { "namespace": "clanguml::t00062", "source_location": { "column": 8, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 18, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "template_parameters": [ { @@ -299,9 +296,9 @@ struct A> { "name": "u", "source_location": { "column": 9, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 21, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "U **" } @@ -311,9 +308,9 @@ struct A> { "namespace": "clanguml::t00062", "source_location": { "column": 30, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 20, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "template_parameters": [ { @@ -341,9 +338,9 @@ struct A> { "name": "u", "source_location": { "column": 10, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 25, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "U ***" } @@ -353,9 +350,9 @@ struct A> { "namespace": "clanguml::t00062", "source_location": { "column": 30, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 24, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "template_parameters": [ { @@ -383,9 +380,9 @@ struct A> { "name": "u", "source_location": { "column": 10, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 29, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "U ***" } @@ -395,9 +392,9 @@ struct A> { "namespace": "clanguml::t00062", "source_location": { "column": 30, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 28, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "template_parameters": [ { @@ -425,9 +422,9 @@ struct A> { "name": "u", "source_location": { "column": 9, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 33, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "U &&" } @@ -437,9 +434,9 @@ struct A> { "namespace": "clanguml::t00062", "source_location": { "column": 30, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 32, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "template_parameters": [ { @@ -467,9 +464,9 @@ struct A> { "name": "u", "source_location": { "column": 14, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 37, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "const U &" } @@ -479,9 +476,9 @@ struct A> { "namespace": "clanguml::t00062", "source_location": { "column": 30, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 36, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "template_parameters": [ { @@ -509,9 +506,9 @@ struct A> { "name": "c", "source_location": { "column": 8, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 41, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "C &" }, @@ -521,9 +518,9 @@ struct A> { "name": "m", "source_location": { "column": 11, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 42, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "M C::*" } @@ -533,9 +530,9 @@ struct A> { "namespace": "clanguml::t00062", "source_location": { "column": 42, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 40, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "template_parameters": [ { @@ -575,9 +572,9 @@ struct A> { "name": "c", "source_location": { "column": 9, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 46, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "C &&" }, @@ -587,9 +584,9 @@ struct A> { "name": "m", "source_location": { "column": 11, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 47, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "M C::*" } @@ -599,9 +596,9 @@ struct A> { "namespace": "clanguml::t00062", "source_location": { "column": 42, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 45, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "template_parameters": [ { @@ -641,9 +638,9 @@ struct A> { "name": "c", "source_location": { "column": 8, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 51, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "C &" }, @@ -653,9 +650,9 @@ struct A> { "name": "m", "source_location": { "column": 11, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 52, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "M C::*" } @@ -665,9 +662,9 @@ struct A> { "namespace": "clanguml::t00062", "source_location": { "column": 56, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 50, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "template_parameters": [ { @@ -713,9 +710,9 @@ struct A> { "name": "c", "source_location": { "column": 8, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 56, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "C &" } @@ -725,9 +722,9 @@ struct A> { "namespace": "clanguml::t00062", "source_location": { "column": 30, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 55, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "template_parameters": [ { @@ -773,9 +770,9 @@ struct A> { "name": "c", "source_location": { "column": 9, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 60, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "C &&" }, @@ -785,9 +782,9 @@ struct A> { "name": "m", "source_location": { "column": 11, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 61, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "M C::*" } @@ -797,9 +794,9 @@ struct A> { "namespace": "clanguml::t00062", "source_location": { "column": 56, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 59, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "template_parameters": [ { @@ -845,9 +842,9 @@ struct A> { "name": "c", "source_location": { "column": 9, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 65, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "C &&" }, @@ -857,9 +854,9 @@ struct A> { "name": "mf", "source_location": { "column": 15, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 66, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "float C::*" } @@ -869,9 +866,9 @@ struct A> { "namespace": "clanguml::t00062", "source_location": { "column": 30, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 64, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "template_parameters": [ { @@ -917,9 +914,9 @@ struct A> { "name": "c", "source_location": { "column": 8, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 71, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "C &" }, @@ -929,9 +926,9 @@ struct A> { "name": "m", "source_location": { "column": 11, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 72, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "M C::*" } @@ -941,9 +938,9 @@ struct A> { "namespace": "clanguml::t00062", "source_location": { "column": 8, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 70, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "template_parameters": [ { @@ -1001,9 +998,9 @@ struct A> { "name": "n", "source_location": { "column": 10, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 76, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "char[N]" } @@ -1013,9 +1010,9 @@ struct A> { "namespace": "clanguml::t00062", "source_location": { "column": 25, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 75, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "template_parameters": [ { @@ -1055,9 +1052,9 @@ struct A> { "name": "n", "source_location": { "column": 23, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 80, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "std::vector" } @@ -1067,9 +1064,9 @@ struct A> { "namespace": "clanguml::t00062", "source_location": { "column": 20, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 79, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "template_parameters": [ { @@ -1109,9 +1106,9 @@ struct A> { "name": "klm", "source_location": { "column": 63, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 83, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "char[K][L][M]" } @@ -1121,9 +1118,9 @@ struct A> { "namespace": "clanguml::t00062", "source_location": { "column": 39, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 83, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "template_parameters": [ { @@ -1187,9 +1184,9 @@ struct A> { "name": "u", "source_location": { "column": 10, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 86, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "bool" } @@ -1199,9 +1196,9 @@ struct A> { "namespace": "clanguml::t00062", "source_location": { "column": 30, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 85, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "template_parameters": [ { @@ -1241,9 +1238,9 @@ struct A> { "name": "c", "source_location": { "column": 10, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 90, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "C" } @@ -1253,9 +1250,9 @@ struct A> { "namespace": "clanguml::t00062", "source_location": { "column": 59, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 89, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "template_parameters": [ { @@ -1290,9 +1287,9 @@ struct A> { "name": "c", "source_location": { "column": 10, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 96, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "C" }, @@ -1302,9 +1299,9 @@ struct A> { "name": "args", "source_location": { "column": 25, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 97, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "type": "std::tuple" } @@ -1314,9 +1311,9 @@ struct A> { "namespace": "clanguml::t00062", "source_location": { "column": 8, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 95, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "template_parameters": [ { @@ -1356,9 +1353,9 @@ struct A> { "namespace": "clanguml::t00062", "source_location": { "column": 30, - "file": "../../tests/t00062/t00062.cc", + "file": "t00062.cc", "line": 7, - "translation_unit": "../../tests/t00062/t00062.cc" + "translation_unit": "t00062.cc" }, "template_parameters": [ { @@ -1371,11 +1368,6 @@ struct A> { "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00062_class", "relationships": [ { diff --git a/docs/test_cases/t00062_class.svg b/docs/test_cases/t00062_class.svg index 1725a231..2066a598 100644 --- a/docs/test_cases/t00062_class.svg +++ b/docs/test_cases/t00062_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + A @@ -19,15 +19,15 @@ - + - + u : U & - - + + A @@ -36,15 +36,15 @@ - + - + u : U & - - + + A @@ -53,8 +53,8 @@ - - + + A @@ -63,15 +63,15 @@ - + - + u : U ** - - + + A @@ -80,15 +80,15 @@ - + - + u : U *** - - + + A @@ -97,15 +97,15 @@ - + - + u : U *** - - + + A @@ -114,15 +114,15 @@ - + - + u : U && - - + + A @@ -131,15 +131,15 @@ - + - + u : const U & - - + + A @@ -148,22 +148,22 @@ - + - + c : C & - + - + m : M C::* - - + + A @@ -172,22 +172,22 @@ - + - + c : C && - + - + m : M C::* - - + + A @@ -196,22 +196,22 @@ - + - + c : C & - + - + m : M C::* - - + + A @@ -220,15 +220,15 @@ - + - + c : C & - - + + A @@ -237,22 +237,22 @@ - + - + c : C && - + - + m : M C::* - - + + A @@ -261,22 +261,22 @@ - + - + c : C && - + - + mf : float C::* - - + + A @@ -285,22 +285,22 @@ - + - + c : C & - + - + m : M C::* - - + + A @@ -309,15 +309,15 @@ - + - + n : char[N] - - + + A @@ -326,15 +326,15 @@ - + - + n : std::vector<char> - - + + A @@ -343,15 +343,15 @@ - + - + klm : char[K][L][M] - - + + A @@ -360,15 +360,15 @@ - + - + u : bool - - + + A @@ -377,15 +377,15 @@ - + - + c : C<T> - - + + A @@ -394,22 +394,22 @@ - + - + args : std::tuple<Args...> - + - + c : C<T> - - + + A diff --git a/docs/test_cases/t00062_class_mermaid.svg b/docs/test_cases/t00062_class_mermaid.svg index aff2a83a..368cc15f 100644 --- a/docs/test_cases/t00062_class_mermaid.svg +++ b/docs/test_cases/t00062_class_mermaid.svg @@ -306,7 +306,7 @@ - + @@ -330,7 +330,7 @@ - + @@ -354,7 +354,7 @@ - + @@ -373,7 +373,7 @@ - + @@ -397,7 +397,7 @@ - + @@ -421,7 +421,7 @@ - + @@ -445,7 +445,7 @@ - + @@ -469,7 +469,7 @@ - + @@ -493,7 +493,7 @@ - + @@ -522,7 +522,7 @@ - + @@ -551,7 +551,7 @@ - + @@ -580,7 +580,7 @@ - + @@ -604,7 +604,7 @@ - + @@ -633,7 +633,7 @@ - + @@ -662,7 +662,7 @@ - + @@ -691,7 +691,7 @@ - + @@ -715,7 +715,7 @@ - + @@ -739,7 +739,7 @@ - + @@ -763,7 +763,7 @@ - + @@ -787,7 +787,7 @@ - + @@ -811,7 +811,7 @@ - + @@ -840,7 +840,7 @@ - + diff --git a/docs/test_cases/t00063.md b/docs/test_cases/t00063.md index 1fe82330..71f6bbbf 100644 --- a/docs/test_cases/t00063.md +++ b/docs/test_cases/t00063.md @@ -1,21 +1,18 @@ # t00063 - Element types diagram filter test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00063_class: type: class glob: - - ../../tests/t00063/t00063.cc + - t00063.cc include: namespaces: - clanguml::t00063 exclude: element_types: - enum - using_namespace: - - clanguml::t00063 + using_namespace: clanguml::t00063 ``` ## Source code File t00063.cc @@ -54,19 +51,14 @@ enum class C { c1, c2, c3 }; "namespace": "clanguml::t00063", "source_location": { "column": 7, - "file": "../../tests/t00063/t00063.cc", + "file": "t00063.cc", "line": 3, - "translation_unit": "../../tests/t00063/t00063.cc" + "translation_unit": "t00063.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00063_class", "relationships": [], "using_namespace": "clanguml::t00063" diff --git a/docs/test_cases/t00063_class.svg b/docs/test_cases/t00063_class.svg index c17aa434..cb09775a 100644 --- a/docs/test_cases/t00063_class.svg +++ b/docs/test_cases/t00063_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + A diff --git a/docs/test_cases/t00063_class_mermaid.svg b/docs/test_cases/t00063_class_mermaid.svg index d5f0a70a..08717612 100644 --- a/docs/test_cases/t00063_class_mermaid.svg +++ b/docs/test_cases/t00063_class_mermaid.svg @@ -52,7 +52,7 @@ - + diff --git a/docs/test_cases/t00064.md b/docs/test_cases/t00064.md index 1756f8f6..2d641bc0 100644 --- a/docs/test_cases/t00064.md +++ b/docs/test_cases/t00064.md @@ -1,18 +1,15 @@ # t00064 - Template type list test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00064_class: type: class glob: - - ../../tests/t00064/t00064.cc + - t00064.cc include: namespaces: - clanguml::t00064 - using_namespace: - - clanguml::t00064 + using_namespace: clanguml::t00064 plantuml: before: - left to right direction @@ -106,9 +103,9 @@ public: "namespace": "clanguml::t00064", "source_location": { "column": 34, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 8, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "template_parameters": [ { @@ -135,9 +132,9 @@ public: "namespace": "clanguml::t00064", "source_location": { "column": 8, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 11, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "template_parameters": [ { @@ -182,9 +179,9 @@ public: "namespace": "clanguml::t00064", "source_location": { "column": 46, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 13, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "template_parameters": [ { @@ -217,9 +214,9 @@ public: "namespace": "clanguml::t00064", "source_location": { "column": 28, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 15, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "template_parameters": [ { @@ -252,9 +249,9 @@ public: "namespace": "clanguml::t00064", "source_location": { "column": 8, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 17, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "template_parameters": [ { @@ -294,9 +291,9 @@ public: "namespace": "clanguml::t00064", "source_location": { "column": 34, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 8, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "template_parameters": [ { @@ -323,9 +320,9 @@ public: "namespace": "clanguml::t00064", "source_location": { "column": 37, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 25, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "template_parameters": [ { @@ -352,9 +349,9 @@ public: "namespace": "clanguml::t00064", "source_location": { "column": 37, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 25, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "template_parameters": [ { @@ -382,9 +379,9 @@ public: "name": "size", "source_location": { "column": 29, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 28, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "type": "const size_t" } @@ -394,9 +391,9 @@ public: "namespace": "clanguml::t00064", "source_location": { "column": 7, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 27, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "template_parameters": [ { @@ -443,9 +440,9 @@ public: "namespace": "clanguml::t00064", "source_location": { "column": 30, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 31, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "template_parameters": [ { @@ -472,9 +469,9 @@ public: "namespace": "clanguml::t00064", "source_location": { "column": 30, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 31, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "template_parameters": [ { @@ -521,9 +518,9 @@ public: ], "source_location": { "column": 11, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 44, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "type": "ref_t" }, @@ -551,9 +548,9 @@ public: ], "source_location": { "column": 23, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 46, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "type": "const value_type *" }, @@ -581,9 +578,9 @@ public: ], "source_location": { "column": 24, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 48, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "type": "unsigned int" } @@ -592,9 +589,9 @@ public: "namespace": "clanguml::t00064", "source_location": { "column": 7, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 35, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "template_parameters": [ { @@ -647,9 +644,9 @@ public: "namespace": "clanguml::t00064", "source_location": { "column": 8, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 51, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "template_parameters": [], "type": "class" @@ -669,9 +666,9 @@ public: "namespace": "clanguml::t00064", "source_location": { "column": 8, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 52, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "template_parameters": [], "type": "class" @@ -691,9 +688,9 @@ public: "namespace": "clanguml::t00064", "source_location": { "column": 8, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 53, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "template_parameters": [], "type": "class" @@ -713,9 +710,9 @@ public: "namespace": "clanguml::t00064", "source_location": { "column": 34, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 8, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "template_parameters": [ { @@ -754,9 +751,9 @@ public: "namespace": "clanguml::t00064", "source_location": { "column": 37, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 25, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "template_parameters": [ { @@ -789,9 +786,9 @@ public: "namespace": "clanguml::t00064", "source_location": { "column": 37, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 25, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "template_parameters": [ { @@ -830,9 +827,9 @@ public: "namespace": "clanguml::t00064", "source_location": { "column": 37, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 25, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "template_parameters": [ { @@ -898,9 +895,9 @@ public: "name": "aboolint", "source_location": { "column": 29, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 57, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "type": "type_list" }, @@ -910,9 +907,9 @@ public: "name": "abc", "source_location": { "column": 67, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 58, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "type": "type_group_pair,type_list>" } @@ -922,9 +919,9 @@ public: "namespace": "clanguml::t00064", "source_location": { "column": 7, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 55, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "template_parameters": [], "type": "class" @@ -944,9 +941,9 @@ public: "namespace": "clanguml::t00064", "source_location": { "column": 37, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 25, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "template_parameters": [ { @@ -979,9 +976,9 @@ public: "namespace": "clanguml::t00064", "source_location": { "column": 47, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 33, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "template_parameters": [ { @@ -1020,9 +1017,9 @@ public: "namespace": "clanguml::t00064", "source_location": { "column": 28, - "file": "../../tests/t00064/t00064.cc", + "file": "t00064.cc", "line": 15, - "translation_unit": "../../tests/t00064/t00064.cc" + "translation_unit": "t00064.cc" }, "template_parameters": [ { @@ -1035,11 +1032,6 @@ public: "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00064_class", "relationships": [ { diff --git a/docs/test_cases/t00064_class.svg b/docs/test_cases/t00064_class.svg index fed31368..b4bda2d3 100644 --- a/docs/test_cases/t00064_class.svg +++ b/docs/test_cases/t00064_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + type_list @@ -19,8 +19,8 @@ - - + + type_list @@ -29,8 +29,8 @@ - - + + type_list @@ -39,8 +39,8 @@ - - + + type_list @@ -49,8 +49,8 @@ - - + + head @@ -59,8 +59,8 @@ - - + + type_list @@ -69,8 +69,8 @@ - - + + type_list @@ -79,8 +79,8 @@ - - + + type_list @@ -89,8 +89,8 @@ - - + + type_group_pair @@ -99,15 +99,15 @@ - + - + size : const size_t - - + + optional_ref @@ -116,8 +116,8 @@ - - + + optional_ref @@ -126,8 +126,8 @@ - - + + type_group_pair_it @@ -135,54 +135,54 @@ 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 * - - + + A - - + + B - - + + C - - + + type_list @@ -191,8 +191,8 @@ - - + + type_list @@ -201,8 +201,8 @@ - - + + type_list @@ -211,8 +211,8 @@ - - + + type_group_pair @@ -221,30 +221,30 @@ - - + + R - + - + abc : type_group_pair<type_list<float,double>,type_list<A,B,C>> - + - + aboolint : type_list<A,bool,int> - - + + type_group_pair @@ -253,8 +253,8 @@ - - + + type_group_pair_it @@ -263,8 +263,8 @@ - - + + head diff --git a/docs/test_cases/t00064_class_mermaid.svg b/docs/test_cases/t00064_class_mermaid.svg index a9459ff6..f5efffda 100644 --- a/docs/test_cases/t00064_class_mermaid.svg +++ b/docs/test_cases/t00064_class_mermaid.svg @@ -390,7 +390,7 @@ - + @@ -409,7 +409,7 @@ - + @@ -428,7 +428,7 @@ - + @@ -447,7 +447,7 @@ - + @@ -466,7 +466,7 @@ - + @@ -485,7 +485,7 @@ - + @@ -504,7 +504,7 @@ - + @@ -523,7 +523,7 @@ - + @@ -542,7 +542,7 @@ - + @@ -566,7 +566,7 @@ - + @@ -585,7 +585,7 @@ - + @@ -604,7 +604,7 @@ - + @@ -638,7 +638,7 @@ - + @@ -657,7 +657,7 @@ - + @@ -676,7 +676,7 @@ - + @@ -695,7 +695,7 @@ - + @@ -714,7 +714,7 @@ - + @@ -733,7 +733,7 @@ - + @@ -752,7 +752,7 @@ - + @@ -771,7 +771,7 @@ - + @@ -800,7 +800,7 @@ - + @@ -819,7 +819,7 @@ - + @@ -838,7 +838,7 @@ - + diff --git a/docs/test_cases/t00065.md b/docs/test_cases/t00065.md index 1e114d62..f357d420 100644 --- a/docs/test_cases/t00065.md +++ b/docs/test_cases/t00065.md @@ -1,21 +1,17 @@ # t00065 - Class diagram with packages from directory structure ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00065_class: type: class glob: - t00065.cc - relative_to: ../../../tests/t00065 generate_packages: true package_type: directory include: namespaces: - clanguml::t00065 - using_namespace: - - clanguml::t00065 + using_namespace: clanguml::t00065 ``` ## Source code File t00065.cc @@ -63,9 +59,9 @@ struct R { "namespace": "clanguml::t00065::detail", "source_location": { "column": 8, - "file": "../../clang-uml/tests/t00065/module1/submodule1a/submodule1a.h", + "file": "module1/submodule1a/submodule1a.h", "line": 6, - "translation_unit": "../../clang-uml/tests/t00065/t00065.cc" + "translation_unit": "t00065.cc" }, "template_parameters": [], "type": "class" @@ -87,9 +83,9 @@ struct R { "namespace": "clanguml::t00065", "source_location": { "column": 12, - "file": "../../clang-uml/tests/t00065/module1/module1.h", + "file": "module1/module1.h", "line": 8, - "translation_unit": "../../clang-uml/tests/t00065/t00065.cc" + "translation_unit": "t00065.cc" }, "type": "enum" }, @@ -106,9 +102,9 @@ struct R { "namespace": "clanguml::t00065", "source_location": { "column": 6, - "file": "../../clang-uml/tests/t00065/module1/module1.h", + "file": "module1/module1.h", "line": 10, - "translation_unit": "../../clang-uml/tests/t00065/t00065.cc" + "translation_unit": "t00065.cc" }, "type": "enum" }, @@ -128,9 +124,9 @@ struct R { "name": "abc", "source_location": { "column": 9, - "file": "../../clang-uml/tests/t00065/module1/module1.h", + "file": "module1/module1.h", "line": 13, - "translation_unit": "../../clang-uml/tests/t00065/t00065.cc" + "translation_unit": "t00065.cc" }, "type": "ABC" }, @@ -140,9 +136,9 @@ struct R { "name": "xyz", "source_location": { "column": 9, - "file": "../../clang-uml/tests/t00065/module1/module1.h", + "file": "module1/module1.h", "line": 14, - "translation_unit": "../../clang-uml/tests/t00065/t00065.cc" + "translation_unit": "t00065.cc" }, "type": "XYZ" }, @@ -152,9 +148,9 @@ struct R { "name": "pimpl", "source_location": { "column": 20, - "file": "../../clang-uml/tests/t00065/module1/module1.h", + "file": "module1/module1.h", "line": 15, - "translation_unit": "../../clang-uml/tests/t00065/t00065.cc" + "translation_unit": "t00065.cc" }, "type": "detail::AImpl *" } @@ -164,9 +160,9 @@ struct R { "namespace": "clanguml::t00065", "source_location": { "column": 8, - "file": "../../clang-uml/tests/t00065/module1/module1.h", + "file": "module1/module1.h", "line": 12, - "translation_unit": "../../clang-uml/tests/t00065/t00065.cc" + "translation_unit": "t00065.cc" }, "template_parameters": [], "type": "class" @@ -194,9 +190,9 @@ struct R { ], "source_location": { "column": 9, - "file": "../../clang-uml/tests/t00065/module2/concepts/concepts.h", + "file": "module2/concepts/concepts.h", "line": 7, - "translation_unit": "../../clang-uml/tests/t00065/t00065.cc" + "translation_unit": "t00065.cc" }, "statements": [ "T{}", @@ -238,9 +234,9 @@ struct R { "parameters": [], "source_location": { "column": 5, - "file": "../../clang-uml/tests/t00065/module2/module2.h", + "file": "module2/module2.h", "line": 8, - "translation_unit": "../../clang-uml/tests/t00065/t00065.cc" + "translation_unit": "t00065.cc" }, "type": "void" }, @@ -263,9 +259,9 @@ struct R { "parameters": [], "source_location": { "column": 10, - "file": "../../clang-uml/tests/t00065/module2/module2.h", + "file": "module2/module2.h", "line": 9, - "translation_unit": "../../clang-uml/tests/t00065/t00065.cc" + "translation_unit": "t00065.cc" }, "type": "void" } @@ -274,9 +270,9 @@ struct R { "namespace": "clanguml::t00065", "source_location": { "column": 8, - "file": "../../clang-uml/tests/t00065/module2/module2.h", + "file": "module2/module2.h", "line": 7, - "translation_unit": "../../clang-uml/tests/t00065/t00065.cc" + "translation_unit": "t00065.cc" }, "template_parameters": [], "type": "class" @@ -297,9 +293,9 @@ struct R { "name": "t", "source_location": { "column": 8, - "file": "../../clang-uml/tests/t00065/module2/module2.h", + "file": "module2/module2.h", "line": 13, - "translation_unit": "../../clang-uml/tests/t00065/t00065.cc" + "translation_unit": "t00065.cc" }, "type": "T *" } @@ -309,9 +305,9 @@ struct R { "namespace": "clanguml::t00065", "source_location": { "column": 30, - "file": "../../clang-uml/tests/t00065/module2/module2.h", + "file": "module2/module2.h", "line": 12, - "translation_unit": "../../clang-uml/tests/t00065/t00065.cc" + "translation_unit": "t00065.cc" }, "template_parameters": [ { @@ -338,9 +334,9 @@ struct R { "namespace": "clanguml::t00065", "source_location": { "column": 30, - "file": "../../clang-uml/tests/t00065/module2/module2.h", + "file": "module2/module2.h", "line": 12, - "translation_unit": "../../clang-uml/tests/t00065/t00065.cc" + "translation_unit": "t00065.cc" }, "template_parameters": [ { @@ -368,9 +364,9 @@ struct R { "name": "t", "source_location": { "column": 7, - "file": "../../clang-uml/tests/t00065/module2/module2.h", + "file": "module2/module2.h", "line": 17, - "translation_unit": "../../clang-uml/tests/t00065/t00065.cc" + "translation_unit": "t00065.cc" }, "type": "T" }, @@ -380,9 +376,9 @@ struct R { "name": "c", "source_location": { "column": 12, - "file": "../../clang-uml/tests/t00065/module2/module2.h", + "file": "module2/module2.h", "line": 18, - "translation_unit": "../../clang-uml/tests/t00065/t00065.cc" + "translation_unit": "t00065.cc" }, "type": "C" } @@ -392,9 +388,9 @@ struct R { "namespace": "clanguml::t00065", "source_location": { "column": 30, - "file": "../../clang-uml/tests/t00065/module2/module2.h", + "file": "module2/module2.h", "line": 16, - "translation_unit": "../../clang-uml/tests/t00065/t00065.cc" + "translation_unit": "t00065.cc" }, "template_parameters": [ { @@ -421,9 +417,9 @@ struct R { "namespace": "clanguml::t00065", "source_location": { "column": 30, - "file": "../../clang-uml/tests/t00065/module2/module2.h", + "file": "module2/module2.h", "line": 12, - "translation_unit": "../../clang-uml/tests/t00065/t00065.cc" + "translation_unit": "t00065.cc" }, "template_parameters": [ { @@ -450,9 +446,9 @@ struct R { "namespace": "clanguml::t00065", "source_location": { "column": 30, - "file": "../../clang-uml/tests/t00065/module2/module2.h", + "file": "module2/module2.h", "line": 16, - "translation_unit": "../../clang-uml/tests/t00065/t00065.cc" + "translation_unit": "t00065.cc" }, "template_parameters": [ { @@ -484,9 +480,9 @@ struct R { "name": "a", "source_location": { "column": 8, - "file": "../../clang-uml/tests/t00065/t00065.cc", + "file": "t00065.cc", "line": 7, - "translation_unit": "../../clang-uml/tests/t00065/t00065.cc" + "translation_unit": "t00065.cc" }, "type": "A *" }, @@ -496,9 +492,9 @@ struct R { "name": "c", "source_location": { "column": 10, - "file": "../../clang-uml/tests/t00065/t00065.cc", + "file": "t00065.cc", "line": 8, - "translation_unit": "../../clang-uml/tests/t00065/t00065.cc" + "translation_unit": "t00065.cc" }, "type": "C" }, @@ -508,9 +504,9 @@ struct R { "name": "d", "source_location": { "column": 10, - "file": "../../clang-uml/tests/t00065/t00065.cc", + "file": "t00065.cc", "line": 9, - "translation_unit": "../../clang-uml/tests/t00065/t00065.cc" + "translation_unit": "t00065.cc" }, "type": "D" } @@ -520,19 +516,14 @@ struct R { "namespace": "clanguml::t00065", "source_location": { "column": 8, - "file": "../../clang-uml/tests/t00065/t00065.cc", + "file": "t00065.cc", "line": 6, - "translation_unit": "../../clang-uml/tests/t00065/t00065.cc" + "translation_unit": "t00065.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00065_class", "relationships": [ { diff --git a/docs/test_cases/t00065_class.svg b/docs/test_cases/t00065_class.svg index 07eec011..d5849b0c 100644 --- a/docs/test_cases/t00065_class.svg +++ b/docs/test_cases/t00065_class.svg @@ -1,6 +1,6 @@ - + @@ -9,20 +9,20 @@ - + module1 - + submodule1a - + module2 - + concepts - - + + ABC @@ -32,8 +32,8 @@ c - - + + XYZ @@ -43,68 +43,68 @@ z - - + + A - + - + abc : ABC - + - + pimpl : detail::AImpl * - + - + xyz : XYZ - - + + AImpl - - + + B - + - + B() = default : void - + - + b() : void - - + + C @@ -113,15 +113,15 @@ - + - + t : T * - - + + C @@ -130,8 +130,8 @@ - - + + D @@ -140,22 +140,22 @@ - + - + c : C<int> - + - + t : T - - + + C @@ -164,8 +164,8 @@ - - + + D @@ -174,8 +174,8 @@ - - + + «concept» @@ -186,33 +186,33 @@ T{} t.b() - - + + R - + - + a : A * - + - + c : C<B> - + - + d : D<B> diff --git a/docs/test_cases/t00065_class_mermaid.svg b/docs/test_cases/t00065_class_mermaid.svg index f7f8a142..a19f1e72 100644 --- a/docs/test_cases/t00065_class_mermaid.svg +++ b/docs/test_cases/t00065_class_mermaid.svg @@ -210,7 +210,7 @@ - + @@ -229,7 +229,7 @@ - + @@ -263,7 +263,7 @@ - + @@ -297,7 +297,7 @@ - + @@ -331,7 +331,7 @@ - + @@ -365,7 +365,7 @@ - + @@ -394,7 +394,7 @@ - + @@ -418,7 +418,7 @@ - + @@ -437,7 +437,7 @@ - + @@ -466,7 +466,7 @@ - + @@ -485,7 +485,7 @@ - + @@ -504,7 +504,7 @@ - + diff --git a/docs/test_cases/t00066.md b/docs/test_cases/t00066.md index 96a58730..9ab7858f 100644 --- a/docs/test_cases/t00066.md +++ b/docs/test_cases/t00066.md @@ -1,20 +1,17 @@ # t00066 - Class fields and methods without grouping and sorting ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00066_class: type: class glob: - - ../../tests/t00066/t00066.cc + - t00066.cc include: namespaces: - clanguml::t00066 member_order: as_is group_methods: false - using_namespace: - - clanguml::t00066 + using_namespace: clanguml::t00066 ``` ## Source code File t00066.cc @@ -114,9 +111,9 @@ int A::static_int = 1; "name": "public_member", "source_location": { "column": 9, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 45, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "int" }, @@ -126,9 +123,9 @@ int A::static_int = 1; "name": "protected_member", "source_location": { "column": 9, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 53, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "int" }, @@ -138,9 +135,9 @@ int A::static_int = 1; "name": "compare", "source_location": { "column": 36, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 55, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "std::function" }, @@ -150,9 +147,9 @@ int A::static_int = 1; "name": "private_member", "source_location": { "column": 9, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 62, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "int" }, @@ -162,9 +159,9 @@ int A::static_int = 1; "name": "a_", "source_location": { "column": 9, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 63, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "int" }, @@ -174,9 +171,9 @@ int A::static_int = 1; "name": "b_", "source_location": { "column": 13, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 63, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "int" }, @@ -186,9 +183,9 @@ int A::static_int = 1; "name": "c_", "source_location": { "column": 17, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 63, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "int" }, @@ -198,9 +195,9 @@ int A::static_int = 1; "name": "static_int", "source_location": { "column": 16, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 46, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "int" }, @@ -210,9 +207,9 @@ int A::static_int = 1; "name": "static_const_int", "source_location": { "column": 22, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 47, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "const int" }, @@ -222,9 +219,9 @@ int A::static_int = 1; "name": "auto_member", "source_location": { "column": 23, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 48, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "const unsigned long" } @@ -249,9 +246,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 5, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 9, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "void" }, @@ -279,9 +276,9 @@ int A::static_int = 1; ], "source_location": { "column": 5, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 10, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "void" }, @@ -309,9 +306,9 @@ int A::static_int = 1; ], "source_location": { "column": 5, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 14, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "void" }, @@ -339,9 +336,9 @@ int A::static_int = 1; ], "source_location": { "column": 5, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 15, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "void" }, @@ -364,9 +361,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 13, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 16, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "void" }, @@ -389,9 +386,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 18, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "void" }, @@ -414,9 +411,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 16, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 19, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "int" }, @@ -439,9 +436,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 20, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "void" }, @@ -464,9 +461,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 21, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "int" }, @@ -489,9 +486,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 8, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 23, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "A &" }, @@ -519,9 +516,9 @@ int A::static_int = 1; ], "source_location": { "column": 8, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 29, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "A &" }, @@ -549,9 +546,9 @@ int A::static_int = 1; ], "source_location": { "column": 8, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 30, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "A &" }, @@ -574,9 +571,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 17, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 32, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "std::size_t" }, @@ -604,9 +601,9 @@ int A::static_int = 1; ], "source_location": { "column": 10, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 34, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "int" }, @@ -638,9 +635,9 @@ int A::static_int = 1; ], "source_location": { "column": 10, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 35, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "int" }, @@ -669,9 +666,9 @@ int A::static_int = 1; ], "source_location": { "column": 10, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 37, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "int" }, @@ -704,9 +701,9 @@ int A::static_int = 1; ], "source_location": { "column": 17, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 38, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "std::string" }, @@ -734,9 +731,9 @@ int A::static_int = 1; ], "source_location": { "column": 14, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 43, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "A" }, @@ -759,9 +756,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 51, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "void" }, @@ -784,9 +781,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 60, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "type": "void" } @@ -795,19 +792,14 @@ int A::static_int = 1; "namespace": "clanguml::t00066", "source_location": { "column": 7, - "file": "../../tests/t00066/t00066.cc", + "file": "t00066.cc", "line": 7, - "translation_unit": "../../tests/t00066/t00066.cc" + "translation_unit": "t00066.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00066_class", "relationships": [], "using_namespace": "clanguml::t00066" diff --git a/docs/test_cases/t00066_class.svg b/docs/test_cases/t00066_class.svg index e9d76df4..c5e24209 100644 --- a/docs/test_cases/t00066_class.svg +++ b/docs/test_cases/t00066_class.svg @@ -1,6 +1,6 @@ - + @@ -9,222 +9,222 @@ - - + + 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 ff249c59..595d96cf 100644 --- a/docs/test_cases/t00066_class_mermaid.svg +++ b/docs/test_cases/t00066_class_mermaid.svg @@ -52,7 +52,7 @@ - + diff --git a/docs/test_cases/t00067.md b/docs/test_cases/t00067.md index 8de0be71..7822566a 100644 --- a/docs/test_cases/t00067.md +++ b/docs/test_cases/t00067.md @@ -1,13 +1,11 @@ # t00067 - Class method type filter test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00067_class: type: class glob: - - ../../tests/t00067/t00067.cc + - t00067.cc include: namespaces: - clanguml::t00067 @@ -18,8 +16,7 @@ diagrams: - operator - assignment - static - using_namespace: - - clanguml::t00067 + using_namespace: clanguml::t00067 ``` ## Source code File t00067.cc @@ -117,9 +114,9 @@ int A::static_int = 1; "name": "public_member", "source_location": { "column": 9, - "file": "../../tests/t00067/t00067.cc", + "file": "t00067.cc", "line": 44, - "translation_unit": "../../tests/t00067/t00067.cc" + "translation_unit": "t00067.cc" }, "type": "int" }, @@ -129,9 +126,9 @@ int A::static_int = 1; "name": "protected_member", "source_location": { "column": 9, - "file": "../../tests/t00067/t00067.cc", + "file": "t00067.cc", "line": 52, - "translation_unit": "../../tests/t00067/t00067.cc" + "translation_unit": "t00067.cc" }, "type": "int" }, @@ -141,9 +138,9 @@ int A::static_int = 1; "name": "compare", "source_location": { "column": 36, - "file": "../../tests/t00067/t00067.cc", + "file": "t00067.cc", "line": 54, - "translation_unit": "../../tests/t00067/t00067.cc" + "translation_unit": "t00067.cc" }, "type": "std::function" }, @@ -153,9 +150,9 @@ int A::static_int = 1; "name": "private_member", "source_location": { "column": 9, - "file": "../../tests/t00067/t00067.cc", + "file": "t00067.cc", "line": 61, - "translation_unit": "../../tests/t00067/t00067.cc" + "translation_unit": "t00067.cc" }, "type": "int" }, @@ -165,9 +162,9 @@ int A::static_int = 1; "name": "a_", "source_location": { "column": 9, - "file": "../../tests/t00067/t00067.cc", + "file": "t00067.cc", "line": 62, - "translation_unit": "../../tests/t00067/t00067.cc" + "translation_unit": "t00067.cc" }, "type": "int" }, @@ -177,9 +174,9 @@ int A::static_int = 1; "name": "b_", "source_location": { "column": 13, - "file": "../../tests/t00067/t00067.cc", + "file": "t00067.cc", "line": 62, - "translation_unit": "../../tests/t00067/t00067.cc" + "translation_unit": "t00067.cc" }, "type": "int" }, @@ -189,9 +186,9 @@ int A::static_int = 1; "name": "c_", "source_location": { "column": 17, - "file": "../../tests/t00067/t00067.cc", + "file": "t00067.cc", "line": 62, - "translation_unit": "../../tests/t00067/t00067.cc" + "translation_unit": "t00067.cc" }, "type": "int" }, @@ -201,9 +198,9 @@ int A::static_int = 1; "name": "static_int", "source_location": { "column": 16, - "file": "../../tests/t00067/t00067.cc", + "file": "t00067.cc", "line": 45, - "translation_unit": "../../tests/t00067/t00067.cc" + "translation_unit": "t00067.cc" }, "type": "int" }, @@ -213,9 +210,9 @@ int A::static_int = 1; "name": "static_const_int", "source_location": { "column": 22, - "file": "../../tests/t00067/t00067.cc", + "file": "t00067.cc", "line": 46, - "translation_unit": "../../tests/t00067/t00067.cc" + "translation_unit": "t00067.cc" }, "type": "const int" }, @@ -225,9 +222,9 @@ int A::static_int = 1; "name": "auto_member", "source_location": { "column": 23, - "file": "../../tests/t00067/t00067.cc", + "file": "t00067.cc", "line": 47, - "translation_unit": "../../tests/t00067/t00067.cc" + "translation_unit": "t00067.cc" }, "type": "const unsigned long" } @@ -252,9 +249,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00067/t00067.cc", + "file": "t00067.cc", "line": 17, - "translation_unit": "../../tests/t00067/t00067.cc" + "translation_unit": "t00067.cc" }, "type": "void" }, @@ -277,9 +274,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00067/t00067.cc", + "file": "t00067.cc", "line": 19, - "translation_unit": "../../tests/t00067/t00067.cc" + "translation_unit": "t00067.cc" }, "type": "void" }, @@ -302,9 +299,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00067/t00067.cc", + "file": "t00067.cc", "line": 20, - "translation_unit": "../../tests/t00067/t00067.cc" + "translation_unit": "t00067.cc" }, "type": "int" }, @@ -327,9 +324,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 17, - "file": "../../tests/t00067/t00067.cc", + "file": "t00067.cc", "line": 31, - "translation_unit": "../../tests/t00067/t00067.cc" + "translation_unit": "t00067.cc" }, "type": "std::size_t" }, @@ -357,9 +354,9 @@ int A::static_int = 1; ], "source_location": { "column": 10, - "file": "../../tests/t00067/t00067.cc", + "file": "t00067.cc", "line": 33, - "translation_unit": "../../tests/t00067/t00067.cc" + "translation_unit": "t00067.cc" }, "type": "int" }, @@ -391,9 +388,9 @@ int A::static_int = 1; ], "source_location": { "column": 10, - "file": "../../tests/t00067/t00067.cc", + "file": "t00067.cc", "line": 34, - "translation_unit": "../../tests/t00067/t00067.cc" + "translation_unit": "t00067.cc" }, "type": "int" }, @@ -422,9 +419,9 @@ int A::static_int = 1; ], "source_location": { "column": 10, - "file": "../../tests/t00067/t00067.cc", + "file": "t00067.cc", "line": 36, - "translation_unit": "../../tests/t00067/t00067.cc" + "translation_unit": "t00067.cc" }, "type": "int" }, @@ -457,9 +454,9 @@ int A::static_int = 1; ], "source_location": { "column": 17, - "file": "../../tests/t00067/t00067.cc", + "file": "t00067.cc", "line": 37, - "translation_unit": "../../tests/t00067/t00067.cc" + "translation_unit": "t00067.cc" }, "type": "std::string" }, @@ -482,9 +479,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00067/t00067.cc", + "file": "t00067.cc", "line": 50, - "translation_unit": "../../tests/t00067/t00067.cc" + "translation_unit": "t00067.cc" }, "type": "void" }, @@ -507,9 +504,9 @@ int A::static_int = 1; "parameters": [], "source_location": { "column": 10, - "file": "../../tests/t00067/t00067.cc", + "file": "t00067.cc", "line": 59, - "translation_unit": "../../tests/t00067/t00067.cc" + "translation_unit": "t00067.cc" }, "type": "void" } @@ -518,19 +515,14 @@ int A::static_int = 1; "namespace": "clanguml::t00067", "source_location": { "column": 7, - "file": "../../tests/t00067/t00067.cc", + "file": "t00067.cc", "line": 6, - "translation_unit": "../../tests/t00067/t00067.cc" + "translation_unit": "t00067.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00067_class", "relationships": [], "using_namespace": "clanguml::t00067" diff --git a/docs/test_cases/t00067_class.svg b/docs/test_cases/t00067_class.svg index fd502d50..88d5bc53 100644 --- a/docs/test_cases/t00067_class.svg +++ b/docs/test_cases/t00067_class.svg @@ -1,6 +1,6 @@ - + @@ -9,152 +9,152 @@ - - + + 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 d983e213..d2a624b9 100644 --- a/docs/test_cases/t00067_class_mermaid.svg +++ b/docs/test_cases/t00067_class_mermaid.svg @@ -52,7 +52,7 @@ - + diff --git a/docs/test_cases/t00068.md b/docs/test_cases/t00068.md index ed728ef2..f4e00155 100644 --- a/docs/test_cases/t00068.md +++ b/docs/test_cases/t00068.md @@ -1,14 +1,12 @@ # t00068 - Context filter radius parameter test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t00068_r0_class: type: class title: AAA context of radius 0 glob: - - ../../tests/t00068/t00068.cc + - t00068.cc include: namespaces: - clanguml::t00068 @@ -16,13 +14,12 @@ diagrams: - match: radius: 0 pattern: clanguml::t00068::AAA - using_namespace: - - clanguml::t00068 + using_namespace: clanguml::t00068 t00068_r1_class: type: class title: AAA context of radius 1 glob: - - ../../tests/t00068/t00068.cc + - t00068.cc include: namespaces: - clanguml::t00068 @@ -30,13 +27,12 @@ diagrams: - match: radius: 1 pattern: clanguml::t00068::AAA - using_namespace: - - clanguml::t00068 + using_namespace: clanguml::t00068 t00068_r2_class: type: class title: AAA context of radius 2 glob: - - ../../tests/t00068/t00068.cc + - t00068.cc include: namespaces: - clanguml::t00068 @@ -44,8 +40,7 @@ diagrams: - match: radius: 2 pattern: clanguml::t00068::AAA - using_namespace: - - clanguml::t00068 + using_namespace: clanguml::t00068 ``` ## Source code File t00068.cc @@ -119,9 +114,9 @@ struct RR { "name": "bb", "source_location": { "column": 9, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 20, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "type": "BB *" }, @@ -131,9 +126,9 @@ struct RR { "name": "akind", "source_location": { "column": 11, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 21, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "type": "AKind" } @@ -143,19 +138,14 @@ struct RR { "namespace": "clanguml::t00068", "source_location": { "column": 8, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 19, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00068_r0_class", "relationships": [ { @@ -203,9 +193,9 @@ struct RR { "name": "b", "source_location": { "column": 20, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 10, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "type": "std::vector" } @@ -215,9 +205,9 @@ struct RR { "namespace": "clanguml::t00068", "source_location": { "column": 8, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 9, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "template_parameters": [], "type": "class" @@ -235,9 +225,9 @@ struct RR { "namespace": "clanguml::t00068", "source_location": { "column": 12, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 13, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "type": "enum" }, @@ -263,9 +253,9 @@ struct RR { "namespace": "clanguml::t00068", "source_location": { "column": 8, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 17, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "template_parameters": [], "type": "class" @@ -293,9 +283,9 @@ struct RR { "name": "bb", "source_location": { "column": 9, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 20, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "type": "BB *" }, @@ -305,9 +295,9 @@ struct RR { "name": "akind", "source_location": { "column": 11, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 21, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "type": "AKind" } @@ -317,9 +307,9 @@ struct RR { "namespace": "clanguml::t00068", "source_location": { "column": 8, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 19, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "template_parameters": [], "type": "class" @@ -340,9 +330,9 @@ struct RR { "name": "aaa", "source_location": { "column": 10, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 25, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "type": "AAA *" } @@ -352,19 +342,14 @@ struct RR { "namespace": "clanguml::t00068", "source_location": { "column": 8, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 24, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00068_r1_class", "relationships": [ { @@ -431,9 +416,9 @@ struct RR { "namespace": "clanguml::t00068", "source_location": { "column": 8, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 7, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "template_parameters": [], "type": "class" @@ -454,9 +439,9 @@ struct RR { "name": "b", "source_location": { "column": 20, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 10, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "type": "std::vector" } @@ -466,9 +451,9 @@ struct RR { "namespace": "clanguml::t00068", "source_location": { "column": 8, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 9, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "template_parameters": [], "type": "class" @@ -486,9 +471,9 @@ struct RR { "namespace": "clanguml::t00068", "source_location": { "column": 12, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 13, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "type": "enum" }, @@ -507,9 +492,9 @@ struct RR { "namespace": "clanguml::t00068", "source_location": { "column": 8, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 15, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "template_parameters": [], "type": "class" @@ -536,9 +521,9 @@ struct RR { "namespace": "clanguml::t00068", "source_location": { "column": 8, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 17, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "template_parameters": [], "type": "class" @@ -566,9 +551,9 @@ struct RR { "name": "bb", "source_location": { "column": 9, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 20, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "type": "BB *" }, @@ -578,9 +563,9 @@ struct RR { "name": "akind", "source_location": { "column": 11, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 21, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "type": "AKind" } @@ -590,9 +575,9 @@ struct RR { "namespace": "clanguml::t00068", "source_location": { "column": 8, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 19, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "template_parameters": [], "type": "class" @@ -613,9 +598,9 @@ struct RR { "name": "aaa", "source_location": { "column": 10, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 25, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "type": "AAA *" } @@ -625,9 +610,9 @@ struct RR { "namespace": "clanguml::t00068", "source_location": { "column": 8, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 24, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "template_parameters": [], "type": "class" @@ -648,9 +633,9 @@ struct RR { "name": "r", "source_location": { "column": 24, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 29, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "type": "std::shared_ptr" } @@ -660,19 +645,14 @@ struct RR { "namespace": "clanguml::t00068", "source_location": { "column": 8, - "file": "../../tests/t00068/t00068.cc", + "file": "t00068.cc", "line": 28, - "translation_unit": "../../tests/t00068/t00068.cc" + "translation_unit": "t00068.cc" }, "template_parameters": [], "type": "class" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t00068_r2_class", "relationships": [ { diff --git a/docs/test_cases/t00068_r0_class.svg b/docs/test_cases/t00068_r0_class.svg index 50cc2620..012f577c 100644 --- a/docs/test_cases/t00068_r0_class.svg +++ b/docs/test_cases/t00068_r0_class.svg @@ -1,6 +1,6 @@ - + @@ -10,26 +10,26 @@ 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 0e5b61d3..e2e4731a 100644 --- a/docs/test_cases/t00068_r0_class_mermaid.svg +++ b/docs/test_cases/t00068_r0_class_mermaid.svg @@ -53,7 +53,7 @@ - + diff --git a/docs/test_cases/t00068_r1_class.svg b/docs/test_cases/t00068_r1_class.svg index 52a5d620..b22ef403 100644 --- a/docs/test_cases/t00068_r1_class.svg +++ b/docs/test_cases/t00068_r1_class.svg @@ -1,6 +1,6 @@ - + @@ -10,23 +10,23 @@ AAA context of radius 1 - - + + BB - + - + b : std::vector<B> - - + + AKind @@ -36,49 +36,49 @@ ThreeA - - + + AA - - + + AAA - + - + akind : AKind - + - + bb : BB * - - + + R - + - + aaa : AAA * diff --git a/docs/test_cases/t00068_r1_class_mermaid.svg b/docs/test_cases/t00068_r1_class_mermaid.svg index d3ace616..aa459224 100644 --- a/docs/test_cases/t00068_r1_class_mermaid.svg +++ b/docs/test_cases/t00068_r1_class_mermaid.svg @@ -101,7 +101,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -207,7 +207,7 @@ - + diff --git a/docs/test_cases/t00068_r2_class.svg b/docs/test_cases/t00068_r2_class.svg index 47a03235..02deeaf5 100644 --- a/docs/test_cases/t00068_r2_class.svg +++ b/docs/test_cases/t00068_r2_class.svg @@ -1,6 +1,6 @@ - + @@ -10,31 +10,31 @@ AAA context of radius 2 - - + + B - - + + BB - + - + b : std::vector<B> - - + + AKind @@ -44,72 +44,72 @@ ThreeA - - + + A - - + + AA - - + + AAA - + - + akind : AKind - + - + bb : BB * - - + + R - + - + aaa : AAA * - - + + RR - + - + r : std::shared_ptr<R> diff --git a/docs/test_cases/t00068_r2_class_mermaid.svg b/docs/test_cases/t00068_r2_class_mermaid.svg index 95c5fa24..d3054f1b 100644 --- a/docs/test_cases/t00068_r2_class_mermaid.svg +++ b/docs/test_cases/t00068_r2_class_mermaid.svg @@ -135,7 +135,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -212,7 +212,7 @@ - + @@ -231,7 +231,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -279,7 +279,7 @@ - + @@ -303,7 +303,7 @@ - + diff --git a/docs/test_cases/t20001.md b/docs/test_cases/t20001.md index 4aa957e8..4ea79e4d 100644 --- a/docs/test_cases/t20001.md +++ b/docs/test_cases/t20001.md @@ -1,8 +1,6 @@ # t20001 - Basic sequence diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams add_compile_flags: - -fparse-all-comments diagrams: @@ -10,15 +8,14 @@ diagrams: type: sequence title: Basic sequence diagram example glob: - - ../../tests/t20001/t20001.cc + - t20001.cc include: namespaces: - clanguml::t20001 exclude: namespaces: - clanguml::t20001::detail - using_namespace: - - clanguml::t20001 + using_namespace: clanguml::t20001 from: - function: "clanguml::t20001::tmain()" plantuml: @@ -119,11 +116,6 @@ int tmain() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20001_sequence", "participants": [ { @@ -131,9 +123,9 @@ int tmain() "name": "clanguml::t20001::tmain()", "source_location": { "column": 5, - "file": "../../tests/t20001/t20001.cc", + "file": "t20001.cc", "line": 61, - "translation_unit": "../../tests/t20001/t20001.cc" + "translation_unit": "t20001.cc" }, "type": "function" }, @@ -142,9 +134,9 @@ int tmain() "name": "clanguml::t20001::A", "source_location": { "column": 7, - "file": "../../tests/t20001/t20001.cc", + "file": "t20001.cc", "line": 13, - "translation_unit": "../../tests/t20001/t20001.cc" + "translation_unit": "t20001.cc" }, "type": "class" }, @@ -153,9 +145,9 @@ int tmain() "name": "clanguml::t20001::B", "source_location": { "column": 7, - "file": "../../tests/t20001/t20001.cc", + "file": "t20001.cc", "line": 36, - "translation_unit": "../../tests/t20001/t20001.cc" + "translation_unit": "t20001.cc" }, "type": "class" } @@ -175,9 +167,9 @@ int tmain() "scope": "normal", "source_location": { "column": 7, - "file": "../../tests/t20001/t20001.cc", + "file": "t20001.cc", "line": 63, - "translation_unit": "../../tests/t20001/t20001.cc" + "translation_unit": "t20001.cc" }, "to": { "activity_id": "275353461034438145", @@ -198,9 +190,9 @@ int tmain() "scope": "normal", "source_location": { "column": 7, - "file": "../../tests/t20001/t20001.cc", + "file": "t20001.cc", "line": 64, - "translation_unit": "../../tests/t20001/t20001.cc" + "translation_unit": "t20001.cc" }, "to": { "activity_id": "2235477658795500000", @@ -222,9 +214,9 @@ int tmain() "scope": "normal", "source_location": { "column": 16, - "file": "../../tests/t20001/t20001.cc", + "file": "t20001.cc", "line": 67, - "translation_unit": "../../tests/t20001/t20001.cc" + "translation_unit": "t20001.cc" }, "to": { "activity_id": "1131549932713395402", @@ -246,9 +238,9 @@ int tmain() "scope": "normal", "source_location": { "column": 12, - "file": "../../tests/t20001/t20001.cc", + "file": "t20001.cc", "line": 70, - "translation_unit": "../../tests/t20001/t20001.cc" + "translation_unit": "t20001.cc" }, "to": { "activity_id": "642550151323208936", @@ -268,9 +260,9 @@ int tmain() "scope": "normal", "source_location": { "column": 20, - "file": "../../tests/t20001/t20001.cc", + "file": "t20001.cc", "line": 52, - "translation_unit": "../../tests/t20001/t20001.cc" + "translation_unit": "t20001.cc" }, "to": { "activity_id": "2090436635449419593", @@ -290,9 +282,9 @@ int tmain() "scope": "normal", "source_location": { "column": 20, - "file": "../../tests/t20001/t20001.cc", + "file": "t20001.cc", "line": 25, - "translation_unit": "../../tests/t20001/t20001.cc" + "translation_unit": "t20001.cc" }, "to": { "activity_id": "1131549932713395402", @@ -312,9 +304,9 @@ int tmain() "scope": "normal", "source_location": { "column": 9, - "file": "../../tests/t20001/t20001.cc", + "file": "t20001.cc", "line": 26, - "translation_unit": "../../tests/t20001/t20001.cc" + "translation_unit": "t20001.cc" }, "to": { "activity_id": "1205947631808952097", @@ -334,9 +326,9 @@ int tmain() "scope": "normal", "source_location": { "column": 9, - "file": "../../tests/t20001/t20001.cc", + "file": "t20001.cc", "line": 53, - "translation_unit": "../../tests/t20001/t20001.cc" + "translation_unit": "t20001.cc" }, "to": { "activity_id": "1205947631808952097", diff --git a/docs/test_cases/t20001_sequence.svg b/docs/test_cases/t20001_sequence.svg index fc9c1689..8ab00170 100644 --- a/docs/test_cases/t20001_sequence.svg +++ b/docs/test_cases/t20001_sequence.svg @@ -1,6 +1,6 @@ - + @@ -10,79 +10,79 @@ Basic sequence diagram example - - - - - - - - - + + + + + + + + + - - + + tmain() - + tmain() - - + + A - + A - - + + B - + B - - - - - - - - - - + + + + + + + + + + A() - + B(A &) - + Just add 2 numbers - + add(int,int) - + And now add another 2 - + wrap_add3(int,int,int) - + add3(int,int,int) - + @@ -93,7 +93,7 @@ - + @@ -102,14 +102,14 @@ - + log_result(int) - + Main test function diff --git a/docs/test_cases/t20002.md b/docs/test_cases/t20002.md index f9d9c065..eea0656e 100644 --- a/docs/test_cases/t20002.md +++ b/docs/test_cases/t20002.md @@ -1,18 +1,15 @@ # t20002 - Free function sequence diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20002_sequence: type: sequence glob: - - ../../tests/t20002/t20002.cc + - t20002.cc include: namespaces: - clanguml::t20002 - using_namespace: - - clanguml::t20002 + using_namespace: clanguml::t20002 from: - function: "clanguml::t20002::m1()" @@ -46,11 +43,6 @@ void m1() { m2(); } ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20002_sequence", "participants": [ { @@ -58,9 +50,9 @@ void m1() { m2(); } "name": "clanguml::t20002::m1()", "source_location": { "column": 6, - "file": "../../tests/t20002/t20002.cc", + "file": "t20002.cc", "line": 14, - "translation_unit": "../../tests/t20002/t20002.cc" + "translation_unit": "t20002.cc" }, "type": "function" }, @@ -69,9 +61,9 @@ void m1() { m2(); } "name": "clanguml::t20002::m2()", "source_location": { "column": 6, - "file": "../../tests/t20002/t20002.cc", + "file": "t20002.cc", "line": 12, - "translation_unit": "../../tests/t20002/t20002.cc" + "translation_unit": "t20002.cc" }, "type": "function" }, @@ -80,9 +72,9 @@ void m1() { m2(); } "name": "clanguml::t20002::m3()", "source_location": { "column": 6, - "file": "../../tests/t20002/t20002.cc", + "file": "t20002.cc", "line": 10, - "translation_unit": "../../tests/t20002/t20002.cc" + "translation_unit": "t20002.cc" }, "type": "function" }, @@ -91,9 +83,9 @@ void m1() { m2(); } "name": "clanguml::t20002::m4()", "source_location": { "column": 6, - "file": "../../tests/t20002/t20002.cc", + "file": "t20002.cc", "line": 8, - "translation_unit": "../../tests/t20002/t20002.cc" + "translation_unit": "t20002.cc" }, "type": "function" } @@ -113,9 +105,9 @@ void m1() { m2(); } "scope": "normal", "source_location": { "column": 13, - "file": "../../tests/t20002/t20002.cc", + "file": "t20002.cc", "line": 14, - "translation_unit": "../../tests/t20002/t20002.cc" + "translation_unit": "t20002.cc" }, "to": { "activity_id": "1575240232156112674", @@ -136,9 +128,9 @@ void m1() { m2(); } "scope": "normal", "source_location": { "column": 13, - "file": "../../tests/t20002/t20002.cc", + "file": "t20002.cc", "line": 12, - "translation_unit": "../../tests/t20002/t20002.cc" + "translation_unit": "t20002.cc" }, "to": { "activity_id": "1838809176089209580", @@ -159,9 +151,9 @@ void m1() { m2(); } "scope": "normal", "source_location": { "column": 13, - "file": "../../tests/t20002/t20002.cc", + "file": "t20002.cc", "line": 10, - "translation_unit": "../../tests/t20002/t20002.cc" + "translation_unit": "t20002.cc" }, "to": { "activity_id": "63715062711218534", diff --git a/docs/test_cases/t20002_sequence.svg b/docs/test_cases/t20002_sequence.svg index 679b51c8..80bda1ef 100644 --- a/docs/test_cases/t20002_sequence.svg +++ b/docs/test_cases/t20002_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,51 +9,51 @@ - - - - + + + + - - + + m1() - + m1() - - + + m2() - + m2() - - + + m3() - + m3() - - + + m4() - + m4() - - - - - + + + + + - + - + diff --git a/docs/test_cases/t20003.md b/docs/test_cases/t20003.md index 39288924..f523d0a0 100644 --- a/docs/test_cases/t20003.md +++ b/docs/test_cases/t20003.md @@ -1,18 +1,15 @@ # t20003 - Function template sequence diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20003_sequence: type: sequence glob: - - ../../tests/t20003/t20003.cc + - t20003.cc include: namespaces: - clanguml::t20003 - using_namespace: - - clanguml::t20003 + using_namespace: clanguml::t20003 from: - function: "clanguml::t20003::m1(T)" @@ -42,11 +39,6 @@ template void m1(T p) { m2(p); } ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20003_sequence", "participants": [ { @@ -54,9 +46,9 @@ template void m1(T p) { m2(p); } "name": "clanguml::t20003::m1(T)", "source_location": { "column": 28, - "file": "../../tests/t20003/t20003.cc", + "file": "t20003.cc", "line": 10, - "translation_unit": "../../tests/t20003/t20003.cc" + "translation_unit": "t20003.cc" }, "type": "function_template" }, @@ -65,9 +57,9 @@ template void m1(T p) { m2(p); } "name": "clanguml::t20003::m2(T)", "source_location": { "column": 28, - "file": "../../tests/t20003/t20003.cc", + "file": "t20003.cc", "line": 8, - "translation_unit": "../../tests/t20003/t20003.cc" + "translation_unit": "t20003.cc" }, "type": "function_template" }, @@ -76,9 +68,9 @@ template void m1(T p) { m2(p); } "name": "clanguml::t20003::m3(T)", "source_location": { "column": 28, - "file": "../../tests/t20003/t20003.cc", + "file": "t20003.cc", "line": 6, - "translation_unit": "../../tests/t20003/t20003.cc" + "translation_unit": "t20003.cc" }, "type": "function_template" }, @@ -87,9 +79,9 @@ template void m1(T p) { m2(p); } "name": "clanguml::t20003::m4(T)", "source_location": { "column": 28, - "file": "../../tests/t20003/t20003.cc", + "file": "t20003.cc", "line": 4, - "translation_unit": "../../tests/t20003/t20003.cc" + "translation_unit": "t20003.cc" }, "type": "function_template" } @@ -109,9 +101,9 @@ template void m1(T p) { m2(p); } "scope": "normal", "source_location": { "column": 38, - "file": "../../tests/t20003/t20003.cc", + "file": "t20003.cc", "line": 10, - "translation_unit": "../../tests/t20003/t20003.cc" + "translation_unit": "t20003.cc" }, "to": { "activity_id": "1502957449367040488", @@ -132,9 +124,9 @@ template void m1(T p) { m2(p); } "scope": "normal", "source_location": { "column": 38, - "file": "../../tests/t20003/t20003.cc", + "file": "t20003.cc", "line": 8, - "translation_unit": "../../tests/t20003/t20003.cc" + "translation_unit": "t20003.cc" }, "to": { "activity_id": "613477682313507585", @@ -155,9 +147,9 @@ template void m1(T p) { m2(p); } "scope": "normal", "source_location": { "column": 38, - "file": "../../tests/t20003/t20003.cc", + "file": "t20003.cc", "line": 6, - "translation_unit": "../../tests/t20003/t20003.cc" + "translation_unit": "t20003.cc" }, "to": { "activity_id": "619960023608507925", diff --git a/docs/test_cases/t20003_sequence.svg b/docs/test_cases/t20003_sequence.svg index 807b1c4f..4c31c6d2 100644 --- a/docs/test_cases/t20003_sequence.svg +++ b/docs/test_cases/t20003_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,51 +9,51 @@ - - - - + + + + - - + + m1<T>(T) - + m1<T>(T) - - + + m2<T>(T) - + m2<T>(T) - - + + m3<T>(T) - + m3<T>(T) - - + + m4<T>(T) - + m4<T>(T) - - - - - + + + + + - + - + diff --git a/docs/test_cases/t20004.md b/docs/test_cases/t20004.md index f2de5a41..46d2ffff 100644 --- a/docs/test_cases/t20004.md +++ b/docs/test_cases/t20004.md @@ -1,18 +1,15 @@ # t20004 - Function template instantiation sequence diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20004_sequence: type: sequence glob: - - ../../tests/t20004/t20004.cc + - t20004.cc include: namespaces: - clanguml::t20004 - using_namespace: - - clanguml::t20004 + using_namespace: clanguml::t20004 from: - function: "clanguml::t20004::main()" ``` @@ -78,11 +75,6 @@ int main() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20004_sequence", "participants": [ { @@ -90,9 +82,9 @@ int main() "name": "clanguml::t20004::main()", "source_location": { "column": 5, - "file": "../../tests/t20004/t20004.cc", + "file": "t20004.cc", "line": 38, - "translation_unit": "../../tests/t20004/t20004.cc" + "translation_unit": "t20004.cc" }, "type": "function" }, @@ -101,9 +93,9 @@ int main() "name": "clanguml::t20004::m1(float)", "source_location": { "column": 36, - "file": "../../tests/t20004/t20004.cc", + "file": "t20004.cc", "line": 26, - "translation_unit": "../../tests/t20004/t20004.cc" + "translation_unit": "t20004.cc" }, "type": "function_template" }, @@ -112,9 +104,9 @@ int main() "name": "clanguml::t20004::m1(unsigned long)", "source_location": { "column": 44, - "file": "../../tests/t20004/t20004.cc", + "file": "t20004.cc", "line": 28, - "translation_unit": "../../tests/t20004/t20004.cc" + "translation_unit": "t20004.cc" }, "type": "function_template" }, @@ -123,9 +115,9 @@ int main() "name": "clanguml::t20004::m4(unsigned long)", "source_location": { "column": 44, - "file": "../../tests/t20004/t20004.cc", + "file": "t20004.cc", "line": 10, - "translation_unit": "../../tests/t20004/t20004.cc" + "translation_unit": "t20004.cc" }, "type": "function_template" }, @@ -134,9 +126,9 @@ int main() "name": "clanguml::t20004::m1(std::string)", "source_location": { "column": 42, - "file": "../../tests/t20004/t20004.cc", + "file": "t20004.cc", "line": 33, - "translation_unit": "../../tests/t20004/t20004.cc" + "translation_unit": "t20004.cc" }, "type": "function_template" }, @@ -145,9 +137,9 @@ int main() "name": "clanguml::t20004::m2(std::string)", "source_location": { "column": 42, - "file": "../../tests/t20004/t20004.cc", + "file": "t20004.cc", "line": 19, - "translation_unit": "../../tests/t20004/t20004.cc" + "translation_unit": "t20004.cc" }, "type": "function_template" }, @@ -156,9 +148,9 @@ int main() "name": "clanguml::t20004::m1(int)", "source_location": { "column": 25, - "file": "../../tests/t20004/t20004.cc", + "file": "t20004.cc", "line": 24, - "translation_unit": "../../tests/t20004/t20004.cc" + "translation_unit": "t20004.cc" }, "type": "function_template" }, @@ -167,9 +159,9 @@ int main() "name": "clanguml::t20004::m2(int)", "source_location": { "column": 25, - "file": "../../tests/t20004/t20004.cc", + "file": "t20004.cc", "line": 17, - "translation_unit": "../../tests/t20004/t20004.cc" + "translation_unit": "t20004.cc" }, "type": "function_template" }, @@ -178,9 +170,9 @@ int main() "name": "clanguml::t20004::m3(int)", "source_location": { "column": 25, - "file": "../../tests/t20004/t20004.cc", + "file": "t20004.cc", "line": 15, - "translation_unit": "../../tests/t20004/t20004.cc" + "translation_unit": "t20004.cc" }, "type": "function_template" }, @@ -189,9 +181,9 @@ int main() "name": "clanguml::t20004::m4(int)", "source_location": { "column": 34, - "file": "../../tests/t20004/t20004.cc", + "file": "t20004.cc", "line": 8, - "translation_unit": "../../tests/t20004/t20004.cc" + "translation_unit": "t20004.cc" }, "type": "function_template" } @@ -211,9 +203,9 @@ int main() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20004/t20004.cc", + "file": "t20004.cc", "line": 40, - "translation_unit": "../../tests/t20004/t20004.cc" + "translation_unit": "t20004.cc" }, "to": { "activity_id": "138925040763435897", @@ -234,9 +226,9 @@ int main() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20004/t20004.cc", + "file": "t20004.cc", "line": 42, - "translation_unit": "../../tests/t20004/t20004.cc" + "translation_unit": "t20004.cc" }, "to": { "activity_id": "1239083518717603720", @@ -257,9 +249,9 @@ int main() "scope": "normal", "source_location": { "column": 12, - "file": "../../tests/t20004/t20004.cc", + "file": "t20004.cc", "line": 30, - "translation_unit": "../../tests/t20004/t20004.cc" + "translation_unit": "t20004.cc" }, "to": { "activity_id": "376599675205498367", @@ -280,9 +272,9 @@ int main() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20004/t20004.cc", + "file": "t20004.cc", "line": 44, - "translation_unit": "../../tests/t20004/t20004.cc" + "translation_unit": "t20004.cc" }, "to": { "activity_id": "1845817984839618223", @@ -303,9 +295,9 @@ int main() "scope": "normal", "source_location": { "column": 12, - "file": "../../tests/t20004/t20004.cc", + "file": "t20004.cc", "line": 35, - "translation_unit": "../../tests/t20004/t20004.cc" + "translation_unit": "t20004.cc" }, "to": { "activity_id": "1735054254122948614", @@ -326,9 +318,9 @@ int main() "scope": "normal", "source_location": { "column": 12, - "file": "../../tests/t20004/t20004.cc", + "file": "t20004.cc", "line": 46, - "translation_unit": "../../tests/t20004/t20004.cc" + "translation_unit": "t20004.cc" }, "to": { "activity_id": "121663532044911922", @@ -349,9 +341,9 @@ int main() "scope": "normal", "source_location": { "column": 42, - "file": "../../tests/t20004/t20004.cc", + "file": "t20004.cc", "line": 24, - "translation_unit": "../../tests/t20004/t20004.cc" + "translation_unit": "t20004.cc" }, "to": { "activity_id": "1475362124497386656", @@ -372,9 +364,9 @@ int main() "scope": "normal", "source_location": { "column": 42, - "file": "../../tests/t20004/t20004.cc", + "file": "t20004.cc", "line": 17, - "translation_unit": "../../tests/t20004/t20004.cc" + "translation_unit": "t20004.cc" }, "to": { "activity_id": "734999226157549914", @@ -395,9 +387,9 @@ int main() "scope": "normal", "source_location": { "column": 42, - "file": "../../tests/t20004/t20004.cc", + "file": "t20004.cc", "line": 15, - "translation_unit": "../../tests/t20004/t20004.cc" + "translation_unit": "t20004.cc" }, "to": { "activity_id": "1006390865908497562", diff --git a/docs/test_cases/t20004_sequence.svg b/docs/test_cases/t20004_sequence.svg index fcacc187..bfc67376 100644 --- a/docs/test_cases/t20004_sequence.svg +++ b/docs/test_cases/t20004_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,16 +9,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -29,87 +29,87 @@ - - + + main() - + main() - - + + m1<float>(float) - + m1<float>(float) - - + + m1<unsigned long>(unsigned long) - + m1<unsigned long>(unsigned long) - - + + m4<unsigned long>(unsigned long) - + m4<unsigned long>(unsigned long) - - + + m1<std::string>(std::string) - + m1<std::string>(std::string) - - + + m2<std::string>(std::string) - + m2<std::string>(std::string) - - + + m1<int>(int) - + m1<int>(int) - - + + m2<int>(int) - + m2<int>(int) - - + + m3<int>(int) - + m3<int>(int) - - + + m4<int>(int) - + m4<int>(int) - - - - - - - - - - - + + + + + + + + + + + - + - + @@ -117,11 +117,11 @@ - + - + @@ -129,19 +129,19 @@ - + - + - + - + diff --git a/docs/test_cases/t20005.md b/docs/test_cases/t20005.md index c70f4e84..7946a80d 100644 --- a/docs/test_cases/t20005.md +++ b/docs/test_cases/t20005.md @@ -1,18 +1,15 @@ # t20005 - Class template basic sequence diagram ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20005_sequence: type: sequence glob: - - ../../tests/t20005/t20005.cc + - t20005.cc include: namespaces: - clanguml::t20005 - using_namespace: - - clanguml::t20005 + using_namespace: clanguml::t20005 from: - function: "clanguml::t20005::C::c(T)" ``` @@ -49,11 +46,6 @@ template struct C { ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20005_sequence", "participants": [ { @@ -61,9 +53,9 @@ template struct C { "name": "clanguml::t20005::C", "source_location": { "column": 30, - "file": "../../tests/t20005/t20005.cc", + "file": "t20005.cc", "line": 14, - "translation_unit": "../../tests/t20005/t20005.cc" + "translation_unit": "t20005.cc" }, "type": "class" }, @@ -72,9 +64,9 @@ template struct C { "name": "clanguml::t20005::B", "source_location": { "column": 30, - "file": "../../tests/t20005/t20005.cc", + "file": "t20005.cc", "line": 8, - "translation_unit": "../../tests/t20005/t20005.cc" + "translation_unit": "t20005.cc" }, "type": "class" }, @@ -83,9 +75,9 @@ template struct C { "name": "clanguml::t20005::A", "source_location": { "column": 30, - "file": "../../tests/t20005/t20005.cc", + "file": "t20005.cc", "line": 4, - "translation_unit": "../../tests/t20005/t20005.cc" + "translation_unit": "t20005.cc" }, "type": "class" } @@ -104,9 +96,9 @@ template struct C { "scope": "normal", "source_location": { "column": 25, - "file": "../../tests/t20005/t20005.cc", + "file": "t20005.cc", "line": 15, - "translation_unit": "../../tests/t20005/t20005.cc" + "translation_unit": "t20005.cc" }, "to": { "activity_id": "870466496899932117", @@ -126,9 +118,9 @@ template struct C { "scope": "normal", "source_location": { "column": 25, - "file": "../../tests/t20005/t20005.cc", + "file": "t20005.cc", "line": 9, - "translation_unit": "../../tests/t20005/t20005.cc" + "translation_unit": "t20005.cc" }, "to": { "activity_id": "124853455814403745", diff --git a/docs/test_cases/t20005_sequence.svg b/docs/test_cases/t20005_sequence.svg index 212dc346..b5048542 100644 --- a/docs/test_cases/t20005_sequence.svg +++ b/docs/test_cases/t20005_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,42 +9,42 @@ - - - + + + - - + + C<T> - + C<T> - - + + B<T> - + B<T> - - + + A<T> - + A<T> - - - + + + c(T) - + b(T) - + a(T) diff --git a/docs/test_cases/t20006.md b/docs/test_cases/t20006.md index aaa6e4b7..dd640a5e 100644 --- a/docs/test_cases/t20006.md +++ b/docs/test_cases/t20006.md @@ -1,18 +1,15 @@ # t20006 - Class template specialization basic sequence diagram ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20006_sequence: type: sequence glob: - - ../../tests/t20006/t20006.cc + - t20006.cc include: namespaces: - clanguml::t20006 - using_namespace: - - clanguml::t20006 + using_namespace: clanguml::t20006 from: - function: "clanguml::t20006::tmain()" ``` @@ -107,11 +104,6 @@ void tmain() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20006_sequence", "participants": [ { @@ -119,9 +111,9 @@ void tmain() "name": "clanguml::t20006::tmain()", "source_location": { "column": 6, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 57, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "type": "function" }, @@ -130,9 +122,9 @@ void tmain() "name": "clanguml::t20006::B", "source_location": { "column": 30, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 11, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "type": "class" }, @@ -141,9 +133,9 @@ void tmain() "name": "clanguml::t20006::A", "source_location": { "column": 30, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 6, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "type": "class" }, @@ -152,9 +144,9 @@ void tmain() "name": "clanguml::t20006::B", "source_location": { "column": 20, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 16, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "type": "class" }, @@ -163,9 +155,9 @@ void tmain() "name": "clanguml::t20006::A", "source_location": { "column": 30, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 6, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "type": "class" }, @@ -174,9 +166,9 @@ void tmain() "name": "clanguml::t20006::BB", "source_location": { "column": 30, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 33, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "type": "class" }, @@ -185,9 +177,9 @@ void tmain() "name": "clanguml::t20006::BB", "source_location": { "column": 30, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 45, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "type": "class" }, @@ -196,9 +188,9 @@ void tmain() "name": "clanguml::t20006::BB", "source_location": { "column": 42, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 26, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "type": "class" }, @@ -207,9 +199,9 @@ void tmain() "name": "clanguml::t20006::AA", "source_location": { "column": 30, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 21, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "type": "class" } @@ -229,9 +221,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 62, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "to": { "activity_id": "250247217888843587", @@ -251,9 +243,9 @@ void tmain() "scope": "normal", "source_location": { "column": 25, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 12, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "to": { "activity_id": "196390487987395669", @@ -274,9 +266,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 63, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "to": { "activity_id": "13049632552871157", @@ -296,9 +288,9 @@ void tmain() "scope": "normal", "source_location": { "column": 45, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 17, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "to": { "activity_id": "11762588624112907", @@ -319,9 +311,9 @@ void tmain() "scope": "normal", "source_location": { "column": 26, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 67, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "to": { "activity_id": "381732876807761480", @@ -342,9 +334,9 @@ void tmain() "scope": "normal", "source_location": { "column": 20, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 68, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "to": { "activity_id": "1051013203072323842", @@ -365,9 +357,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 70, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "to": { "activity_id": "1213865121829347654", @@ -387,9 +379,9 @@ void tmain() "scope": "normal", "source_location": { "column": 26, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 27, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "to": { "activity_id": "1235428163990670191", @@ -410,9 +402,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 71, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "to": { "activity_id": "361650123916792854", @@ -432,9 +424,9 @@ void tmain() "scope": "normal", "source_location": { "column": 26, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 28, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "to": { "activity_id": "582097827335267290", @@ -455,9 +447,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 73, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "to": { "activity_id": "1062874005712014125", @@ -477,9 +469,9 @@ void tmain() "scope": "normal", "source_location": { "column": 36, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 34, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "to": { "activity_id": "582097827335267290", @@ -500,9 +492,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 74, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "to": { "activity_id": "787705189994778234", @@ -522,9 +514,9 @@ void tmain() "scope": "normal", "source_location": { "column": 36, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 35, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "to": { "activity_id": "1235428163990670191", @@ -545,9 +537,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 76, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "to": { "activity_id": "1463188845572485713", @@ -567,9 +559,9 @@ void tmain() "scope": "normal", "source_location": { "column": 30, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 46, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "to": { "activity_id": "732362671329401903", @@ -589,9 +581,9 @@ void tmain() "scope": "normal", "source_location": { "column": 30, - "file": "../../tests/t20006/t20006.cc", + "file": "t20006.cc", "line": 47, - "translation_unit": "../../tests/t20006/t20006.cc" + "translation_unit": "t20006.cc" }, "to": { "activity_id": "582097827335267290", diff --git a/docs/test_cases/t20006_sequence.svg b/docs/test_cases/t20006_sequence.svg index b6a9fa9c..7254e752 100644 --- a/docs/test_cases/t20006_sequence.svg +++ b/docs/test_cases/t20006_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,24 +9,24 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -36,84 +36,84 @@ - - + + tmain() - + tmain() - - + + B<int> - + B<int> - - + + A<int> - + A<int> - - + + B<std::string> - + B<std::string> - - + + A<std::string> - + A<std::string> - - + + BB<int,std::string> - + BB<int,std::string> - - + + BB<int,float> - + BB<int,float> - - + + BB<int,int> - + BB<int,int> - - + + AA<int> - + AA<int> - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + b(int) - + a1(int) @@ -122,12 +122,12 @@ - + b(std::string) - + a2(std::string) @@ -136,69 +136,69 @@ - + 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) diff --git a/docs/test_cases/t20007.md b/docs/test_cases/t20007.md index 4e43b741..ed41be24 100644 --- a/docs/test_cases/t20007.md +++ b/docs/test_cases/t20007.md @@ -1,18 +1,15 @@ # t20007 - Class template variadic argument list sequence diagram ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20007_sequence: type: sequence glob: - - ../../tests/t20007/t20007.cc + - t20007.cc include: namespaces: - clanguml::t20007 - using_namespace: - - clanguml::t20007 + using_namespace: clanguml::t20007 from: - function: "clanguml::t20007::tmain()" ``` @@ -53,11 +50,6 @@ void tmain() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20007_sequence", "participants": [ { @@ -65,9 +57,9 @@ void tmain() "name": "clanguml::t20007::tmain()", "source_location": { "column": 6, - "file": "../../tests/t20007/t20007.cc", + "file": "t20007.cc", "line": 11, - "translation_unit": "../../tests/t20007/t20007.cc" + "translation_unit": "t20007.cc" }, "type": "function" }, @@ -76,9 +68,9 @@ void tmain() "name": "clanguml::t20007::Adder", "source_location": { "column": 52, - "file": "../../tests/t20007/t20007.cc", + "file": "t20007.cc", "line": 7, - "translation_unit": "../../tests/t20007/t20007.cc" + "translation_unit": "t20007.cc" }, "type": "class" }, @@ -87,9 +79,9 @@ void tmain() "name": "clanguml::t20007::Adder", "source_location": { "column": 52, - "file": "../../tests/t20007/t20007.cc", + "file": "t20007.cc", "line": 7, - "translation_unit": "../../tests/t20007/t20007.cc" + "translation_unit": "t20007.cc" }, "type": "class" }, @@ -98,9 +90,9 @@ void tmain() "name": "clanguml::t20007::Adder", "source_location": { "column": 52, - "file": "../../tests/t20007/t20007.cc", + "file": "t20007.cc", "line": 7, - "translation_unit": "../../tests/t20007/t20007.cc" + "translation_unit": "t20007.cc" }, "type": "class" } @@ -120,9 +112,9 @@ void tmain() "scope": "normal", "source_location": { "column": 34, - "file": "../../tests/t20007/t20007.cc", + "file": "t20007.cc", "line": 19, - "translation_unit": "../../tests/t20007/t20007.cc" + "translation_unit": "t20007.cc" }, "to": { "activity_id": "438133719207269065", @@ -143,9 +135,9 @@ void tmain() "scope": "normal", "source_location": { "column": 34, - "file": "../../tests/t20007/t20007.cc", + "file": "t20007.cc", "line": 20, - "translation_unit": "../../tests/t20007/t20007.cc" + "translation_unit": "t20007.cc" }, "to": { "activity_id": "9522724767688870", @@ -166,9 +158,9 @@ void tmain() "scope": "normal", "source_location": { "column": 34, - "file": "../../tests/t20007/t20007.cc", + "file": "t20007.cc", "line": 21, - "translation_unit": "../../tests/t20007/t20007.cc" + "translation_unit": "t20007.cc" }, "to": { "activity_id": "384866641042941480", diff --git a/docs/test_cases/t20007_sequence.svg b/docs/test_cases/t20007_sequence.svg index 22f79bd1..44c7e440 100644 --- a/docs/test_cases/t20007_sequence.svg +++ b/docs/test_cases/t20007_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,57 +9,57 @@ - - - - + + + + - - + + tmain() - + tmain() - - + + Adder<int,int> - + Adder<int,int> - - + + Adder<int,float,double> - + Adder<int,float,double> - - + + Adder<std::string,std::string,std::string> - + Adder<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 7fd6edf6..df1d6091 100644 --- a/docs/test_cases/t20008.md +++ b/docs/test_cases/t20008.md @@ -1,18 +1,15 @@ # t20008 - Constexpr if sequence diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20008_sequence: type: sequence glob: - - ../../tests/t20008/t20008.cc + - t20008.cc include: namespaces: - clanguml::t20008 - using_namespace: - - clanguml::t20008 + using_namespace: clanguml::t20008 from: - function: "clanguml::t20008::tmain()" ``` @@ -71,11 +68,6 @@ void tmain() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20008_sequence", "participants": [ { @@ -83,9 +75,9 @@ void tmain() "name": "clanguml::t20008::tmain()", "source_location": { "column": 6, - "file": "../../tests/t20008/t20008.cc", + "file": "t20008.cc", "line": 30, - "translation_unit": "../../tests/t20008/t20008.cc" + "translation_unit": "t20008.cc" }, "type": "function" }, @@ -94,9 +86,9 @@ void tmain() "name": "clanguml::t20008::B", "source_location": { "column": 30, - "file": "../../tests/t20008/t20008.cc", + "file": "t20008.cc", "line": 13, - "translation_unit": "../../tests/t20008/t20008.cc" + "translation_unit": "t20008.cc" }, "type": "class" }, @@ -105,9 +97,9 @@ void tmain() "name": "clanguml::t20008::A", "source_location": { "column": 30, - "file": "../../tests/t20008/t20008.cc", + "file": "t20008.cc", "line": 7, - "translation_unit": "../../tests/t20008/t20008.cc" + "translation_unit": "t20008.cc" }, "type": "class" }, @@ -116,9 +108,9 @@ void tmain() "name": "clanguml::t20008::B", "source_location": { "column": 30, - "file": "../../tests/t20008/t20008.cc", + "file": "t20008.cc", "line": 13, - "translation_unit": "../../tests/t20008/t20008.cc" + "translation_unit": "t20008.cc" }, "type": "class" }, @@ -127,9 +119,9 @@ void tmain() "name": "clanguml::t20008::A", "source_location": { "column": 30, - "file": "../../tests/t20008/t20008.cc", + "file": "t20008.cc", "line": 7, - "translation_unit": "../../tests/t20008/t20008.cc" + "translation_unit": "t20008.cc" }, "type": "class" }, @@ -138,9 +130,9 @@ void tmain() "name": "clanguml::t20008::B", "source_location": { "column": 30, - "file": "../../tests/t20008/t20008.cc", + "file": "t20008.cc", "line": 13, - "translation_unit": "../../tests/t20008/t20008.cc" + "translation_unit": "t20008.cc" }, "type": "class" }, @@ -149,9 +141,9 @@ void tmain() "name": "clanguml::t20008::A", "source_location": { "column": 30, - "file": "../../tests/t20008/t20008.cc", + "file": "t20008.cc", "line": 7, - "translation_unit": "../../tests/t20008/t20008.cc" + "translation_unit": "t20008.cc" }, "type": "class" } @@ -171,9 +163,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20008/t20008.cc", + "file": "t20008.cc", "line": 38, - "translation_unit": "../../tests/t20008/t20008.cc" + "translation_unit": "t20008.cc" }, "to": { "activity_id": "379850145437051189", @@ -193,9 +185,9 @@ void tmain() "scope": "normal", "source_location": { "column": 13, - "file": "../../tests/t20008/t20008.cc", + "file": "t20008.cc", "line": 19, - "translation_unit": "../../tests/t20008/t20008.cc" + "translation_unit": "t20008.cc" }, "to": { "activity_id": "2066363630174644719", @@ -216,9 +208,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20008/t20008.cc", + "file": "t20008.cc", "line": 39, - "translation_unit": "../../tests/t20008/t20008.cc" + "translation_unit": "t20008.cc" }, "to": { "activity_id": "1347162523481637780", @@ -238,9 +230,9 @@ void tmain() "scope": "normal", "source_location": { "column": 13, - "file": "../../tests/t20008/t20008.cc", + "file": "t20008.cc", "line": 22, - "translation_unit": "../../tests/t20008/t20008.cc" + "translation_unit": "t20008.cc" }, "to": { "activity_id": "718650834962275580", @@ -261,9 +253,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20008/t20008.cc", + "file": "t20008.cc", "line": 40, - "translation_unit": "../../tests/t20008/t20008.cc" + "translation_unit": "t20008.cc" }, "to": { "activity_id": "1286410946666951254", @@ -283,9 +275,9 @@ void tmain() "scope": "normal", "source_location": { "column": 13, - "file": "../../tests/t20008/t20008.cc", + "file": "t20008.cc", "line": 25, - "translation_unit": "../../tests/t20008/t20008.cc" + "translation_unit": "t20008.cc" }, "to": { "activity_id": "1404594247101138737", diff --git a/docs/test_cases/t20008_sequence.svg b/docs/test_cases/t20008_sequence.svg index b9573d02..f43dffd5 100644 --- a/docs/test_cases/t20008_sequence.svg +++ b/docs/test_cases/t20008_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,13 +9,13 @@ - - - - - - - + + + + + + + @@ -23,81 +23,81 @@ - - + + tmain() - + tmain() - - + + B<int> - + B<int> - - + + A<int> - + A<int> - - + + B<const char *> - + B<const char *> - - + + A<const char *> - + A<const char *> - - + + B<std::string> - + B<std::string> - - + + A<std::string> - + A<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 4b751b30..20fb2e98 100644 --- a/docs/test_cases/t20009.md +++ b/docs/test_cases/t20009.md @@ -1,18 +1,15 @@ # t20009 - Smart pointer dereference call expression test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20009_sequence: type: sequence glob: - - ../../tests/t20009/t20009.cc + - t20009.cc include: namespaces: - clanguml::t20009 - using_namespace: - - clanguml::t20009 + using_namespace: clanguml::t20009 from: - function: "clanguml::t20009::tmain()" ``` @@ -57,11 +54,6 @@ void tmain() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20009_sequence", "participants": [ { @@ -69,9 +61,9 @@ void tmain() "name": "clanguml::t20009::tmain()", "source_location": { "column": 6, - "file": "../../tests/t20009/t20009.cc", + "file": "t20009.cc", "line": 18, - "translation_unit": "../../tests/t20009/t20009.cc" + "translation_unit": "t20009.cc" }, "type": "function" }, @@ -80,9 +72,9 @@ void tmain() "name": "clanguml::t20009::B", "source_location": { "column": 30, - "file": "../../tests/t20009/t20009.cc", + "file": "t20009.cc", "line": 10, - "translation_unit": "../../tests/t20009/t20009.cc" + "translation_unit": "t20009.cc" }, "type": "class" }, @@ -91,9 +83,9 @@ void tmain() "name": "clanguml::t20009::A", "source_location": { "column": 30, - "file": "../../tests/t20009/t20009.cc", + "file": "t20009.cc", "line": 6, - "translation_unit": "../../tests/t20009/t20009.cc" + "translation_unit": "t20009.cc" }, "type": "class" }, @@ -102,9 +94,9 @@ void tmain() "name": "clanguml::t20009::B", "source_location": { "column": 30, - "file": "../../tests/t20009/t20009.cc", + "file": "t20009.cc", "line": 10, - "translation_unit": "../../tests/t20009/t20009.cc" + "translation_unit": "t20009.cc" }, "type": "class" }, @@ -113,9 +105,9 @@ void tmain() "name": "clanguml::t20009::A", "source_location": { "column": 30, - "file": "../../tests/t20009/t20009.cc", + "file": "t20009.cc", "line": 6, - "translation_unit": "../../tests/t20009/t20009.cc" + "translation_unit": "t20009.cc" }, "type": "class" }, @@ -124,9 +116,9 @@ void tmain() "name": "clanguml::t20009::B", "source_location": { "column": 30, - "file": "../../tests/t20009/t20009.cc", + "file": "t20009.cc", "line": 10, - "translation_unit": "../../tests/t20009/t20009.cc" + "translation_unit": "t20009.cc" }, "type": "class" }, @@ -135,9 +127,9 @@ void tmain() "name": "clanguml::t20009::A", "source_location": { "column": 30, - "file": "../../tests/t20009/t20009.cc", + "file": "t20009.cc", "line": 6, - "translation_unit": "../../tests/t20009/t20009.cc" + "translation_unit": "t20009.cc" }, "type": "class" } @@ -157,9 +149,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20009/t20009.cc", + "file": "t20009.cc", "line": 24, - "translation_unit": "../../tests/t20009/t20009.cc" + "translation_unit": "t20009.cc" }, "to": { "activity_id": "1960266381909090879", @@ -179,9 +171,9 @@ void tmain() "scope": "normal", "source_location": { "column": 21, - "file": "../../tests/t20009/t20009.cc", + "file": "t20009.cc", "line": 11, - "translation_unit": "../../tests/t20009/t20009.cc" + "translation_unit": "t20009.cc" }, "to": { "activity_id": "1716775846967761286", @@ -202,9 +194,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20009/t20009.cc", + "file": "t20009.cc", "line": 25, - "translation_unit": "../../tests/t20009/t20009.cc" + "translation_unit": "t20009.cc" }, "to": { "activity_id": "660557928399203634", @@ -224,9 +216,9 @@ void tmain() "scope": "normal", "source_location": { "column": 21, - "file": "../../tests/t20009/t20009.cc", + "file": "t20009.cc", "line": 11, - "translation_unit": "../../tests/t20009/t20009.cc" + "translation_unit": "t20009.cc" }, "to": { "activity_id": "2030629454810805092", @@ -247,9 +239,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20009/t20009.cc", + "file": "t20009.cc", "line": 26, - "translation_unit": "../../tests/t20009/t20009.cc" + "translation_unit": "t20009.cc" }, "to": { "activity_id": "367805163135583282", @@ -269,9 +261,9 @@ void tmain() "scope": "normal", "source_location": { "column": 21, - "file": "../../tests/t20009/t20009.cc", + "file": "t20009.cc", "line": 11, - "translation_unit": "../../tests/t20009/t20009.cc" + "translation_unit": "t20009.cc" }, "to": { "activity_id": "1643733911490581293", diff --git a/docs/test_cases/t20009_sequence.svg b/docs/test_cases/t20009_sequence.svg index 1982e9ad..9fcef0ce 100644 --- a/docs/test_cases/t20009_sequence.svg +++ b/docs/test_cases/t20009_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,13 +9,13 @@ - - - - - - - + + + + + + + @@ -23,81 +23,81 @@ - - + + tmain() - + tmain() - - + + 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> - - - - - - - - + + + + + + + + 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 c1d0f6f4..da541ed7 100644 --- a/docs/test_cases/t20010.md +++ b/docs/test_cases/t20010.md @@ -1,18 +1,15 @@ # t20010 - Container sequence diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20010_sequence: type: sequence glob: - - ../../tests/t20010/t20010.cc + - t20010.cc include: namespaces: - clanguml::t20010 - using_namespace: - - clanguml::t20010 + using_namespace: clanguml::t20010 from: - function: "clanguml::t20010::tmain()" ``` @@ -67,11 +64,6 @@ void tmain() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20010_sequence", "participants": [ { @@ -79,9 +71,9 @@ void tmain() "name": "clanguml::t20010::tmain()", "source_location": { "column": 6, - "file": "../../tests/t20010/t20010.cc", + "file": "t20010.cc", "line": 28, - "translation_unit": "../../tests/t20010/t20010.cc" + "translation_unit": "t20010.cc" }, "type": "function" }, @@ -90,9 +82,9 @@ void tmain() "name": "clanguml::t20010::B", "source_location": { "column": 30, - "file": "../../tests/t20010/t20010.cc", + "file": "t20010.cc", "line": 16, - "translation_unit": "../../tests/t20010/t20010.cc" + "translation_unit": "t20010.cc" }, "type": "class" }, @@ -101,9 +93,9 @@ void tmain() "name": "clanguml::t20010::A", "source_location": { "column": 8, - "file": "../../tests/t20010/t20010.cc", + "file": "t20010.cc", "line": 9, - "translation_unit": "../../tests/t20010/t20010.cc" + "translation_unit": "t20010.cc" }, "type": "class" } @@ -123,9 +115,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20010/t20010.cc", + "file": "t20010.cc", "line": 32, - "translation_unit": "../../tests/t20010/t20010.cc" + "translation_unit": "t20010.cc" }, "to": { "activity_id": "343626060927491836", @@ -145,9 +137,9 @@ void tmain() "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20010/t20010.cc", + "file": "t20010.cc", "line": 17, - "translation_unit": "../../tests/t20010/t20010.cc" + "translation_unit": "t20010.cc" }, "to": { "activity_id": "981184681827469850", @@ -168,9 +160,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20010/t20010.cc", + "file": "t20010.cc", "line": 33, - "translation_unit": "../../tests/t20010/t20010.cc" + "translation_unit": "t20010.cc" }, "to": { "activity_id": "1633031113603062043", @@ -190,9 +182,9 @@ void tmain() "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20010/t20010.cc", + "file": "t20010.cc", "line": 18, - "translation_unit": "../../tests/t20010/t20010.cc" + "translation_unit": "t20010.cc" }, "to": { "activity_id": "664370880632146592", @@ -213,9 +205,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20010/t20010.cc", + "file": "t20010.cc", "line": 34, - "translation_unit": "../../tests/t20010/t20010.cc" + "translation_unit": "t20010.cc" }, "to": { "activity_id": "786218543654309692", @@ -235,9 +227,9 @@ void tmain() "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20010/t20010.cc", + "file": "t20010.cc", "line": 19, - "translation_unit": "../../tests/t20010/t20010.cc" + "translation_unit": "t20010.cc" }, "to": { "activity_id": "2145739294823015899", @@ -258,9 +250,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20010/t20010.cc", + "file": "t20010.cc", "line": 35, - "translation_unit": "../../tests/t20010/t20010.cc" + "translation_unit": "t20010.cc" }, "to": { "activity_id": "1866068965397702666", @@ -280,9 +272,9 @@ void tmain() "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20010/t20010.cc", + "file": "t20010.cc", "line": 20, - "translation_unit": "../../tests/t20010/t20010.cc" + "translation_unit": "t20010.cc" }, "to": { "activity_id": "1224936485834400821", diff --git a/docs/test_cases/t20010_sequence.svg b/docs/test_cases/t20010_sequence.svg index 0245fe2e..dc47eb2b 100644 --- a/docs/test_cases/t20010_sequence.svg +++ b/docs/test_cases/t20010_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,81 +9,81 @@ - - - - - - - - - + + + + + + + + + - - + + tmain() - + tmain() - - + + B<int> - + B<int> - - + + A - + A - - - - - - - - - - + + + + + + + + + + b1() - + a1() - + b2() - + a2() - + b3() - + a3() - + b4() - + a4() diff --git a/docs/test_cases/t20011.md b/docs/test_cases/t20011.md index b2dd144a..90513c32 100644 --- a/docs/test_cases/t20011.md +++ b/docs/test_cases/t20011.md @@ -1,18 +1,15 @@ # t20011 - Recursive calls sequence diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20011_sequence: type: sequence glob: - - ../../tests/t20011/t20011.cc + - t20011.cc include: namespaces: - clanguml::t20011 - using_namespace: - - clanguml::t20011 + using_namespace: clanguml::t20011 from: - function: "clanguml::t20011::tmain()" ``` @@ -59,11 +56,6 @@ void tmain() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20011_sequence", "participants": [ { @@ -71,9 +63,9 @@ void tmain() "name": "clanguml::t20011::tmain()", "source_location": { "column": 6, - "file": "../../tests/t20011/t20011.cc", + "file": "t20011.cc", "line": 22, - "translation_unit": "../../tests/t20011/t20011.cc" + "translation_unit": "t20011.cc" }, "type": "function" }, @@ -82,9 +74,9 @@ void tmain() "name": "clanguml::t20011::A", "source_location": { "column": 8, - "file": "../../tests/t20011/t20011.cc", + "file": "t20011.cc", "line": 4, - "translation_unit": "../../tests/t20011/t20011.cc" + "translation_unit": "t20011.cc" }, "type": "class" } @@ -104,9 +96,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20011/t20011.cc", + "file": "t20011.cc", "line": 26, - "translation_unit": "../../tests/t20011/t20011.cc" + "translation_unit": "t20011.cc" }, "to": { "activity_id": "1647578261840204206", @@ -131,9 +123,9 @@ void tmain() "scope": "normal", "source_location": { "column": 13, - "file": "../../tests/t20011/t20011.cc", + "file": "t20011.cc", "line": 8, - "translation_unit": "../../tests/t20011/t20011.cc" + "translation_unit": "t20011.cc" }, "to": { "activity_id": "1647578261840204206", @@ -161,9 +153,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20011/t20011.cc", + "file": "t20011.cc", "line": 28, - "translation_unit": "../../tests/t20011/t20011.cc" + "translation_unit": "t20011.cc" }, "to": { "activity_id": "305456175818875420", @@ -183,9 +175,9 @@ void tmain() "scope": "normal", "source_location": { "column": 26, - "file": "../../tests/t20011/t20011.cc", + "file": "t20011.cc", "line": 11, - "translation_unit": "../../tests/t20011/t20011.cc" + "translation_unit": "t20011.cc" }, "to": { "activity_id": "963268672079901211", @@ -205,9 +197,9 @@ void tmain() "scope": "normal", "source_location": { "column": 21, - "file": "../../tests/t20011/t20011.cc", + "file": "t20011.cc", "line": 12, - "translation_unit": "../../tests/t20011/t20011.cc" + "translation_unit": "t20011.cc" }, "to": { "activity_id": "1874311762268001137", @@ -232,9 +224,9 @@ void tmain() "scope": "normal", "source_location": { "column": 13, - "file": "../../tests/t20011/t20011.cc", + "file": "t20011.cc", "line": 16, - "translation_unit": "../../tests/t20011/t20011.cc" + "translation_unit": "t20011.cc" }, "to": { "activity_id": "305456175818875420", @@ -254,9 +246,9 @@ void tmain() "scope": "normal", "source_location": { "column": 13, - "file": "../../tests/t20011/t20011.cc", + "file": "t20011.cc", "line": 18, - "translation_unit": "../../tests/t20011/t20011.cc" + "translation_unit": "t20011.cc" }, "to": { "activity_id": "1647578261840204206", diff --git a/docs/test_cases/t20011_sequence.svg b/docs/test_cases/t20011_sequence.svg index f09503a5..e45507c6 100644 --- a/docs/test_cases/t20011_sequence.svg +++ b/docs/test_cases/t20011_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,42 +9,42 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - + + tmain() - + tmain() - - + + A - + A - - - - - - - - - - + + + + + + + + + + a(int) @@ -52,26 +52,26 @@ alt - + a(int) - + b(int) - + c(int) - + @@ -81,14 +81,14 @@ alt - + b(int) - + @@ -98,7 +98,7 @@ alt - + diff --git a/docs/test_cases/t20012.md b/docs/test_cases/t20012.md index 85abbb25..79ca70fc 100644 --- a/docs/test_cases/t20012.md +++ b/docs/test_cases/t20012.md @@ -1,18 +1,15 @@ # t20012 - Lambda expression call sequence diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20012_sequence: type: sequence glob: - - ../../tests/t20012/t20012.cc + - t20012.cc include: namespaces: - clanguml::t20012 - using_namespace: - - clanguml::t20012 + using_namespace: clanguml::t20012 from: - function: "clanguml::t20012::tmain()" ``` @@ -134,11 +131,6 @@ void tmain() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20012_sequence", "participants": [ { @@ -146,20 +138,20 @@ void tmain() "name": "clanguml::t20012::tmain()", "source_location": { "column": 6, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 59, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "type": "function" }, { - "id": "1160054139240670033", - "name": "clanguml::t20012::tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)", + "id": "1823127147500894672", + "name": "clanguml::t20012::tmain()::(lambda t20012.cc:67:20)", "source_location": { "column": 20, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 67, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "type": "class" }, @@ -168,9 +160,9 @@ void tmain() "name": "clanguml::t20012::A", "source_location": { "column": 8, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 10, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "type": "class" }, @@ -179,20 +171,20 @@ void tmain() "name": "clanguml::t20012::B", "source_location": { "column": 8, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 18, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "type": "class" }, { - "id": "409124263156368546", - "name": "clanguml::t20012::tmain()::(lambda ../../tests/t20012/t20012.cc:80:20)", + "id": "2103332104162021186", + "name": "clanguml::t20012::tmain()::(lambda t20012.cc:80:20)", "source_location": { "column": 20, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 80, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "type": "class" }, @@ -201,31 +193,31 @@ void tmain() "name": "clanguml::t20012::C", "source_location": { "column": 8, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 28, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "type": "class" }, { - "id": "1848989986288721876", - "name": "clanguml::t20012::R", + "id": "943938410171869397", + "name": "clanguml::t20012::R", "source_location": { "column": 30, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 48, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "type": "class" }, { - "id": "235908030444274749", - "name": "clanguml::t20012::tmain()::(lambda ../../tests/t20012/t20012.cc:86:9)", + "id": "1523229682883773614", + "name": "clanguml::t20012::tmain()::(lambda t20012.cc:86:9)", "source_location": { "column": 9, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 86, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "type": "class" } @@ -245,31 +237,31 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 73, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "to": { - "activity_id": "2097044932440760306", - "activity_name": "clanguml::t20012::tmain()##(lambda ../../tests/t20012/t20012.cc:67:20)::operator()()", - "participant_id": "1160054139240670033" + "activity_id": "1314931307342523651", + "activity_name": "clanguml::t20012::tmain()##(lambda t20012.cc:67:20)::operator()()", + "participant_id": "1823127147500894672" }, "type": "message" }, { "from": { - "activity_id": "2097044932440760306", - "activity_name": "clanguml::t20012::tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)::operator()()", - "participant_id": "1160054139240670033" + "activity_id": "1314931307342523651", + "activity_name": "clanguml::t20012::tmain()::(lambda t20012.cc:67:20)::operator()()", + "participant_id": "1823127147500894672" }, "name": "a()", "return_type": "void", "scope": "normal", "source_location": { "column": 9, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 68, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "to": { "activity_id": "1871432932744498976", @@ -289,9 +281,9 @@ void tmain() "scope": "normal", "source_location": { "column": 16, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 11, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "to": { "activity_id": "1100933039353876539", @@ -311,9 +303,9 @@ void tmain() "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 13, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "to": { "activity_id": "941636185823691898", @@ -324,18 +316,18 @@ void tmain() }, { "from": { - "activity_id": "2097044932440760306", - "activity_name": "clanguml::t20012::tmain()::(lambda ../../tests/t20012/t20012.cc:67:20)::operator()()", - "participant_id": "1160054139240670033" + "activity_id": "1314931307342523651", + "activity_name": "clanguml::t20012::tmain()::(lambda t20012.cc:67:20)::operator()()", + "participant_id": "1823127147500894672" }, "name": "b()", "return_type": "void", "scope": "normal", "source_location": { "column": 9, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 69, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "to": { "activity_id": "2142697410385270633", @@ -355,9 +347,9 @@ void tmain() "scope": "normal", "source_location": { "column": 16, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 19, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "to": { "activity_id": "973718340784931313", @@ -377,9 +369,9 @@ void tmain() "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 21, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "to": { "activity_id": "195788529004378403", @@ -400,31 +392,31 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 84, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "to": { - "activity_id": "3346531080036149", - "activity_name": "clanguml::t20012::tmain()##(lambda ../../tests/t20012/t20012.cc:80:20)::operator()()", - "participant_id": "409124263156368546" + "activity_id": "1464047298179756286", + "activity_name": "clanguml::t20012::tmain()##(lambda t20012.cc:80:20)::operator()()", + "participant_id": "2103332104162021186" }, "type": "message" }, { "from": { - "activity_id": "3346531080036149", - "activity_name": "clanguml::t20012::tmain()::(lambda ../../tests/t20012/t20012.cc:80:20)::operator()()", - "participant_id": "409124263156368546" + "activity_id": "1464047298179756286", + "activity_name": "clanguml::t20012::tmain()::(lambda t20012.cc:80:20)::operator()()", + "participant_id": "2103332104162021186" }, "name": "c()", "return_type": "void", "scope": "normal", "source_location": { "column": 9, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 81, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "to": { "activity_id": "675369415318225607", @@ -444,9 +436,9 @@ void tmain() "scope": "normal", "source_location": { "column": 16, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 29, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "to": { "activity_id": "1451821704315336057", @@ -466,9 +458,9 @@ void tmain() "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 31, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "to": { "activity_id": "1956141408799600460", @@ -479,23 +471,23 @@ void tmain() }, { "from": { - "activity_id": "3346531080036149", - "activity_name": "clanguml::t20012::tmain()::(lambda ../../tests/t20012/t20012.cc:80:20)::operator()()", - "participant_id": "409124263156368546" + "activity_id": "1464047298179756286", + "activity_name": "clanguml::t20012::tmain()::(lambda t20012.cc:80:20)::operator()()", + "participant_id": "2103332104162021186" }, "name": "operator()()", "return_type": "", "scope": "normal", "source_location": { "column": 9, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 82, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "to": { - "activity_id": "2097044932440760306", - "activity_name": "clanguml::t20012::tmain()##(lambda ../../tests/t20012/t20012.cc:67:20)::operator()()", - "participant_id": "1160054139240670033" + "activity_id": "1314931307342523651", + "activity_name": "clanguml::t20012::tmain()##(lambda t20012.cc:67:20)::operator()()", + "participant_id": "1823127147500894672" }, "type": "message" }, @@ -511,14 +503,14 @@ void tmain() "scope": "normal", "source_location": { "column": 7, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 86, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "to": { - "activity_id": "1163275626544717212", - "activity_name": "clanguml::t20012::R::R((lambda at /home/bartek/devel/clang-uml/tests/t20012/t20012.cc:86:9) &&)", - "participant_id": "1848989986288721876" + "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" }, @@ -534,53 +526,53 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 88, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "to": { - "activity_id": "983377906480895496", - "activity_name": "clanguml::t20012::R::r()", - "participant_id": "1848989986288721876" + "activity_id": "984475898639439059", + "activity_name": "clanguml::t20012::R::r()", + "participant_id": "943938410171869397" }, "type": "message" }, { "from": { - "activity_id": "983377906480895496", - "activity_name": "clanguml::t20012::R::r()", - "participant_id": "1848989986288721876" + "activity_id": "984475898639439059", + "activity_name": "clanguml::t20012::R::r()", + "participant_id": "943938410171869397" }, "name": "operator()()", "return_type": "", "scope": "normal", "source_location": { "column": 16, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 54, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "to": { - "activity_id": "2085809056446194400", - "activity_name": "clanguml::t20012::tmain()##(lambda ../../tests/t20012/t20012.cc:86:9)::operator()()", - "participant_id": "235908030444274749" + "activity_id": "1801444422355429914", + "activity_name": "clanguml::t20012::tmain()##(lambda t20012.cc:86:9)::operator()()", + "participant_id": "1523229682883773614" }, "type": "message" }, { "from": { - "activity_id": "2085809056446194400", - "activity_name": "clanguml::t20012::tmain()::(lambda ../../tests/t20012/t20012.cc:86:9)::operator()()", - "participant_id": "235908030444274749" + "activity_id": "1801444422355429914", + "activity_name": "clanguml::t20012::tmain()::(lambda t20012.cc:86:9)::operator()()", + "participant_id": "1523229682883773614" }, "name": "c()", "return_type": "void", "scope": "normal", "source_location": { "column": 18, - "file": "../../tests/t20012/t20012.cc", + "file": "t20012.cc", "line": 86, - "translation_unit": "../../tests/t20012/t20012.cc" + "translation_unit": "t20012.cc" }, "to": { "activity_id": "675369415318225607", diff --git a/docs/test_cases/t20012_sequence.svg b/docs/test_cases/t20012_sequence.svg index e145a139..788a8071 100644 --- a/docs/test_cases/t20012_sequence.svg +++ b/docs/test_cases/t20012_sequence.svg @@ -1,6 +1,6 @@ - + - + @@ -9,263 +9,263 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + tmain() - + tmain() - - - tmain()::(lambda ../../tests/t20012/t20012.cc:67:20) - - tmain()::(lambda ../../tests/t20012/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 ../../tests/t20012/t20012.cc:80:20) - - tmain()::(lambda ../../tests/t20012/t20012.cc:80:20) + + + tmain()::(lambda t20012.cc:80:20) + + tmain()::(lambda t20012.cc:80:20) - - - C - - C + + + C + + C - - - R<R::(lambda ../../tests/t20012/t20012.cc:86:9)> - - R<R::(lambda ../../tests/t20012/t20012.cc:86:9)> + + + R<R::(lambda t20012.cc:86:9)> + + R<R::(lambda t20012.cc:86:9)> - - - tmain()::(lambda ../../tests/t20012/t20012.cc:86:9) - - tmain()::(lambda ../../tests/t20012/t20012.cc:86:9) + + + tmain()::(lambda t20012.cc:86:9) + + tmain()::(lambda t20012.cc:86:9) - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + operator()() - - - - a() + + + + a() - - - - - - aa() + + + + + + aa() - - - - - - aaa() + + + + + + aaa() - - - - b() + + + + b() - - - - - - bb() + + + + + + bb() - - - - - - bbb() + + + + + + bbb() - - - - + + + + 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() - - - - 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 f2682488..45caec59 100644 --- a/docs/test_cases/t20012_sequence_mermaid.svg +++ b/docs/test_cases/t20012_sequence_mermaid.svg @@ -1,44 +1,44 @@ - + - - - tmain()::(lambda ../../tests/t20012/t20012.cc:86:9) + + + tmain()::(lambda t20012.cc:86:9) - - - R<R::(lambda ../../tests/t20012/t20012.cc:86:9)> + + + R<R::(lambda t20012.cc:86:9)> - - - C + + + C - - - tmain()::(lambda ../../tests/t20012/t20012.cc:80:20) + + + tmain()::(lambda t20012.cc:80:20) - - - B + + + B - - - A + + + A - - - tmain()::(lambda ../../tests/t20012/t20012.cc:67:20) + + + tmain()::(lambda t20012.cc:67:20) @@ -48,65 +48,65 @@ - + - - - tmain()::(lambda ../../tests/t20012/t20012.cc:86:9) + + + tmain()::(lambda t20012.cc:86:9) - + - - - R<R::(lambda ../../tests/t20012/t20012.cc:86:9)> + + + R<R::(lambda t20012.cc:86:9)> - + - - - C + + + C - + - - - tmain()::(lambda ../../tests/t20012/t20012.cc:80:20) + + + tmain()::(lambda t20012.cc:80:20) - + - - - B + + + B - + - - - A + + + A - + - - - tmain()::(lambda ../../tests/t20012/t20012.cc:67:20) + + + tmain()::(lambda t20012.cc:67:20) @@ -161,131 +161,131 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - operator()() - - a() - - aa() - - aaa() - - b() - - bb() - - bbb() - - ​ - - operator()() - - c() - - cc() - - ccc() - - operator()() - - a() - - aa() - - aaa() - - b() - - bb() - - bbb() - - ​ - - ​ - - R((lambda at /home/bartek/devel/clang-uml/tests/t20012/t20012.cc:86:9) &&) - - r() - - operator()() - - c() - - cc() - - ccc() - - ​ - + operator()() + + a() + + aa() + + aaa() + + b() + + bb() + + bbb() + + ​ + + operator()() + + c() + + cc() + + ccc() + + operator()() + + a() + + aa() + + aaa() + + b() + + bb() + + bbb() + + ​ + + ​ + + 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 926fa99f..b7832457 100644 --- a/docs/test_cases/t20013.md +++ b/docs/test_cases/t20013.md @@ -1,18 +1,15 @@ # t20013 - Function and method arguments in sequence diagrams test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20013_sequence: type: sequence glob: - - ../../tests/t20013/t20013.cc + - t20013.cc include: namespaces: - clanguml::t20013 - using_namespace: - - clanguml::t20013 + using_namespace: clanguml::t20013 from: - function: "clanguml::t20013::tmain(int,char **)" ``` @@ -55,11 +52,6 @@ void tmain(int argc, char **argv) ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20013_sequence", "participants": [ { @@ -67,9 +59,9 @@ void tmain(int argc, char **argv) "name": "clanguml::t20013::tmain(int,char **)", "source_location": { "column": 6, - "file": "../../tests/t20013/t20013.cc", + "file": "t20013.cc", "line": 18, - "translation_unit": "../../tests/t20013/t20013.cc" + "translation_unit": "t20013.cc" }, "type": "function" }, @@ -78,9 +70,9 @@ void tmain(int argc, char **argv) "name": "clanguml::t20013::B", "source_location": { "column": 8, - "file": "../../tests/t20013/t20013.cc", + "file": "t20013.cc", "line": 10, - "translation_unit": "../../tests/t20013/t20013.cc" + "translation_unit": "t20013.cc" }, "type": "class" }, @@ -89,9 +81,9 @@ void tmain(int argc, char **argv) "name": "clanguml::t20013::A", "source_location": { "column": 8, - "file": "../../tests/t20013/t20013.cc", + "file": "t20013.cc", "line": 4, - "translation_unit": "../../tests/t20013/t20013.cc" + "translation_unit": "t20013.cc" }, "type": "class" } @@ -111,9 +103,9 @@ void tmain(int argc, char **argv) "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20013/t20013.cc", + "file": "t20013.cc", "line": 22, - "translation_unit": "../../tests/t20013/t20013.cc" + "translation_unit": "t20013.cc" }, "to": { "activity_id": "2144804108273682993", @@ -133,9 +125,9 @@ void tmain(int argc, char **argv) "scope": "normal", "source_location": { "column": 27, - "file": "../../tests/t20013/t20013.cc", + "file": "t20013.cc", "line": 11, - "translation_unit": "../../tests/t20013/t20013.cc" + "translation_unit": "t20013.cc" }, "to": { "activity_id": "1034027282942033004", @@ -156,9 +148,9 @@ void tmain(int argc, char **argv) "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20013/t20013.cc", + "file": "t20013.cc", "line": 23, - "translation_unit": "../../tests/t20013/t20013.cc" + "translation_unit": "t20013.cc" }, "to": { "activity_id": "640747884486165287", @@ -178,9 +170,9 @@ void tmain(int argc, char **argv) "scope": "normal", "source_location": { "column": 33, - "file": "../../tests/t20013/t20013.cc", + "file": "t20013.cc", "line": 12, - "translation_unit": "../../tests/t20013/t20013.cc" + "translation_unit": "t20013.cc" }, "to": { "activity_id": "394053399890813915", @@ -201,9 +193,9 @@ void tmain(int argc, char **argv) "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20013/t20013.cc", + "file": "t20013.cc", "line": 24, - "translation_unit": "../../tests/t20013/t20013.cc" + "translation_unit": "t20013.cc" }, "to": { "activity_id": "1066935874364409142", @@ -223,9 +215,9 @@ void tmain(int argc, char **argv) "scope": "normal", "source_location": { "column": 43, - "file": "../../tests/t20013/t20013.cc", + "file": "t20013.cc", "line": 13, - "translation_unit": "../../tests/t20013/t20013.cc" + "translation_unit": "t20013.cc" }, "to": { "activity_id": "1841239321495867611", diff --git a/docs/test_cases/t20013_sequence.svg b/docs/test_cases/t20013_sequence.svg index ed7176b8..f0efd99f 100644 --- a/docs/test_cases/t20013_sequence.svg +++ b/docs/test_cases/t20013_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,47 +9,47 @@ - - - - - - - + + + + + + + - - + + tmain(int,char **) - + tmain(int,char **) - - + + B - + B - - + + A - + A - - - - - - - - + + + + + + + + b(int) - + a1(int) @@ -58,12 +58,12 @@ - + b(double) - + a2(double) @@ -72,12 +72,12 @@ - + b(const char *) - + a3(const char *) diff --git a/docs/test_cases/t20014.md b/docs/test_cases/t20014.md index b6627718..aa6bae26 100644 --- a/docs/test_cases/t20014.md +++ b/docs/test_cases/t20014.md @@ -1,21 +1,18 @@ # t20014 - Multiple translation units sequence diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20014_sequence: type: sequence glob: - - ../../tests/t20014/t20014.cc - - ../../tests/t20014/t20014_c.cc - - ../../tests/t20014/t20014_b.cc - - ../../tests/t20014/t20014_a.cc + - t20014.cc + - t20014_c.cc + - t20014_b.cc + - t20014_a.cc include: namespaces: - clanguml::t20014 - using_namespace: - - clanguml::t20014 + using_namespace: clanguml::t20014 from: - function: "clanguml::t20014::tmain()" ``` @@ -90,11 +87,6 @@ namespace t20014 { ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20014_sequence", "participants": [ { @@ -102,9 +94,9 @@ namespace t20014 { "name": "clanguml::t20014::tmain()", "source_location": { "column": 5, - "file": "../../tests/t20014/t20014.cc", + "file": "t20014.cc", "line": 10, - "translation_unit": "../../tests/t20014/t20014.cc" + "translation_unit": "t20014.cc" }, "type": "function" }, @@ -113,9 +105,9 @@ namespace t20014 { "name": "clanguml::t20014::B", "source_location": { "column": 8, - "file": "../../tests/t20014/include/t20014_b.h", + "file": "include/t20014_b.h", "line": 8, - "translation_unit": "../../tests/t20014/t20014.cc" + "translation_unit": "t20014.cc" }, "type": "class" }, @@ -124,9 +116,9 @@ namespace t20014 { "name": "clanguml::t20014::A", "source_location": { "column": 8, - "file": "../../tests/t20014/include/t20014_a.h", + "file": "include/t20014_a.h", "line": 6, - "translation_unit": "../../tests/t20014/t20014.cc" + "translation_unit": "t20014.cc" }, "type": "class" }, @@ -135,9 +127,9 @@ namespace t20014 { "name": "clanguml::t20014::C", "source_location": { "column": 42, - "file": "../../tests/t20014/include/t20014_c.h", + "file": "include/t20014_c.h", "line": 6, - "translation_unit": "../../tests/t20014/t20014.cc" + "translation_unit": "t20014.cc" }, "type": "class" } @@ -157,9 +149,9 @@ namespace t20014 { "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20014/t20014.cc", + "file": "t20014.cc", "line": 15, - "translation_unit": "../../tests/t20014/t20014.cc" + "translation_unit": "t20014.cc" }, "to": { "activity_id": "1251633571711578431", @@ -179,9 +171,9 @@ namespace t20014 { "scope": "normal", "source_location": { "column": 34, - "file": "../../tests/t20014/t20014_b.cc", + "file": "t20014_b.cc", "line": 5, - "translation_unit": "../../tests/t20014/t20014_b.cc" + "translation_unit": "t20014_b.cc" }, "to": { "activity_id": "1753682948110709616", @@ -202,9 +194,9 @@ namespace t20014 { "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20014/t20014.cc", + "file": "t20014.cc", "line": 16, - "translation_unit": "../../tests/t20014/t20014.cc" + "translation_unit": "t20014.cc" }, "to": { "activity_id": "767830966714379991", @@ -224,9 +216,9 @@ namespace t20014 { "scope": "normal", "source_location": { "column": 34, - "file": "../../tests/t20014/t20014_b.cc", + "file": "t20014_b.cc", "line": 7, - "translation_unit": "../../tests/t20014/t20014_b.cc" + "translation_unit": "t20014_b.cc" }, "to": { "activity_id": "1943487088673912694", @@ -247,9 +239,9 @@ namespace t20014 { "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20014/t20014.cc", + "file": "t20014.cc", "line": 18, - "translation_unit": "../../tests/t20014/t20014.cc" + "translation_unit": "t20014.cc" }, "to": { "activity_id": "407559038402563981", @@ -269,9 +261,9 @@ namespace t20014 { "scope": "normal", "source_location": { "column": 29, - "file": "../../tests/t20014/include/t20014_c.h", + "file": "include/t20014_c.h", "line": 7, - "translation_unit": "../../tests/t20014/t20014.cc" + "translation_unit": "t20014.cc" }, "to": { "activity_id": "1251633571711578431", diff --git a/docs/test_cases/t20014_sequence.svg b/docs/test_cases/t20014_sequence.svg index 7fdbc8e6..4f6c774f 100644 --- a/docs/test_cases/t20014_sequence.svg +++ b/docs/test_cases/t20014_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,56 +9,56 @@ - - - - - - - - + + + + + + + + - - + + tmain() - + tmain() - - + + B - + B - - + + A - + A - - + + C<B,int> - + C<B,int> - - - - - - - - - + + + + + + + + + b1(int,int) - + a1(int,int) @@ -67,12 +67,12 @@ - + b2(int,int) - + a2(int,int) @@ -81,17 +81,17 @@ - + c1(int,int) - + b1(int,int) - + a1(int,int) diff --git a/docs/test_cases/t20015.md b/docs/test_cases/t20015.md index 9975c3f3..2885a933 100644 --- a/docs/test_cases/t20015.md +++ b/docs/test_cases/t20015.md @@ -1,21 +1,18 @@ # t20015 - Class exclusion by namespace in sequence diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20015_sequence: type: sequence glob: - - ../../tests/t20015/t20015.cc + - t20015.cc include: namespaces: - clanguml::t20015 exclude: namespaces: - clanguml::t20015::detail - using_namespace: - - clanguml::t20015 + using_namespace: clanguml::t20015 from: - function: "clanguml::t20015::tmain()" ``` @@ -71,11 +68,6 @@ void tmain() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20015_sequence", "participants": [ { @@ -83,9 +75,9 @@ void tmain() "name": "clanguml::t20015::tmain()", "source_location": { "column": 6, - "file": "../../tests/t20015/t20015.cc", + "file": "t20015.cc", "line": 31, - "translation_unit": "../../tests/t20015/t20015.cc" + "translation_unit": "t20015.cc" }, "type": "function" }, @@ -94,9 +86,9 @@ void tmain() "name": "clanguml::t20015::B", "source_location": { "column": 7, - "file": "../../tests/t20015/t20015.cc", + "file": "t20015.cc", "line": 21, - "translation_unit": "../../tests/t20015/t20015.cc" + "translation_unit": "t20015.cc" }, "type": "class" } @@ -116,9 +108,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20015/t20015.cc", + "file": "t20015.cc", "line": 37, - "translation_unit": "../../tests/t20015/t20015.cc" + "translation_unit": "t20015.cc" }, "to": { "activity_id": "431575772398797060", diff --git a/docs/test_cases/t20015_sequence.svg b/docs/test_cases/t20015_sequence.svg index 2231ff71..e78672e1 100644 --- a/docs/test_cases/t20015_sequence.svg +++ b/docs/test_cases/t20015_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,25 +9,25 @@ - - + + - - + + tmain() - + tmain() - - + + B - + B - - - + + + setup_a(std::shared_ptr<detail::A> &) diff --git a/docs/test_cases/t20016.md b/docs/test_cases/t20016.md index 5a221234..dda41246 100644 --- a/docs/test_cases/t20016.md +++ b/docs/test_cases/t20016.md @@ -1,18 +1,15 @@ # t20016 - Template method specialization sequence diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20016_sequence: type: sequence glob: - - ../../tests/t20016/t20016.cc + - t20016.cc include: namespaces: - clanguml::t20016 - using_namespace: - - clanguml::t20016 + using_namespace: clanguml::t20016 from: - function: "clanguml::t20016::tmain()" ``` @@ -53,11 +50,6 @@ void tmain() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20016_sequence", "participants": [ { @@ -65,9 +57,9 @@ void tmain() "name": "clanguml::t20016::tmain()", "source_location": { "column": 6, - "file": "../../tests/t20016/t20016.cc", + "file": "t20016.cc", "line": 16, - "translation_unit": "../../tests/t20016/t20016.cc" + "translation_unit": "t20016.cc" }, "type": "function" }, @@ -76,9 +68,9 @@ void tmain() "name": "clanguml::t20016::B", "source_location": { "column": 30, - "file": "../../tests/t20016/t20016.cc", + "file": "t20016.cc", "line": 8, - "translation_unit": "../../tests/t20016/t20016.cc" + "translation_unit": "t20016.cc" }, "type": "class" }, @@ -87,9 +79,9 @@ void tmain() "name": "clanguml::t20016::A", "source_location": { "column": 8, - "file": "../../tests/t20016/t20016.cc", + "file": "t20016.cc", "line": 3, - "translation_unit": "../../tests/t20016/t20016.cc" + "translation_unit": "t20016.cc" }, "type": "class" } @@ -109,9 +101,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20016/t20016.cc", + "file": "t20016.cc", "line": 20, - "translation_unit": "../../tests/t20016/t20016.cc" + "translation_unit": "t20016.cc" }, "to": { "activity_id": "2064264710178722261", @@ -131,9 +123,9 @@ void tmain() "scope": "normal", "source_location": { "column": 20, - "file": "../../tests/t20016/t20016.cc", + "file": "t20016.cc", "line": 9, - "translation_unit": "../../tests/t20016/t20016.cc" + "translation_unit": "t20016.cc" }, "to": { "activity_id": "1198371121423942542", @@ -154,9 +146,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20016/t20016.cc", + "file": "t20016.cc", "line": 22, - "translation_unit": "../../tests/t20016/t20016.cc" + "translation_unit": "t20016.cc" }, "to": { "activity_id": "203381140188081853", @@ -176,9 +168,9 @@ void tmain() "scope": "normal", "source_location": { "column": 46, - "file": "../../tests/t20016/t20016.cc", + "file": "t20016.cc", "line": 11, - "translation_unit": "../../tests/t20016/t20016.cc" + "translation_unit": "t20016.cc" }, "to": { "activity_id": "1208784669530380166", diff --git a/docs/test_cases/t20016_sequence.svg b/docs/test_cases/t20016_sequence.svg index a41ce3e5..1c26d968 100644 --- a/docs/test_cases/t20016_sequence.svg +++ b/docs/test_cases/t20016_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,53 +9,53 @@ - - - - - + + + + + - - + + tmain() - + tmain() - - + + B<long> - + B<long> - - + + A - + A - - - - - - + + + + + + b1(long) - + a1(int) - + b2(long) - + a2(const long &) diff --git a/docs/test_cases/t20017.md b/docs/test_cases/t20017.md index 6192f107..cb88dffb 100644 --- a/docs/test_cases/t20017.md +++ b/docs/test_cases/t20017.md @@ -1,13 +1,10 @@ # t20017 - Test case for combine_free_functions_into_file_participants option ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20017_sequence: type: sequence combine_free_functions_into_file_participants: true - relative_to: ../../../tests/t20017 glob: - t20017.cc include: @@ -50,43 +47,38 @@ int tmain() { return b2(a1(a2(a3(1, 2), b1(3, 4)), 5), 6); } ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20017_sequence", "participants": [ { - "id": "800083058974241273", + "id": "294332401323799021", "name": "t20017.cc", "source_location": { "column": 5, - "file": "../../clang-uml/tests/t20017/t20017.cc", + "file": "t20017.cc", "line": 6, - "translation_unit": "../../clang-uml/tests/t20017/t20017.cc" + "translation_unit": "t20017.cc" }, "type": "function" }, { - "id": "446029693370832411", + "id": "1591222867263639510", "name": "include/t20017_a.h", "source_location": { "column": 5, - "file": "../../clang-uml/tests/t20017/include/t20017_a.h", + "file": "include/t20017_a.h", "line": 7, - "translation_unit": "../../clang-uml/tests/t20017/t20017.cc" + "translation_unit": "t20017.cc" }, "type": "function" }, { - "id": "1893799013101029871", + "id": "1113611539183189365", "name": "include/t20017_b.h", "source_location": { "column": 5, - "file": "../../clang-uml/tests/t20017/include/t20017_b.h", + "file": "include/t20017_b.h", "line": 5, - "translation_unit": "../../clang-uml/tests/t20017/t20017.cc" + "translation_unit": "t20017.cc" }, "type": "function" } @@ -98,21 +90,21 @@ int tmain() { return b2(a1(a2(a3(1, 2), b1(3, 4)), 5), 6); } "from": { "activity_id": "1484746432546296115", "activity_name": "clanguml::t20017::tmain()", - "participant_id": "800083058974241273" + "participant_id": "294332401323799021" }, "name": "a3(int,int)", "return_type": "int", "scope": "normal", "source_location": { "column": 31, - "file": "../../clang-uml/tests/t20017/t20017.cc", + "file": "t20017.cc", "line": 6, - "translation_unit": "../../clang-uml/tests/t20017/t20017.cc" + "translation_unit": "t20017.cc" }, "to": { "activity_id": "1681392050252260928", "activity_name": "clanguml::t20017::a3(int,int)", - "participant_id": "446029693370832411" + "participant_id": "1591222867263639510" }, "type": "message" }, @@ -120,21 +112,21 @@ int tmain() { return b2(a1(a2(a3(1, 2), b1(3, 4)), 5), 6); } "from": { "activity_id": "1484746432546296115", "activity_name": "clanguml::t20017::tmain()", - "participant_id": "800083058974241273" + "participant_id": "294332401323799021" }, "name": "b1(int,int)", "return_type": "int", "scope": "normal", "source_location": { "column": 41, - "file": "../../clang-uml/tests/t20017/t20017.cc", + "file": "t20017.cc", "line": 6, - "translation_unit": "../../clang-uml/tests/t20017/t20017.cc" + "translation_unit": "t20017.cc" }, "to": { "activity_id": "1714277838806105702", "activity_name": "clanguml::t20017::b1(int,int)", - "participant_id": "1893799013101029871" + "participant_id": "1113611539183189365" }, "type": "message" }, @@ -142,21 +134,21 @@ int tmain() { return b2(a1(a2(a3(1, 2), b1(3, 4)), 5), 6); } "from": { "activity_id": "1484746432546296115", "activity_name": "clanguml::t20017::tmain()", - "participant_id": "800083058974241273" + "participant_id": "294332401323799021" }, "name": "a2(int,int)", "return_type": "int", "scope": "normal", "source_location": { "column": 28, - "file": "../../clang-uml/tests/t20017/t20017.cc", + "file": "t20017.cc", "line": 6, - "translation_unit": "../../clang-uml/tests/t20017/t20017.cc" + "translation_unit": "t20017.cc" }, "to": { "activity_id": "291553542743365259", "activity_name": "clanguml::t20017::a2(int,int)", - "participant_id": "446029693370832411" + "participant_id": "1591222867263639510" }, "type": "message" }, @@ -164,21 +156,21 @@ int tmain() { return b2(a1(a2(a3(1, 2), b1(3, 4)), 5), 6); } "from": { "activity_id": "1484746432546296115", "activity_name": "clanguml::t20017::tmain()", - "participant_id": "800083058974241273" + "participant_id": "294332401323799021" }, "name": "a1(int,int)", "return_type": "int", "scope": "normal", "source_location": { "column": 25, - "file": "../../clang-uml/tests/t20017/t20017.cc", + "file": "t20017.cc", "line": 6, - "translation_unit": "../../clang-uml/tests/t20017/t20017.cc" + "translation_unit": "t20017.cc" }, "to": { "activity_id": "113759676939330212", "activity_name": "clanguml::t20017::a1(int,int)", - "participant_id": "446029693370832411" + "participant_id": "1591222867263639510" }, "type": "message" }, @@ -186,21 +178,21 @@ int tmain() { return b2(a1(a2(a3(1, 2), b1(3, 4)), 5), 6); } "from": { "activity_id": "1484746432546296115", "activity_name": "clanguml::t20017::tmain()", - "participant_id": "800083058974241273" + "participant_id": "294332401323799021" }, "name": "b2(int,int)", "return_type": "", "scope": "normal", "source_location": { "column": 22, - "file": "../../clang-uml/tests/t20017/t20017.cc", + "file": "t20017.cc", "line": 6, - "translation_unit": "../../clang-uml/tests/t20017/t20017.cc" + "translation_unit": "t20017.cc" }, "to": { "activity_id": "775081116464505528", "activity_name": "clanguml::t20017::b2(int,int)", - "participant_id": "1893799013101029871" + "participant_id": "1113611539183189365" }, "type": "message" } diff --git a/docs/test_cases/t20017_sequence.svg b/docs/test_cases/t20017_sequence.svg index f996b713..a729893e 100644 --- a/docs/test_cases/t20017_sequence.svg +++ b/docs/test_cases/t20017_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,65 +9,65 @@ - - - - - - + + + + + + - + 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) - + 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 2c55d4d6..2168fbef 100644 --- a/docs/test_cases/t20018.md +++ b/docs/test_cases/t20018.md @@ -1,18 +1,15 @@ # t20018 - Recursive template sequence diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20018_sequence: type: sequence glob: - - ../../tests/t20018/t20018.cc + - t20018.cc include: namespaces: - clanguml::t20018 - using_namespace: - - clanguml::t20018 + using_namespace: clanguml::t20018 from: - function: "clanguml::t20018::tmain()" ``` @@ -55,11 +52,6 @@ void tmain() { Answer>::print(); } ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20018_sequence", "participants": [ { @@ -67,9 +59,9 @@ void tmain() { Answer>::print(); } "name": "clanguml::t20018::tmain()", "source_location": { "column": 6, - "file": "../../tests/t20018/t20018.cc", + "file": "t20018.cc", "line": 25, - "translation_unit": "../../tests/t20018/t20018.cc" + "translation_unit": "t20018.cc" }, "type": "function" }, @@ -78,9 +70,9 @@ void tmain() { Answer>::print(); } "name": "clanguml::t20018::Answer,120>", "source_location": { "column": 48, - "file": "../../tests/t20018/t20018.cc", + "file": "t20018.cc", "line": 21, - "translation_unit": "../../tests/t20018/t20018.cc" + "translation_unit": "t20018.cc" }, "type": "class" }, @@ -89,9 +81,9 @@ void tmain() { Answer>::print(); } "name": "clanguml::t20018::Factorial<5>", "source_location": { "column": 25, - "file": "../../tests/t20018/t20018.cc", + "file": "t20018.cc", "line": 6, - "translation_unit": "../../tests/t20018/t20018.cc" + "translation_unit": "t20018.cc" }, "type": "class" }, @@ -100,9 +92,9 @@ void tmain() { Answer>::print(); } "name": "clanguml::t20018::Factorial<4>", "source_location": { "column": 25, - "file": "../../tests/t20018/t20018.cc", + "file": "t20018.cc", "line": 6, - "translation_unit": "../../tests/t20018/t20018.cc" + "translation_unit": "t20018.cc" }, "type": "class" }, @@ -111,9 +103,9 @@ void tmain() { Answer>::print(); } "name": "clanguml::t20018::Factorial<3>", "source_location": { "column": 25, - "file": "../../tests/t20018/t20018.cc", + "file": "t20018.cc", "line": 6, - "translation_unit": "../../tests/t20018/t20018.cc" + "translation_unit": "t20018.cc" }, "type": "class" }, @@ -122,9 +114,9 @@ void tmain() { Answer>::print(); } "name": "clanguml::t20018::Factorial<2>", "source_location": { "column": 25, - "file": "../../tests/t20018/t20018.cc", + "file": "t20018.cc", "line": 6, - "translation_unit": "../../tests/t20018/t20018.cc" + "translation_unit": "t20018.cc" }, "type": "class" }, @@ -133,9 +125,9 @@ void tmain() { Answer>::print(); } "name": "clanguml::t20018::Factorial<1>", "source_location": { "column": 25, - "file": "../../tests/t20018/t20018.cc", + "file": "t20018.cc", "line": 6, - "translation_unit": "../../tests/t20018/t20018.cc" + "translation_unit": "t20018.cc" }, "type": "class" }, @@ -144,9 +136,9 @@ void tmain() { Answer>::print(); } "name": "clanguml::t20018::Factorial<0>", "source_location": { "column": 20, - "file": "../../tests/t20018/t20018.cc", + "file": "t20018.cc", "line": 12, - "translation_unit": "../../tests/t20018/t20018.cc" + "translation_unit": "t20018.cc" }, "type": "class" } @@ -166,9 +158,9 @@ void tmain() { Answer>::print(); } "scope": "normal", "source_location": { "column": 16, - "file": "../../tests/t20018/t20018.cc", + "file": "t20018.cc", "line": 25, - "translation_unit": "../../tests/t20018/t20018.cc" + "translation_unit": "t20018.cc" }, "to": { "activity_id": "1185770766239304952", @@ -188,9 +180,9 @@ void tmain() { Answer>::print(); } "scope": "normal", "source_location": { "column": 27, - "file": "../../tests/t20018/t20018.cc", + "file": "t20018.cc", "line": 22, - "translation_unit": "../../tests/t20018/t20018.cc" + "translation_unit": "t20018.cc" }, "to": { "activity_id": "833100888453299461", @@ -210,9 +202,9 @@ void tmain() { Answer>::print(); } "scope": "normal", "source_location": { "column": 37, - "file": "../../tests/t20018/t20018.cc", + "file": "t20018.cc", "line": 9, - "translation_unit": "../../tests/t20018/t20018.cc" + "translation_unit": "t20018.cc" }, "to": { "activity_id": "1782586643813991247", @@ -232,9 +224,9 @@ void tmain() { Answer>::print(); } "scope": "normal", "source_location": { "column": 37, - "file": "../../tests/t20018/t20018.cc", + "file": "t20018.cc", "line": 9, - "translation_unit": "../../tests/t20018/t20018.cc" + "translation_unit": "t20018.cc" }, "to": { "activity_id": "1238078028595736678", @@ -254,9 +246,9 @@ void tmain() { Answer>::print(); } "scope": "normal", "source_location": { "column": 37, - "file": "../../tests/t20018/t20018.cc", + "file": "t20018.cc", "line": 9, - "translation_unit": "../../tests/t20018/t20018.cc" + "translation_unit": "t20018.cc" }, "to": { "activity_id": "2163270950475476780", @@ -276,9 +268,9 @@ void tmain() { Answer>::print(); } "scope": "normal", "source_location": { "column": 37, - "file": "../../tests/t20018/t20018.cc", + "file": "t20018.cc", "line": 9, - "translation_unit": "../../tests/t20018/t20018.cc" + "translation_unit": "t20018.cc" }, "to": { "activity_id": "501166016325937670", @@ -298,9 +290,9 @@ void tmain() { Answer>::print(); } "scope": "normal", "source_location": { "column": 37, - "file": "../../tests/t20018/t20018.cc", + "file": "t20018.cc", "line": 9, - "translation_unit": "../../tests/t20018/t20018.cc" + "translation_unit": "t20018.cc" }, "to": { "activity_id": "577232827352391544", diff --git a/docs/test_cases/t20018_sequence.svg b/docs/test_cases/t20018_sequence.svg index 29fc2865..c4efca93 100644 --- a/docs/test_cases/t20018_sequence.svg +++ b/docs/test_cases/t20018_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,14 +9,14 @@ - - - - - - - - + + + + + + + + @@ -25,93 +25,93 @@ - - + + tmain() - + tmain() - - + + Answer<Factorial<5>,120> - + Answer<Factorial<5>,120> - - + + Factorial<5> - + Factorial<5> - - + + Factorial<4> - + Factorial<4> - - + + Factorial<3> - + Factorial<3> - - + + Factorial<2> - + Factorial<2> - - + + Factorial<1> - + Factorial<1> - - + + Factorial<0> - + Factorial<0> - - - - - - - - - + + + + + + + + + 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 b4716316..c9c8e2d2 100644 --- a/docs/test_cases/t20019.md +++ b/docs/test_cases/t20019.md @@ -1,18 +1,15 @@ # t20019 - Curiously Recurring Template Pattern sequence diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20019_sequence: type: sequence glob: - - ../../tests/t20019/t20019.cc + - t20019.cc include: namespaces: - clanguml::t20019 - using_namespace: - - clanguml::t20019 + using_namespace: clanguml::t20019 from: - function: "clanguml::t20019::tmain()" ``` @@ -62,11 +59,6 @@ void tmain() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20019_sequence", "participants": [ { @@ -74,9 +66,9 @@ void tmain() "name": "clanguml::t20019::tmain()", "source_location": { "column": 6, - "file": "../../tests/t20019/t20019.cc", + "file": "t20019.cc", "line": 20, - "translation_unit": "../../tests/t20019/t20019.cc" + "translation_unit": "t20019.cc" }, "type": "function" }, @@ -85,9 +77,9 @@ void tmain() "name": "clanguml::t20019::Base", "source_location": { "column": 33, - "file": "../../tests/t20019/t20019.cc", + "file": "t20019.cc", "line": 8, - "translation_unit": "../../tests/t20019/t20019.cc" + "translation_unit": "t20019.cc" }, "type": "class" }, @@ -96,9 +88,9 @@ void tmain() "name": "clanguml::t20019::D1", "source_location": { "column": 8, - "file": "../../tests/t20019/t20019.cc", + "file": "t20019.cc", "line": 12, - "translation_unit": "../../tests/t20019/t20019.cc" + "translation_unit": "t20019.cc" }, "type": "class" }, @@ -107,9 +99,9 @@ void tmain() "name": "clanguml::t20019::Base", "source_location": { "column": 33, - "file": "../../tests/t20019/t20019.cc", + "file": "t20019.cc", "line": 8, - "translation_unit": "../../tests/t20019/t20019.cc" + "translation_unit": "t20019.cc" }, "type": "class" }, @@ -118,9 +110,9 @@ void tmain() "name": "clanguml::t20019::D2", "source_location": { "column": 8, - "file": "../../tests/t20019/t20019.cc", + "file": "t20019.cc", "line": 16, - "translation_unit": "../../tests/t20019/t20019.cc" + "translation_unit": "t20019.cc" }, "type": "class" } @@ -140,9 +132,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20019/t20019.cc", + "file": "t20019.cc", "line": 23, - "translation_unit": "../../tests/t20019/t20019.cc" + "translation_unit": "t20019.cc" }, "to": { "activity_id": "1038853547136467401", @@ -162,9 +154,9 @@ void tmain() "scope": "normal", "source_location": { "column": 19, - "file": "../../tests/t20019/t20019.cc", + "file": "t20019.cc", "line": 9, - "translation_unit": "../../tests/t20019/t20019.cc" + "translation_unit": "t20019.cc" }, "to": { "activity_id": "603969604599968603", @@ -185,9 +177,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20019/t20019.cc", + "file": "t20019.cc", "line": 25, - "translation_unit": "../../tests/t20019/t20019.cc" + "translation_unit": "t20019.cc" }, "to": { "activity_id": "1918672956676175365", @@ -207,9 +199,9 @@ void tmain() "scope": "normal", "source_location": { "column": 19, - "file": "../../tests/t20019/t20019.cc", + "file": "t20019.cc", "line": 9, - "translation_unit": "../../tests/t20019/t20019.cc" + "translation_unit": "t20019.cc" }, "to": { "activity_id": "861400435979772695", @@ -230,9 +222,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20019/t20019.cc", + "file": "t20019.cc", "line": 28, - "translation_unit": "../../tests/t20019/t20019.cc" + "translation_unit": "t20019.cc" }, "to": { "activity_id": "1038853547136467401", @@ -253,9 +245,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20019/t20019.cc", + "file": "t20019.cc", "line": 30, - "translation_unit": "../../tests/t20019/t20019.cc" + "translation_unit": "t20019.cc" }, "to": { "activity_id": "1918672956676175365", diff --git a/docs/test_cases/t20019_sequence.svg b/docs/test_cases/t20019_sequence.svg index dfa82fd5..35cca3e3 100644 --- a/docs/test_cases/t20019_sequence.svg +++ b/docs/test_cases/t20019_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,95 +9,95 @@ - - - - - - - - - + + + + + + + + + - - + + tmain() - + tmain() - - + + Base<D1> - + Base<D1> - - + + D1 - + D1 - - + + Base<D2> - + Base<D2> - - + + D2 - + D2 - - - - - - - - - - + + + + + + + + + + name() - + impl() - + name() - + impl() - + name() - + impl() - + name() - + impl() diff --git a/docs/test_cases/t20020.md b/docs/test_cases/t20020.md index c7db1311..46ce82fa 100644 --- a/docs/test_cases/t20020.md +++ b/docs/test_cases/t20020.md @@ -1,18 +1,15 @@ # t20020 - If statement sequence diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20020_sequence: type: sequence glob: - - ../../tests/t20020/t20020.cc + - t20020.cc include: namespaces: - clanguml::t20020 - using_namespace: - - clanguml::t20020 + using_namespace: clanguml::t20020 from: - function: "clanguml::t20020::tmain()" ``` @@ -118,11 +115,6 @@ int tmain() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20020_sequence", "participants": [ { @@ -130,9 +122,9 @@ int tmain() "name": "clanguml::t20020::tmain()", "source_location": { "column": 5, - "file": "../../tests/t20020/t20020.cc", + "file": "t20020.cc", "line": 40, - "translation_unit": "../../tests/t20020/t20020.cc" + "translation_unit": "t20020.cc" }, "type": "function" }, @@ -141,9 +133,9 @@ int tmain() "name": "clanguml::t20020::A", "source_location": { "column": 8, - "file": "../../tests/t20020/t20020.cc", + "file": "t20020.cc", "line": 6, - "translation_unit": "../../tests/t20020/t20020.cc" + "translation_unit": "t20020.cc" }, "type": "class" }, @@ -152,9 +144,9 @@ int tmain() "name": "clanguml::t20020::C", "source_location": { "column": 8, - "file": "../../tests/t20020/t20020.cc", + "file": "t20020.cc", "line": 21, - "translation_unit": "../../tests/t20020/t20020.cc" + "translation_unit": "t20020.cc" }, "type": "class" }, @@ -163,9 +155,9 @@ int tmain() "name": "clanguml::t20020::B", "source_location": { "column": 8, - "file": "../../tests/t20020/t20020.cc", + "file": "t20020.cc", "line": 14, - "translation_unit": "../../tests/t20020/t20020.cc" + "translation_unit": "t20020.cc" }, "type": "class" }, @@ -174,9 +166,9 @@ int tmain() "name": "clanguml::t20020::D", "source_location": { "column": 30, - "file": "../../tests/t20020/t20020.cc", + "file": "t20020.cc", "line": 35, - "translation_unit": "../../tests/t20020/t20020.cc" + "translation_unit": "t20020.cc" }, "type": "class" } @@ -201,9 +193,9 @@ int tmain() "scope": "normal", "source_location": { "column": 18, - "file": "../../tests/t20020/t20020.cc", + "file": "t20020.cc", "line": 50, - "translation_unit": "../../tests/t20020/t20020.cc" + "translation_unit": "t20020.cc" }, "to": { "activity_id": "43928675765534701", @@ -229,9 +221,9 @@ int tmain() "scope": "normal", "source_location": { "column": 18, - "file": "../../tests/t20020/t20020.cc", + "file": "t20020.cc", "line": 53, - "translation_unit": "../../tests/t20020/t20020.cc" + "translation_unit": "t20020.cc" }, "to": { "activity_id": "1613457246223182826", @@ -262,9 +254,9 @@ int tmain() "scope": "condition", "source_location": { "column": 18, - "file": "../../tests/t20020/t20020.cc", + "file": "t20020.cc", "line": 56, - "translation_unit": "../../tests/t20020/t20020.cc" + "translation_unit": "t20020.cc" }, "to": { "activity_id": "1289745252290688140", @@ -285,9 +277,9 @@ int tmain() "scope": "condition", "source_location": { "column": 13, - "file": "../../tests/t20020/t20020.cc", + "file": "t20020.cc", "line": 56, - "translation_unit": "../../tests/t20020/t20020.cc" + "translation_unit": "t20020.cc" }, "to": { "activity_id": "1303438784842196201", @@ -308,9 +300,9 @@ int tmain() "scope": "normal", "source_location": { "column": 22, - "file": "../../tests/t20020/t20020.cc", + "file": "t20020.cc", "line": 57, - "translation_unit": "../../tests/t20020/t20020.cc" + "translation_unit": "t20020.cc" }, "to": { "activity_id": "542196582335607343", @@ -336,9 +328,9 @@ int tmain() "scope": "condition", "source_location": { "column": 18, - "file": "../../tests/t20020/t20020.cc", + "file": "t20020.cc", "line": 58, - "translation_unit": "../../tests/t20020/t20020.cc" + "translation_unit": "t20020.cc" }, "to": { "activity_id": "1983660679554669898", @@ -359,9 +351,9 @@ int tmain() "scope": "normal", "source_location": { "column": 22, - "file": "../../tests/t20020/t20020.cc", + "file": "t20020.cc", "line": 59, - "translation_unit": "../../tests/t20020/t20020.cc" + "translation_unit": "t20020.cc" }, "to": { "activity_id": "505760236964179187", @@ -394,9 +386,9 @@ int tmain() "scope": "normal", "source_location": { "column": 18, - "file": "../../tests/t20020/t20020.cc", + "file": "t20020.cc", "line": 64, - "translation_unit": "../../tests/t20020/t20020.cc" + "translation_unit": "t20020.cc" }, "to": { "activity_id": "20573198999978866", @@ -424,9 +416,9 @@ int tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20020/t20020.cc", + "file": "t20020.cc", "line": 67, - "translation_unit": "../../tests/t20020/t20020.cc" + "translation_unit": "t20020.cc" }, "to": { "activity_id": "1436250788704205026", @@ -452,9 +444,9 @@ int tmain() "scope": "normal", "source_location": { "column": 9, - "file": "../../tests/t20020/t20020.cc", + "file": "t20020.cc", "line": 70, - "translation_unit": "../../tests/t20020/t20020.cc" + "translation_unit": "t20020.cc" }, "to": { "activity_id": "1473521613404783653", @@ -479,9 +471,9 @@ int tmain() "scope": "condition", "source_location": { "column": 13, - "file": "../../tests/t20020/t20020.cc", + "file": "t20020.cc", "line": 26, - "translation_unit": "../../tests/t20020/t20020.cc" + "translation_unit": "t20020.cc" }, "to": { "activity_id": "1789116382725485914", @@ -501,9 +493,9 @@ int tmain() "scope": "normal", "source_location": { "column": 13, - "file": "../../tests/t20020/t20020.cc", + "file": "t20020.cc", "line": 27, - "translation_unit": "../../tests/t20020/t20020.cc" + "translation_unit": "t20020.cc" }, "to": { "activity_id": "635780525021572670", @@ -543,9 +535,9 @@ int tmain() "scope": "normal", "source_location": { "column": 9, - "file": "../../tests/t20020/t20020.cc", + "file": "t20020.cc", "line": 73, - "translation_unit": "../../tests/t20020/t20020.cc" + "translation_unit": "t20020.cc" }, "to": { "activity_id": "1780002010052842766", diff --git a/docs/test_cases/t20020_sequence.svg b/docs/test_cases/t20020_sequence.svg index ec5b2aed..a5baf007 100644 --- a/docs/test_cases/t20020_sequence.svg +++ b/docs/test_cases/t20020_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,82 +9,82 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - - + + + - - + + tmain() - + tmain() - - + + A - + A - - + + C - + C - - + + B - + B - - + + D<int> - + D<int> - - - - - - - - - - - - - - + + + + + + + + + + + + + + alt - + a1() @@ -92,7 +92,7 @@ - + a5() @@ -103,7 +103,7 @@ alt - + [ @@ -112,7 +112,7 @@ - + [ @@ -121,7 +121,7 @@ - + b1() @@ -129,7 +129,7 @@ - + [ @@ -138,7 +138,7 @@ - + b2() @@ -146,14 +146,14 @@ - + a4() - + log() @@ -161,7 +161,7 @@ alt - + c1() const @@ -169,7 +169,7 @@ alt - + @@ -182,7 +182,7 @@ - + @@ -192,7 +192,7 @@ alt - + d1(int,int) diff --git a/docs/test_cases/t20021.md b/docs/test_cases/t20021.md index db3076c7..842372a8 100644 --- a/docs/test_cases/t20021.md +++ b/docs/test_cases/t20021.md @@ -1,18 +1,15 @@ # t20021 - Loop statements sequence diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20021_sequence: type: sequence glob: - - ../../tests/t20021/t20021.cc + - t20021.cc include: namespaces: - clanguml::t20021 - using_namespace: - - clanguml::t20021 + using_namespace: clanguml::t20021 from: - function: "clanguml::t20021::tmain()" ``` @@ -85,11 +82,6 @@ int tmain() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20021_sequence", "participants": [ { @@ -97,9 +89,9 @@ int tmain() "name": "clanguml::t20021::tmain()", "source_location": { "column": 5, - "file": "../../tests/t20021/t20021.cc", + "file": "t20021.cc", "line": 30, - "translation_unit": "../../tests/t20021/t20021.cc" + "translation_unit": "t20021.cc" }, "type": "function" }, @@ -108,9 +100,9 @@ int tmain() "name": "clanguml::t20021::C", "source_location": { "column": 8, - "file": "../../tests/t20021/t20021.cc", + "file": "t20021.cc", "line": 18, - "translation_unit": "../../tests/t20021/t20021.cc" + "translation_unit": "t20021.cc" }, "type": "class" }, @@ -119,9 +111,9 @@ int tmain() "name": "clanguml::t20021::A", "source_location": { "column": 8, - "file": "../../tests/t20021/t20021.cc", + "file": "t20021.cc", "line": 5, - "translation_unit": "../../tests/t20021/t20021.cc" + "translation_unit": "t20021.cc" }, "type": "class" }, @@ -130,9 +122,9 @@ int tmain() "name": "clanguml::t20021::B", "source_location": { "column": 8, - "file": "../../tests/t20021/t20021.cc", + "file": "t20021.cc", "line": 11, - "translation_unit": "../../tests/t20021/t20021.cc" + "translation_unit": "t20021.cc" }, "type": "class" } @@ -155,9 +147,9 @@ int tmain() "scope": "condition", "source_location": { "column": 17, - "file": "../../tests/t20021/t20021.cc", + "file": "t20021.cc", "line": 37, - "translation_unit": "../../tests/t20021/t20021.cc" + "translation_unit": "t20021.cc" }, "to": { "activity_id": "124927877622321176", @@ -177,9 +169,9 @@ int tmain() "scope": "normal", "source_location": { "column": 23, - "file": "../../tests/t20021/t20021.cc", + "file": "t20021.cc", "line": 22, - "translation_unit": "../../tests/t20021/t20021.cc" + "translation_unit": "t20021.cc" }, "to": { "activity_id": "1325720714179808628", @@ -200,9 +192,9 @@ int tmain() "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20021/t20021.cc", + "file": "t20021.cc", "line": 38, - "translation_unit": "../../tests/t20021/t20021.cc" + "translation_unit": "t20021.cc" }, "to": { "activity_id": "1867955233624891190", @@ -229,9 +221,9 @@ int tmain() "scope": "condition", "source_location": { "column": 26, - "file": "../../tests/t20021/t20021.cc", + "file": "t20021.cc", "line": 40, - "translation_unit": "../../tests/t20021/t20021.cc" + "translation_unit": "t20021.cc" }, "to": { "activity_id": "1139294797758415018", @@ -252,9 +244,9 @@ int tmain() "scope": "condition", "source_location": { "column": 38, - "file": "../../tests/t20021/t20021.cc", + "file": "t20021.cc", "line": 40, - "translation_unit": "../../tests/t20021/t20021.cc" + "translation_unit": "t20021.cc" }, "to": { "activity_id": "2143764740072323303", @@ -275,9 +267,9 @@ int tmain() "scope": "condition", "source_location": { "column": 51, - "file": "../../tests/t20021/t20021.cc", + "file": "t20021.cc", "line": 40, - "translation_unit": "../../tests/t20021/t20021.cc" + "translation_unit": "t20021.cc" }, "to": { "activity_id": "1707693479408501017", @@ -298,9 +290,9 @@ int tmain() "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20021/t20021.cc", + "file": "t20021.cc", "line": 41, - "translation_unit": "../../tests/t20021/t20021.cc" + "translation_unit": "t20021.cc" }, "to": { "activity_id": "1659488549696810992", @@ -325,9 +317,9 @@ int tmain() "scope": "condition", "source_location": { "column": 23, - "file": "../../tests/t20021/t20021.cc", + "file": "t20021.cc", "line": 42, - "translation_unit": "../../tests/t20021/t20021.cc" + "translation_unit": "t20021.cc" }, "to": { "activity_id": "1302892753246800390", @@ -359,9 +351,9 @@ int tmain() "scope": "normal", "source_location": { "column": 19, - "file": "../../tests/t20021/t20021.cc", + "file": "t20021.cc", "line": 47, - "translation_unit": "../../tests/t20021/t20021.cc" + "translation_unit": "t20021.cc" }, "to": { "activity_id": "1561040999276563077", @@ -389,9 +381,9 @@ int tmain() "scope": "condition", "source_location": { "column": 27, - "file": "../../tests/t20021/t20021.cc", + "file": "t20021.cc", "line": 50, - "translation_unit": "../../tests/t20021/t20021.cc" + "translation_unit": "t20021.cc" }, "to": { "activity_id": "814405216385697964", @@ -416,9 +408,9 @@ int tmain() "scope": "normal", "source_location": { "column": 12, - "file": "../../tests/t20021/t20021.cc", + "file": "t20021.cc", "line": 54, - "translation_unit": "../../tests/t20021/t20021.cc" + "translation_unit": "t20021.cc" }, "to": { "activity_id": "1561040999276563077", diff --git a/docs/test_cases/t20021_sequence.svg b/docs/test_cases/t20021_sequence.svg index eacc6439..0df55cbd 100644 --- a/docs/test_cases/t20021_sequence.svg +++ b/docs/test_cases/t20021_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,74 +9,74 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + tmain() - + tmain() - - + + C - + C - - + + A - + A - - + + B - + B - - - - - - - - - - - - + + + + + + + + + + + + loop - + [ c4() ] - + @@ -89,7 +89,7 @@ - + a3() @@ -102,7 +102,7 @@ loop - + [ @@ -111,7 +111,7 @@ - + [ @@ -120,7 +120,7 @@ - + [ @@ -129,14 +129,14 @@ - + a1() - + [ @@ -148,7 +148,7 @@ loop - + b2() const @@ -158,7 +158,7 @@ loop - + [ @@ -167,7 +167,7 @@ - + b2() const diff --git a/docs/test_cases/t20022.md b/docs/test_cases/t20022.md index 3fa1f386..bbd03ba5 100644 --- a/docs/test_cases/t20022.md +++ b/docs/test_cases/t20022.md @@ -1,18 +1,15 @@ # t20022 - Forward class declaration sequence diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20022_sequence: type: sequence glob: - - ../../tests/t20022/t20022.cc + - t20022.cc include: namespaces: - clanguml::t20022 - using_namespace: - - clanguml::t20022 + using_namespace: clanguml::t20022 from: - function: "clanguml::t20022::tmain()" ``` @@ -65,11 +62,6 @@ int tmain() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20022_sequence", "participants": [ { @@ -77,9 +69,9 @@ int tmain() "name": "clanguml::t20022::tmain()", "source_location": { "column": 5, - "file": "../../tests/t20022/t20022.cc", + "file": "t20022.cc", "line": 28, - "translation_unit": "../../tests/t20022/t20022.cc" + "translation_unit": "t20022.cc" }, "type": "function" }, @@ -88,9 +80,9 @@ int tmain() "name": "clanguml::t20022::A", "source_location": { "column": 7, - "file": "../../tests/t20022/t20022.cc", + "file": "t20022.cc", "line": 7, - "translation_unit": "../../tests/t20022/t20022.cc" + "translation_unit": "t20022.cc" }, "type": "class" }, @@ -99,9 +91,9 @@ int tmain() "name": "clanguml::t20022::B", "source_location": { "column": 7, - "file": "../../tests/t20022/t20022.cc", + "file": "t20022.cc", "line": 16, - "translation_unit": "../../tests/t20022/t20022.cc" + "translation_unit": "t20022.cc" }, "type": "class" } @@ -121,9 +113,9 @@ int tmain() "scope": "normal", "source_location": { "column": 7, - "file": "../../tests/t20022/t20022.cc", + "file": "t20022.cc", "line": 30, - "translation_unit": "../../tests/t20022/t20022.cc" + "translation_unit": "t20022.cc" }, "to": { "activity_id": "1226569306557207632", @@ -144,9 +136,9 @@ int tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20022/t20022.cc", + "file": "t20022.cc", "line": 32, - "translation_unit": "../../tests/t20022/t20022.cc" + "translation_unit": "t20022.cc" }, "to": { "activity_id": "1158824701633811441", @@ -166,9 +158,9 @@ int tmain() "scope": "normal", "source_location": { "column": 15, - "file": "../../tests/t20022/t20022.cc", + "file": "t20022.cc", "line": 26, - "translation_unit": "../../tests/t20022/t20022.cc" + "translation_unit": "t20022.cc" }, "to": { "activity_id": "2114222968575993291", diff --git a/docs/test_cases/t20022_sequence.svg b/docs/test_cases/t20022_sequence.svg index 334d3672..9d92933d 100644 --- a/docs/test_cases/t20022_sequence.svg +++ b/docs/test_cases/t20022_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,47 +9,47 @@ - - - - + + + + - - + + tmain() - + tmain() - - + + A - + A - - + + B - + B - - - - - + + + + + A(std::unique_ptr ) - + a() - + b() diff --git a/docs/test_cases/t20023.md b/docs/test_cases/t20023.md index 984e42ca..923520d1 100644 --- a/docs/test_cases/t20023.md +++ b/docs/test_cases/t20023.md @@ -1,18 +1,15 @@ # t20023 - Try/catch statement sequence diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20023_sequence: type: sequence glob: - - ../../tests/t20023/t20023.cc + - t20023.cc include: namespaces: - clanguml::t20023 - using_namespace: - - clanguml::t20023 + using_namespace: clanguml::t20023 start_from: - function: "clanguml::t20023::tmain()" ``` @@ -68,11 +65,6 @@ int tmain() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20023_sequence", "participants": [ { @@ -80,9 +72,9 @@ int tmain() "name": "clanguml::t20023::tmain()", "source_location": { "column": 5, - "file": "../../tests/t20023/t20023.cc", + "file": "t20023.cc", "line": 29, - "translation_unit": "../../tests/t20023/t20023.cc" + "translation_unit": "t20023.cc" }, "type": "function" }, @@ -91,9 +83,9 @@ int tmain() "name": "clanguml::t20023::A", "source_location": { "column": 8, - "file": "../../tests/t20023/t20023.cc", + "file": "t20023.cc", "line": 6, - "translation_unit": "../../tests/t20023/t20023.cc" + "translation_unit": "t20023.cc" }, "type": "class" } @@ -113,9 +105,9 @@ int tmain() "scope": "normal", "source_location": { "column": 14, - "file": "../../tests/t20023/t20023.cc", + "file": "t20023.cc", "line": 35, - "translation_unit": "../../tests/t20023/t20023.cc" + "translation_unit": "t20023.cc" }, "to": { "activity_id": "530651320277188697", @@ -140,9 +132,9 @@ int tmain() "scope": "normal", "source_location": { "column": 20, - "file": "../../tests/t20023/t20023.cc", + "file": "t20023.cc", "line": 15, - "translation_unit": "../../tests/t20023/t20023.cc" + "translation_unit": "t20023.cc" }, "to": { "activity_id": "94135113932519208", @@ -167,9 +159,9 @@ int tmain() "scope": "normal", "source_location": { "column": 20, - "file": "../../tests/t20023/t20023.cc", + "file": "t20023.cc", "line": 18, - "translation_unit": "../../tests/t20023/t20023.cc" + "translation_unit": "t20023.cc" }, "to": { "activity_id": "2060438178899014465", @@ -194,9 +186,9 @@ int tmain() "scope": "normal", "source_location": { "column": 20, - "file": "../../tests/t20023/t20023.cc", + "file": "t20023.cc", "line": 21, - "translation_unit": "../../tests/t20023/t20023.cc" + "translation_unit": "t20023.cc" }, "to": { "activity_id": "1776927259621603017", @@ -221,9 +213,9 @@ int tmain() "scope": "normal", "source_location": { "column": 20, - "file": "../../tests/t20023/t20023.cc", + "file": "t20023.cc", "line": 24, - "translation_unit": "../../tests/t20023/t20023.cc" + "translation_unit": "t20023.cc" }, "to": { "activity_id": "1082587698374248813", diff --git a/docs/test_cases/t20023_sequence.svg b/docs/test_cases/t20023_sequence.svg index 15913099..8c53a541 100644 --- a/docs/test_cases/t20023_sequence.svg +++ b/docs/test_cases/t20023_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,37 +9,37 @@ - - - - - - - + + + + + + + - - + + tmain() - + tmain() - - + + A - + A - - - - - - - + + + + + + + a() @@ -47,7 +47,7 @@ try - + @@ -60,7 +60,7 @@ [std::runtime_error &] - + @@ -73,7 +73,7 @@ [std::logic_error &] - + @@ -86,7 +86,7 @@ [...] - + diff --git a/docs/test_cases/t20024.md b/docs/test_cases/t20024.md index b06b4d3c..2df7d3c2 100644 --- a/docs/test_cases/t20024.md +++ b/docs/test_cases/t20024.md @@ -1,18 +1,15 @@ # t20024 - Switch statement sequence diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20024_sequence: type: sequence glob: - - ../../tests/t20024/t20024.cc + - t20024.cc include: namespaces: - clanguml::t20024 - using_namespace: - - clanguml::t20024 + using_namespace: clanguml::t20024 from: - function: "clanguml::t20024::tmain()" ``` @@ -93,11 +90,6 @@ int tmain() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20024_sequence", "participants": [ { @@ -105,9 +97,9 @@ int tmain() "name": "clanguml::t20024::tmain()", "source_location": { "column": 5, - "file": "../../tests/t20024/t20024.cc", + "file": "t20024.cc", "line": 53, - "translation_unit": "../../tests/t20024/t20024.cc" + "translation_unit": "t20024.cc" }, "type": "function" }, @@ -116,9 +108,9 @@ int tmain() "name": "clanguml::t20024::A", "source_location": { "column": 8, - "file": "../../tests/t20024/t20024.cc", + "file": "t20024.cc", "line": 8, - "translation_unit": "../../tests/t20024/t20024.cc" + "translation_unit": "t20024.cc" }, "type": "class" }, @@ -127,9 +119,9 @@ int tmain() "name": "clanguml::t20024::B", "source_location": { "column": 8, - "file": "../../tests/t20024/t20024.cc", + "file": "t20024.cc", "line": 29, - "translation_unit": "../../tests/t20024/t20024.cc" + "translation_unit": "t20024.cc" }, "type": "class" } @@ -149,9 +141,9 @@ int tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20024/t20024.cc", + "file": "t20024.cc", "line": 58, - "translation_unit": "../../tests/t20024/t20024.cc" + "translation_unit": "t20024.cc" }, "to": { "activity_id": "1200587047701031901", @@ -176,9 +168,9 @@ int tmain() "scope": "normal", "source_location": { "column": 20, - "file": "../../tests/t20024/t20024.cc", + "file": "t20024.cc", "line": 13, - "translation_unit": "../../tests/t20024/t20024.cc" + "translation_unit": "t20024.cc" }, "to": { "activity_id": "1859614580641799156", @@ -204,9 +196,9 @@ int tmain() "scope": "normal", "source_location": { "column": 20, - "file": "../../tests/t20024/t20024.cc", + "file": "t20024.cc", "line": 15, - "translation_unit": "../../tests/t20024/t20024.cc" + "translation_unit": "t20024.cc" }, "to": { "activity_id": "501598940454911460", @@ -232,9 +224,9 @@ int tmain() "scope": "normal", "source_location": { "column": 20, - "file": "../../tests/t20024/t20024.cc", + "file": "t20024.cc", "line": 17, - "translation_unit": "../../tests/t20024/t20024.cc" + "translation_unit": "t20024.cc" }, "to": { "activity_id": "1698866541173753340", @@ -260,9 +252,9 @@ int tmain() "scope": "normal", "source_location": { "column": 20, - "file": "../../tests/t20024/t20024.cc", + "file": "t20024.cc", "line": 19, - "translation_unit": "../../tests/t20024/t20024.cc" + "translation_unit": "t20024.cc" }, "to": { "activity_id": "490376438551958259", @@ -291,9 +283,9 @@ int tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20024/t20024.cc", + "file": "t20024.cc", "line": 60, - "translation_unit": "../../tests/t20024/t20024.cc" + "translation_unit": "t20024.cc" }, "to": { "activity_id": "286108218156977422", @@ -318,9 +310,9 @@ int tmain() "scope": "normal", "source_location": { "column": 13, - "file": "../../tests/t20024/t20024.cc", + "file": "t20024.cc", "line": 34, - "translation_unit": "../../tests/t20024/t20024.cc" + "translation_unit": "t20024.cc" }, "to": { "activity_id": "112014563206084467", @@ -346,9 +338,9 @@ int tmain() "scope": "normal", "source_location": { "column": 13, - "file": "../../tests/t20024/t20024.cc", + "file": "t20024.cc", "line": 37, - "translation_unit": "../../tests/t20024/t20024.cc" + "translation_unit": "t20024.cc" }, "to": { "activity_id": "2222823236498505185", @@ -374,9 +366,9 @@ int tmain() "scope": "normal", "source_location": { "column": 13, - "file": "../../tests/t20024/t20024.cc", + "file": "t20024.cc", "line": 40, - "translation_unit": "../../tests/t20024/t20024.cc" + "translation_unit": "t20024.cc" }, "to": { "activity_id": "519021723720658376", @@ -402,9 +394,9 @@ int tmain() "scope": "normal", "source_location": { "column": 13, - "file": "../../tests/t20024/t20024.cc", + "file": "t20024.cc", "line": 43, - "translation_unit": "../../tests/t20024/t20024.cc" + "translation_unit": "t20024.cc" }, "to": { "activity_id": "1813557671878544737", diff --git a/docs/test_cases/t20024_sequence.svg b/docs/test_cases/t20024_sequence.svg index 290cfbd3..df2a94f4 100644 --- a/docs/test_cases/t20024_sequence.svg +++ b/docs/test_cases/t20024_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,23 +9,23 @@ - - - - - - - - - - - - + + + + + + + + + + + + - + @@ -33,36 +33,36 @@ - - + + tmain() - + tmain() - - + + A - + A - - + + B - + B - - - - - - - - - - - - + + + + + + + + + + + + select(enum_a) @@ -72,7 +72,7 @@ switch [zero] - + @@ -85,7 +85,7 @@ [one] - + @@ -98,7 +98,7 @@ [two] - + @@ -111,7 +111,7 @@ [default] - + @@ -124,7 +124,7 @@ - + select(colors) @@ -134,7 +134,7 @@ switch [enum colors::red] - + @@ -143,7 +143,7 @@ [enum colors::orange] - + @@ -152,7 +152,7 @@ [enum colors::green] - + @@ -161,7 +161,7 @@ [default] - + diff --git a/docs/test_cases/t20025.md b/docs/test_cases/t20025.md index b3c3b147..3bf4fe21 100644 --- a/docs/test_cases/t20025.md +++ b/docs/test_cases/t20025.md @@ -1,18 +1,15 @@ # t20025 - Skip decorator sequence diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20025_sequence: type: sequence glob: - - ../../tests/t20025/t20025.cc + - t20025.cc include: namespaces: - clanguml::t20025 - using_namespace: - - clanguml::t20025 + using_namespace: clanguml::t20025 from: - function: "clanguml::t20025::tmain()" ``` @@ -73,11 +70,6 @@ int tmain() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20025_sequence", "participants": [ { @@ -85,9 +77,9 @@ int tmain() "name": "clanguml::t20025::tmain()", "source_location": { "column": 5, - "file": "../../tests/t20025/t20025.cc", + "file": "t20025.cc", "line": 30, - "translation_unit": "../../tests/t20025/t20025.cc" + "translation_unit": "t20025.cc" }, "type": "function" }, @@ -96,9 +88,9 @@ int tmain() "name": "clanguml::t20025::A", "source_location": { "column": 8, - "file": "../../tests/t20025/t20025.cc", + "file": "t20025.cc", "line": 14, - "translation_unit": "../../tests/t20025/t20025.cc" + "translation_unit": "t20025.cc" }, "type": "class" }, @@ -107,9 +99,9 @@ int tmain() "name": "clanguml::t20025::add(int,int)", "source_location": { "column": 5, - "file": "../../tests/t20025/t20025.cc", + "file": "t20025.cc", "line": 4, - "translation_unit": "../../tests/t20025/t20025.cc" + "translation_unit": "t20025.cc" }, "type": "function" } @@ -129,9 +121,9 @@ int tmain() "scope": "normal", "source_location": { "column": 14, - "file": "../../tests/t20025/t20025.cc", + "file": "t20025.cc", "line": 36, - "translation_unit": "../../tests/t20025/t20025.cc" + "translation_unit": "t20025.cc" }, "to": { "activity_id": "1119830104994271584", @@ -152,9 +144,9 @@ int tmain() "scope": "normal", "source_location": { "column": 15, - "file": "../../tests/t20025/t20025.cc", + "file": "t20025.cc", "line": 38, - "translation_unit": "../../tests/t20025/t20025.cc" + "translation_unit": "t20025.cc" }, "to": { "activity_id": "228843323046630374", diff --git a/docs/test_cases/t20025_sequence.svg b/docs/test_cases/t20025_sequence.svg index d14aaa94..cb219f48 100644 --- a/docs/test_cases/t20025_sequence.svg +++ b/docs/test_cases/t20025_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,41 +9,41 @@ - - - + + + - - + + tmain() - + tmain() - - + + A - + A - - + + add(int,int) - + add(int,int) - - - - + + + + a() - + diff --git a/docs/test_cases/t20026.md b/docs/test_cases/t20026.md index fc4eed7d..19a12b67 100644 --- a/docs/test_cases/t20026.md +++ b/docs/test_cases/t20026.md @@ -1,18 +1,15 @@ # t20026 - Virtual method call sequence diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20026_sequence: type: sequence glob: - - ../../tests/t20026/t20026.cc + - t20026.cc include: namespaces: - clanguml::t20026 - using_namespace: - - clanguml::t20026 + using_namespace: clanguml::t20026 from: - function: "clanguml::t20026::tmain()" ``` @@ -53,11 +50,6 @@ int tmain() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20026_sequence", "participants": [ { @@ -65,9 +57,9 @@ int tmain() "name": "clanguml::t20026::tmain()", "source_location": { "column": 5, - "file": "../../tests/t20026/t20026.cc", + "file": "t20026.cc", "line": 16, - "translation_unit": "../../tests/t20026/t20026.cc" + "translation_unit": "t20026.cc" }, "type": "function" }, @@ -76,9 +68,9 @@ int tmain() "name": "clanguml::t20026::A", "source_location": { "column": 8, - "file": "../../tests/t20026/t20026.cc", + "file": "t20026.cc", "line": 4, - "translation_unit": "../../tests/t20026/t20026.cc" + "translation_unit": "t20026.cc" }, "type": "class" } @@ -98,9 +90,9 @@ int tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20026/t20026.cc", + "file": "t20026.cc", "line": 20, - "translation_unit": "../../tests/t20026/t20026.cc" + "translation_unit": "t20026.cc" }, "to": { "activity_id": "600590770418147864", diff --git a/docs/test_cases/t20026_sequence.svg b/docs/test_cases/t20026_sequence.svg index 148ab60e..55205a32 100644 --- a/docs/test_cases/t20026_sequence.svg +++ b/docs/test_cases/t20026_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,25 +9,25 @@ - - + + - - + + tmain() - + tmain() - - + + A - + A - - - + + + a() diff --git a/docs/test_cases/t20027.md b/docs/test_cases/t20027.md index 282b99ed..6b75773c 100644 --- a/docs/test_cases/t20027.md +++ b/docs/test_cases/t20027.md @@ -1,20 +1,17 @@ # t20027 - Filter call expressions based on access test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20027_sequence: type: sequence glob: - - ../../tests/t20027/t20027.cc + - t20027.cc include: namespaces: - clanguml::t20027 access: - public - using_namespace: - - clanguml::t20027 + using_namespace: clanguml::t20027 from: - function: "clanguml::t20027::tmain()" ``` @@ -52,11 +49,6 @@ void tmain() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20027_sequence", "participants": [ { @@ -64,9 +56,9 @@ void tmain() "name": "clanguml::t20027::tmain()", "source_location": { "column": 6, - "file": "../../tests/t20027/t20027.cc", + "file": "t20027.cc", "line": 15, - "translation_unit": "../../tests/t20027/t20027.cc" + "translation_unit": "t20027.cc" }, "type": "function" }, @@ -75,9 +67,9 @@ void tmain() "name": "clanguml::t20027::A", "source_location": { "column": 7, - "file": "../../tests/t20027/t20027.cc", + "file": "t20027.cc", "line": 4, - "translation_unit": "../../tests/t20027/t20027.cc" + "translation_unit": "t20027.cc" }, "type": "class" } @@ -97,9 +89,9 @@ void tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20027/t20027.cc", + "file": "t20027.cc", "line": 19, - "translation_unit": "../../tests/t20027/t20027.cc" + "translation_unit": "t20027.cc" }, "to": { "activity_id": "910514967786202717", diff --git a/docs/test_cases/t20027_sequence.svg b/docs/test_cases/t20027_sequence.svg index b5b0041d..2e576f38 100644 --- a/docs/test_cases/t20027_sequence.svg +++ b/docs/test_cases/t20027_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,25 +9,25 @@ - - + + - - + + tmain() - + tmain() - - + + A - + A - - - + + + a() diff --git a/docs/test_cases/t20028.md b/docs/test_cases/t20028.md index 19b3241b..584adaa4 100644 --- a/docs/test_cases/t20028.md +++ b/docs/test_cases/t20028.md @@ -1,21 +1,18 @@ # t20028 - Conditional (ternary) '?:' operator test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20028_sequence: type: sequence glob: - - ../../tests/t20028/t20028.cc + - t20028.cc include: namespaces: - clanguml::t20028 exclude: namespaces: - clanguml::t20028::detail - using_namespace: - - clanguml::t20028 + using_namespace: clanguml::t20028 from: - function: "clanguml::t20028::tmain()" ``` @@ -62,11 +59,6 @@ int tmain() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20028_sequence", "participants": [ { @@ -74,9 +66,9 @@ int tmain() "name": "clanguml::t20028::tmain()", "source_location": { "column": 5, - "file": "../../tests/t20028/t20028.cc", + "file": "t20028.cc", "line": 17, - "translation_unit": "../../tests/t20028/t20028.cc" + "translation_unit": "t20028.cc" }, "type": "function" }, @@ -85,9 +77,9 @@ int tmain() "name": "clanguml::t20028::A", "source_location": { "column": 8, - "file": "../../tests/t20028/t20028.cc", + "file": "t20028.cc", "line": 4, - "translation_unit": "../../tests/t20028/t20028.cc" + "translation_unit": "t20028.cc" }, "type": "class" } @@ -112,9 +104,9 @@ int tmain() "scope": "condition", "source_location": { "column": 15, - "file": "../../tests/t20028/t20028.cc", + "file": "t20028.cc", "line": 26, - "translation_unit": "../../tests/t20028/t20028.cc" + "translation_unit": "t20028.cc" }, "to": { "activity_id": "666210834901940781", @@ -135,9 +127,9 @@ int tmain() "scope": "normal", "source_location": { "column": 23, - "file": "../../tests/t20028/t20028.cc", + "file": "t20028.cc", "line": 26, - "translation_unit": "../../tests/t20028/t20028.cc" + "translation_unit": "t20028.cc" }, "to": { "activity_id": "793793464184037795", @@ -158,9 +150,9 @@ int tmain() "scope": "normal", "source_location": { "column": 31, - "file": "../../tests/t20028/t20028.cc", + "file": "t20028.cc", "line": 26, - "translation_unit": "../../tests/t20028/t20028.cc" + "translation_unit": "t20028.cc" }, "to": { "activity_id": "1582152567698110078", @@ -186,9 +178,9 @@ int tmain() "scope": "normal", "source_location": { "column": 39, - "file": "../../tests/t20028/t20028.cc", + "file": "t20028.cc", "line": 26, - "translation_unit": "../../tests/t20028/t20028.cc" + "translation_unit": "t20028.cc" }, "to": { "activity_id": "1178268687951492696", diff --git a/docs/test_cases/t20028_sequence.svg b/docs/test_cases/t20028_sequence.svg index 6ba5f530..37ad7ec6 100644 --- a/docs/test_cases/t20028_sequence.svg +++ b/docs/test_cases/t20028_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,36 +9,36 @@ - - - - - - + + + + + + - - + + tmain() - + tmain() - - + + A - + A - - - - - + + + + + alt - + [ @@ -47,14 +47,14 @@ - + b() - + c() @@ -62,7 +62,7 @@ - + d() diff --git a/docs/test_cases/t20029.md b/docs/test_cases/t20029.md index 341cff2c..e761dbcf 100644 --- a/docs/test_cases/t20029.md +++ b/docs/test_cases/t20029.md @@ -1,23 +1,20 @@ # t20029 - Combined feature sequence diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams add_compile_flags: - -fparse-all-comments diagrams: t20029_sequence: type: sequence glob: - - ../../tests/t20029/t20029.cc + - t20029.cc include: namespaces: - clanguml::t20029 exclude: access: - private - using_namespace: - - clanguml::t20029 + using_namespace: clanguml::t20029 from: - function: clanguml::t20029::tmain() generate_message_comments: true @@ -115,11 +112,6 @@ int tmain() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20029_sequence", "participants": [ { @@ -127,9 +119,9 @@ int tmain() "name": "clanguml::t20029::tmain()", "source_location": { "column": 5, - "file": "../../tests/t20029/t20029.cc", + "file": "t20029.cc", "line": 59, - "translation_unit": "../../tests/t20029/t20029.cc" + "translation_unit": "t20029.cc" }, "type": "function" }, @@ -138,9 +130,9 @@ int tmain() "name": "clanguml::t20029::Encoder>", "source_location": { "column": 29, - "file": "../../tests/t20029/t20029.cc", + "file": "t20029.cc", "line": 11, - "translation_unit": "../../tests/t20029/t20029.cc" + "translation_unit": "t20029.cc" }, "type": "class" }, @@ -149,9 +141,9 @@ int tmain() "name": "clanguml::t20029::Retrier", "source_location": { "column": 29, - "file": "../../tests/t20029/t20029.cc", + "file": "t20029.cc", "line": 25, - "translation_unit": "../../tests/t20029/t20029.cc" + "translation_unit": "t20029.cc" }, "type": "class" }, @@ -160,9 +152,9 @@ int tmain() "name": "clanguml::t20029::ConnectionPool", "source_location": { "column": 7, - "file": "../../tests/t20029/t20029.cc", + "file": "t20029.cc", "line": 43, - "translation_unit": "../../tests/t20029/t20029.cc" + "translation_unit": "t20029.cc" }, "type": "class" }, @@ -171,9 +163,9 @@ int tmain() "name": "clanguml::t20029::encode_b64(std::string &&)", "source_location": { "column": 13, - "file": "../../tests/t20029/t20029.cc", + "file": "t20029.cc", "line": 9, - "translation_unit": "../../tests/t20029/t20029.cc" + "translation_unit": "t20029.cc" }, "type": "function" } @@ -194,9 +186,9 @@ int tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20029/t20029.cc", + "file": "t20029.cc", "line": 64, - "translation_unit": "../../tests/t20029/t20029.cc" + "translation_unit": "t20029.cc" }, "to": { "activity_id": "940428568182104530", @@ -225,9 +217,9 @@ int tmain() "scope": "condition", "source_location": { "column": 14, - "file": "../../tests/t20029/t20029.cc", + "file": "t20029.cc", "line": 68, - "translation_unit": "../../tests/t20029/t20029.cc" + "translation_unit": "t20029.cc" }, "to": { "activity_id": "2026763864005979273", @@ -248,9 +240,9 @@ int tmain() "scope": "normal", "source_location": { "column": 13, - "file": "../../tests/t20029/t20029.cc", + "file": "t20029.cc", "line": 18, - "translation_unit": "../../tests/t20029/t20029.cc" + "translation_unit": "t20029.cc" }, "to": { "activity_id": "1468258269466480773", @@ -270,9 +262,9 @@ int tmain() "scope": "normal", "source_location": { "column": 52, - "file": "../../tests/t20029/t20029.cc", + "file": "t20029.cc", "line": 22, - "translation_unit": "../../tests/t20029/t20029.cc" + "translation_unit": "t20029.cc" }, "to": { "activity_id": "1362646431260879440", @@ -292,9 +284,9 @@ int tmain() "scope": "normal", "source_location": { "column": 16, - "file": "../../tests/t20029/t20029.cc", + "file": "t20029.cc", "line": 15, - "translation_unit": "../../tests/t20029/t20029.cc" + "translation_unit": "t20029.cc" }, "to": { "activity_id": "30515971485361302", @@ -322,9 +314,9 @@ int tmain() "scope": "condition", "source_location": { "column": 17, - "file": "../../tests/t20029/t20029.cc", + "file": "t20029.cc", "line": 35, - "translation_unit": "../../tests/t20029/t20029.cc" + "translation_unit": "t20029.cc" }, "to": { "activity_id": "972625940114169157", diff --git a/docs/test_cases/t20029_sequence.svg b/docs/test_cases/t20029_sequence.svg index 25d2f9ec..f9c24c13 100644 --- a/docs/test_cases/t20029_sequence.svg +++ b/docs/test_cases/t20029_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,69 +9,69 @@ - - - - - - - - - - - + + + + + + + + + + + - - + + tmain() - + tmain() - - + + Encoder<Retrier<ConnectionPool>> - + Encoder<Retrier<ConnectionPool>> - - + + Retrier<ConnectionPool> - + Retrier<ConnectionPool> - - + + ConnectionPool - + ConnectionPool - - + + encode_b64(std::string &&) - + encode_b64(std::string &&) - - - - - - - - + + + + + + + + Establish connection to the remote server synchronously - + connect() - + Repeat for each line in the input stream @@ -81,26 +81,26 @@ alt - + [ send(std::string &&) ] - + Encode the message using Base64 encoding and pass it to the next layer - + encode(std::string &&) - + @@ -110,12 +110,12 @@ - + send(std::string &&) - + Repeat until send() succeeds or retry count is exceeded @@ -125,7 +125,7 @@ alt - + [ diff --git a/docs/test_cases/t20030.md b/docs/test_cases/t20030.md index 8c119f91..3f705e77 100644 --- a/docs/test_cases/t20030.md +++ b/docs/test_cases/t20030.md @@ -1,18 +1,15 @@ # t20030 - Constructor and operator call test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20030_sequence: type: sequence glob: - - ../../tests/t20030/t20030.cc + - t20030.cc include: namespaces: - clanguml::t20030 - using_namespace: - - clanguml::t20030 + using_namespace: clanguml::t20030 from: - function: "clanguml::t20030::tmain(int)" - function: "clanguml::t20030::tmain(bool,int)" @@ -80,11 +77,6 @@ int tmain(bool f, int a) ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20030_sequence", "participants": [ { @@ -92,9 +84,9 @@ int tmain(bool f, int a) "name": "clanguml::t20030::tmain(int)", "source_location": { "column": 6, - "file": "../../tests/t20030/t20030.cc", + "file": "t20030.cc", "line": 35, - "translation_unit": "../../tests/t20030/t20030.cc" + "translation_unit": "t20030.cc" }, "type": "function" }, @@ -103,9 +95,9 @@ int tmain(bool f, int a) "name": "clanguml::t20030::magic()", "source_location": { "column": 5, - "file": "../../tests/t20030/t20030.cc", + "file": "t20030.cc", "line": 4, - "translation_unit": "../../tests/t20030/t20030.cc" + "translation_unit": "t20030.cc" }, "type": "function" }, @@ -114,9 +106,9 @@ int tmain(bool f, int a) "name": "clanguml::t20030::A", "source_location": { "column": 7, - "file": "../../tests/t20030/t20030.cc", + "file": "t20030.cc", "line": 6, - "translation_unit": "../../tests/t20030/t20030.cc" + "translation_unit": "t20030.cc" }, "type": "class" }, @@ -125,9 +117,9 @@ int tmain(bool f, int a) "name": "clanguml::t20030::tmain(bool,int)", "source_location": { "column": 5, - "file": "../../tests/t20030/t20030.cc", + "file": "t20030.cc", "line": 41, - "translation_unit": "../../tests/t20030/t20030.cc" + "translation_unit": "t20030.cc" }, "type": "function" } @@ -147,9 +139,9 @@ int tmain(bool f, int a) "scope": "normal", "source_location": { "column": 12, - "file": "../../tests/t20030/t20030.cc", + "file": "t20030.cc", "line": 37, - "translation_unit": "../../tests/t20030/t20030.cc" + "translation_unit": "t20030.cc" }, "to": { "activity_id": "1038740565367213967", @@ -170,9 +162,9 @@ int tmain(bool f, int a) "scope": "normal", "source_location": { "column": 7, - "file": "../../tests/t20030/t20030.cc", + "file": "t20030.cc", "line": 37, - "translation_unit": "../../tests/t20030/t20030.cc" + "translation_unit": "t20030.cc" }, "to": { "activity_id": "2192298168642377389", @@ -193,9 +185,9 @@ int tmain(bool f, int a) "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20030/t20030.cc", + "file": "t20030.cc", "line": 38, - "translation_unit": "../../tests/t20030/t20030.cc" + "translation_unit": "t20030.cc" }, "to": { "activity_id": "2032167997122548080", @@ -215,9 +207,9 @@ int tmain(bool f, int a) "scope": "normal", "source_location": { "column": 9, - "file": "../../tests/t20030/t20030.cc", + "file": "t20030.cc", "line": 20, - "translation_unit": "../../tests/t20030/t20030.cc" + "translation_unit": "t20030.cc" }, "to": { "activity_id": "2174827432067616124", @@ -246,9 +238,9 @@ int tmain(bool f, int a) "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20030/t20030.cc", + "file": "t20030.cc", "line": 43, - "translation_unit": "../../tests/t20030/t20030.cc" + "translation_unit": "t20030.cc" }, "to": { "activity_id": "32184916294885915", @@ -268,9 +260,9 @@ int tmain(bool f, int a) "scope": "normal", "source_location": { "column": 11, - "file": "../../tests/t20030/t20030.cc", + "file": "t20030.cc", "line": 8, - "translation_unit": "../../tests/t20030/t20030.cc" + "translation_unit": "t20030.cc" }, "to": { "activity_id": "890578100069139188", @@ -291,9 +283,9 @@ int tmain(bool f, int a) "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20030/t20030.cc", + "file": "t20030.cc", "line": 44, - "translation_unit": "../../tests/t20030/t20030.cc" + "translation_unit": "t20030.cc" }, "to": { "activity_id": "32184916294885915", @@ -314,9 +306,9 @@ int tmain(bool f, int a) "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20030/t20030.cc", + "file": "t20030.cc", "line": 45, - "translation_unit": "../../tests/t20030/t20030.cc" + "translation_unit": "t20030.cc" }, "to": { "activity_id": "2032167997122548080", @@ -336,9 +328,9 @@ int tmain(bool f, int a) "scope": "normal", "source_location": { "column": 9, - "file": "../../tests/t20030/t20030.cc", + "file": "t20030.cc", "line": 20, - "translation_unit": "../../tests/t20030/t20030.cc" + "translation_unit": "t20030.cc" }, "to": { "activity_id": "2174827432067616124", @@ -359,9 +351,9 @@ int tmain(bool f, int a) "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20030/t20030.cc", + "file": "t20030.cc", "line": 46, - "translation_unit": "../../tests/t20030/t20030.cc" + "translation_unit": "t20030.cc" }, "to": { "activity_id": "1796303685088700396", @@ -381,9 +373,9 @@ int tmain(bool f, int a) "scope": "normal", "source_location": { "column": 9, - "file": "../../tests/t20030/t20030.cc", + "file": "t20030.cc", "line": 14, - "translation_unit": "../../tests/t20030/t20030.cc" + "translation_unit": "t20030.cc" }, "to": { "activity_id": "2212978510776223413", @@ -404,9 +396,9 @@ int tmain(bool f, int a) "scope": "normal", "source_location": { "column": 12, - "file": "../../tests/t20030/t20030.cc", + "file": "t20030.cc", "line": 47, - "translation_unit": "../../tests/t20030/t20030.cc" + "translation_unit": "t20030.cc" }, "to": { "activity_id": "1754957340376276968", diff --git a/docs/test_cases/t20030_sequence.svg b/docs/test_cases/t20030_sequence.svg index 9d624221..c877c579 100644 --- a/docs/test_cases/t20030_sequence.svg +++ b/docs/test_cases/t20030_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,81 +9,81 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + tmain(int) - + tmain(int) - - + + magic() - + magic() - - + + A - + A - - + + tmain(bool,int) - + tmain(bool,int) - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + A(int) - + operator+=(int) - + @@ -92,36 +92,36 @@ - + A() - + create() - + A() - + create() - + operator+=(int) - + @@ -130,12 +130,12 @@ - + operator=(const A &) - + @@ -144,7 +144,7 @@ - + value() const diff --git a/docs/test_cases/t20031.md b/docs/test_cases/t20031.md index 26a489a1..9747bfab 100644 --- a/docs/test_cases/t20031.md +++ b/docs/test_cases/t20031.md @@ -1,13 +1,11 @@ # t20031 - Callee type sequence diagram filter test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20031_sequence: type: sequence glob: - - ../../tests/t20031/t20031.cc + - t20031.cc include: namespaces: - clanguml::t20031 @@ -16,8 +14,7 @@ diagrams: - constructor - operator - lambda - using_namespace: - - clanguml::t20031 + using_namespace: clanguml::t20031 from: - function: "clanguml::t20031::tmain(int)" - function: "clanguml::t20031::tmain(bool,int)" @@ -96,11 +93,6 @@ int tmain(bool f, int a) ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20031_sequence", "participants": [ { @@ -108,9 +100,9 @@ int tmain(bool f, int a) "name": "clanguml::t20031::tmain(int)", "source_location": { "column": 6, - "file": "../../tests/t20031/t20031.cc", + "file": "t20031.cc", "line": 39, - "translation_unit": "../../tests/t20031/t20031.cc" + "translation_unit": "t20031.cc" }, "type": "function" }, @@ -119,9 +111,9 @@ int tmain(bool f, int a) "name": "clanguml::t20031::magic()", "source_location": { "column": 5, - "file": "../../tests/t20031/t20031.cc", + "file": "t20031.cc", "line": 5, - "translation_unit": "../../tests/t20031/t20031.cc" + "translation_unit": "t20031.cc" }, "type": "function" }, @@ -130,9 +122,9 @@ int tmain(bool f, int a) "name": "clanguml::t20031::tmain(bool,int)", "source_location": { "column": 5, - "file": "../../tests/t20031/t20031.cc", + "file": "t20031.cc", "line": 45, - "translation_unit": "../../tests/t20031/t20031.cc" + "translation_unit": "t20031.cc" }, "type": "function" }, @@ -141,9 +133,9 @@ int tmain(bool f, int a) "name": "clanguml::t20031::execute(std::function)", "source_location": { "column": 5, - "file": "../../tests/t20031/t20031.cc", + "file": "t20031.cc", "line": 8, - "translation_unit": "../../tests/t20031/t20031.cc" + "translation_unit": "t20031.cc" }, "type": "function" }, @@ -152,9 +144,9 @@ int tmain(bool f, int a) "name": "clanguml::t20031::A", "source_location": { "column": 7, - "file": "../../tests/t20031/t20031.cc", + "file": "t20031.cc", "line": 10, - "translation_unit": "../../tests/t20031/t20031.cc" + "translation_unit": "t20031.cc" }, "type": "class" } @@ -174,9 +166,9 @@ int tmain(bool f, int a) "scope": "normal", "source_location": { "column": 12, - "file": "../../tests/t20031/t20031.cc", + "file": "t20031.cc", "line": 41, - "translation_unit": "../../tests/t20031/t20031.cc" + "translation_unit": "t20031.cc" }, "to": { "activity_id": "2265790048300959619", @@ -205,9 +197,9 @@ int tmain(bool f, int a) "scope": "normal", "source_location": { "column": 13, - "file": "../../tests/t20031/t20031.cc", + "file": "t20031.cc", "line": 54, - "translation_unit": "../../tests/t20031/t20031.cc" + "translation_unit": "t20031.cc" }, "to": { "activity_id": "2230160420908832598", @@ -228,9 +220,9 @@ int tmain(bool f, int a) "scope": "normal", "source_location": { "column": 12, - "file": "../../tests/t20031/t20031.cc", + "file": "t20031.cc", "line": 58, - "translation_unit": "../../tests/t20031/t20031.cc" + "translation_unit": "t20031.cc" }, "to": { "activity_id": "1089278431155817348", diff --git a/docs/test_cases/t20031_sequence.svg b/docs/test_cases/t20031_sequence.svg index 1011550d..494b515c 100644 --- a/docs/test_cases/t20031_sequence.svg +++ b/docs/test_cases/t20031_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,64 +9,64 @@ - - - - - + + + + + - - + + tmain(int) - + tmain(int) - - + + magic() - + magic() - - + + tmain(bool,int) - + tmain(bool,int) - - + + execute(std::function<int ()>) - + execute(std::function<int ()>) - - + + A - + A - - - - - - + + + + + + - + - + value() const diff --git a/docs/test_cases/t20032.md b/docs/test_cases/t20032.md index 27df144a..636254b7 100644 --- a/docs/test_cases/t20032.md +++ b/docs/test_cases/t20032.md @@ -1,18 +1,15 @@ # t20032 - Return type generation option sequence diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20032_sequence: type: sequence glob: - - ../../tests/t20032/t20032.cc + - t20032.cc include: namespaces: - clanguml::t20032 - using_namespace: - - clanguml::t20032 + using_namespace: clanguml::t20032 generate_return_types: true from: - function: "clanguml::t20032::tmain(int,char **)" @@ -56,11 +53,6 @@ void tmain(int argc, char **argv) ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20032_sequence", "participants": [ { @@ -68,9 +60,9 @@ void tmain(int argc, char **argv) "name": "clanguml::t20032::tmain(int,char **)", "source_location": { "column": 6, - "file": "../../tests/t20032/t20032.cc", + "file": "t20032.cc", "line": 18, - "translation_unit": "../../tests/t20032/t20032.cc" + "translation_unit": "t20032.cc" }, "type": "function" }, @@ -79,9 +71,9 @@ void tmain(int argc, char **argv) "name": "clanguml::t20032::B", "source_location": { "column": 8, - "file": "../../tests/t20032/t20032.cc", + "file": "t20032.cc", "line": 10, - "translation_unit": "../../tests/t20032/t20032.cc" + "translation_unit": "t20032.cc" }, "type": "class" }, @@ -90,9 +82,9 @@ void tmain(int argc, char **argv) "name": "clanguml::t20032::A", "source_location": { "column": 8, - "file": "../../tests/t20032/t20032.cc", + "file": "t20032.cc", "line": 4, - "translation_unit": "../../tests/t20032/t20032.cc" + "translation_unit": "t20032.cc" }, "type": "class" } @@ -112,9 +104,9 @@ void tmain(int argc, char **argv) "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20032/t20032.cc", + "file": "t20032.cc", "line": 22, - "translation_unit": "../../tests/t20032/t20032.cc" + "translation_unit": "t20032.cc" }, "to": { "activity_id": "1775727925274471949", @@ -134,9 +126,9 @@ void tmain(int argc, char **argv) "scope": "normal", "source_location": { "column": 27, - "file": "../../tests/t20032/t20032.cc", + "file": "t20032.cc", "line": 11, - "translation_unit": "../../tests/t20032/t20032.cc" + "translation_unit": "t20032.cc" }, "to": { "activity_id": "913842443932719355", @@ -157,9 +149,9 @@ void tmain(int argc, char **argv) "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20032/t20032.cc", + "file": "t20032.cc", "line": 23, - "translation_unit": "../../tests/t20032/t20032.cc" + "translation_unit": "t20032.cc" }, "to": { "activity_id": "404223226092650061", @@ -179,9 +171,9 @@ void tmain(int argc, char **argv) "scope": "normal", "source_location": { "column": 33, - "file": "../../tests/t20032/t20032.cc", + "file": "t20032.cc", "line": 12, - "translation_unit": "../../tests/t20032/t20032.cc" + "translation_unit": "t20032.cc" }, "to": { "activity_id": "1293114170675037977", @@ -202,9 +194,9 @@ void tmain(int argc, char **argv) "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20032/t20032.cc", + "file": "t20032.cc", "line": 24, - "translation_unit": "../../tests/t20032/t20032.cc" + "translation_unit": "t20032.cc" }, "to": { "activity_id": "1676684483397143166", @@ -224,9 +216,9 @@ void tmain(int argc, char **argv) "scope": "normal", "source_location": { "column": 43, - "file": "../../tests/t20032/t20032.cc", + "file": "t20032.cc", "line": 13, - "translation_unit": "../../tests/t20032/t20032.cc" + "translation_unit": "t20032.cc" }, "to": { "activity_id": "2099821524363509275", diff --git a/docs/test_cases/t20032_sequence.svg b/docs/test_cases/t20032_sequence.svg index 3840e733..be2e6970 100644 --- a/docs/test_cases/t20032_sequence.svg +++ b/docs/test_cases/t20032_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,47 +9,47 @@ - - - - - - - + + + + + + + - - + + tmain(int,char **) - + tmain(int,char **) - - + + B - + B - - + + A - + A - - - - - - - - + + + + + + + + b(int) - + a1(int) @@ -60,12 +60,12 @@ int - + b(double) - + a2(double) @@ -76,12 +76,12 @@ double - + b(const char *) - + a3(const char *) diff --git a/docs/test_cases/t20033.md b/docs/test_cases/t20033.md index 8671bcd7..bf2f75e8 100644 --- a/docs/test_cases/t20033.md +++ b/docs/test_cases/t20033.md @@ -1,18 +1,15 @@ # t20033 - Control statement text in sequence diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20033_sequence: type: sequence glob: - - ../../tests/t20033/t20033.cc + - t20033.cc include: namespaces: - clanguml::t20033 - using_namespace: - - clanguml::t20033 + using_namespace: clanguml::t20033 generate_condition_statements: true from: - function: "clanguml::t20033::tmain()" @@ -94,11 +91,6 @@ int tmain() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20033_sequence", "participants": [ { @@ -106,9 +98,9 @@ int tmain() "name": "clanguml::t20033::tmain()", "source_location": { "column": 5, - "file": "../../tests/t20033/t20033.cc", + "file": "t20033.cc", "line": 14, - "translation_unit": "../../tests/t20033/t20033.cc" + "translation_unit": "t20033.cc" }, "type": "function" }, @@ -117,9 +109,9 @@ int tmain() "name": "clanguml::t20033::A", "source_location": { "column": 8, - "file": "../../tests/t20033/t20033.cc", + "file": "t20033.cc", "line": 7, - "translation_unit": "../../tests/t20033/t20033.cc" + "translation_unit": "t20033.cc" }, "type": "class" } @@ -147,9 +139,9 @@ int tmain() "scope": "normal", "source_location": { "column": 18, - "file": "../../tests/t20033/t20033.cc", + "file": "t20033.cc", "line": 24, - "translation_unit": "../../tests/t20033/t20033.cc" + "translation_unit": "t20033.cc" }, "to": { "activity_id": "558885502745634115", @@ -175,9 +167,9 @@ int tmain() "scope": "normal", "source_location": { "column": 18, - "file": "../../tests/t20033/t20033.cc", + "file": "t20033.cc", "line": 27, - "translation_unit": "../../tests/t20033/t20033.cc" + "translation_unit": "t20033.cc" }, "to": { "activity_id": "748502947476611794", @@ -203,9 +195,9 @@ int tmain() "scope": "condition", "source_location": { "column": 13, - "file": "../../tests/t20033/t20033.cc", + "file": "t20033.cc", "line": 29, - "translation_unit": "../../tests/t20033/t20033.cc" + "translation_unit": "t20033.cc" }, "to": { "activity_id": "748502947476611794", @@ -226,9 +218,9 @@ int tmain() "scope": "condition", "source_location": { "column": 13, - "file": "../../tests/t20033/t20033.cc", + "file": "t20033.cc", "line": 30, - "translation_unit": "../../tests/t20033/t20033.cc" + "translation_unit": "t20033.cc" }, "to": { "activity_id": "55903385814245839", @@ -249,9 +241,9 @@ int tmain() "scope": "normal", "source_location": { "column": 18, - "file": "../../tests/t20033/t20033.cc", + "file": "t20033.cc", "line": 31, - "translation_unit": "../../tests/t20033/t20033.cc" + "translation_unit": "t20033.cc" }, "to": { "activity_id": "55903385814245839", @@ -277,9 +269,9 @@ int tmain() "scope": "normal", "source_location": { "column": 18, - "file": "../../tests/t20033/t20033.cc", + "file": "t20033.cc", "line": 34, - "translation_unit": "../../tests/t20033/t20033.cc" + "translation_unit": "t20033.cc" }, "to": { "activity_id": "1686426476339443579", @@ -313,9 +305,9 @@ int tmain() "scope": "condition", "source_location": { "column": 17, - "file": "../../tests/t20033/t20033.cc", + "file": "t20033.cc", "line": 38, - "translation_unit": "../../tests/t20033/t20033.cc" + "translation_unit": "t20033.cc" }, "to": { "activity_id": "748502947476611794", @@ -336,9 +328,9 @@ int tmain() "scope": "normal", "source_location": { "column": 19, - "file": "../../tests/t20033/t20033.cc", + "file": "t20033.cc", "line": 39, - "translation_unit": "../../tests/t20033/t20033.cc" + "translation_unit": "t20033.cc" }, "to": { "activity_id": "55903385814245839", @@ -371,9 +363,9 @@ int tmain() "scope": "condition", "source_location": { "column": 25, - "file": "../../tests/t20033/t20033.cc", + "file": "t20033.cc", "line": 42, - "translation_unit": "../../tests/t20033/t20033.cc" + "translation_unit": "t20033.cc" }, "to": { "activity_id": "748502947476611794", @@ -394,9 +386,9 @@ int tmain() "scope": "normal", "source_location": { "column": 23, - "file": "../../tests/t20033/t20033.cc", + "file": "t20033.cc", "line": 43, - "translation_unit": "../../tests/t20033/t20033.cc" + "translation_unit": "t20033.cc" }, "to": { "activity_id": "55903385814245839", @@ -421,9 +413,9 @@ int tmain() "scope": "normal", "source_location": { "column": 23, - "file": "../../tests/t20033/t20033.cc", + "file": "t20033.cc", "line": 46, - "translation_unit": "../../tests/t20033/t20033.cc" + "translation_unit": "t20033.cc" }, "to": { "activity_id": "55903385814245839", @@ -448,9 +440,9 @@ int tmain() "scope": "normal", "source_location": { "column": 19, - "file": "../../tests/t20033/t20033.cc", + "file": "t20033.cc", "line": 48, - "translation_unit": "../../tests/t20033/t20033.cc" + "translation_unit": "t20033.cc" }, "to": { "activity_id": "748502947476611794", @@ -479,9 +471,9 @@ int tmain() "scope": "normal", "source_location": { "column": 19, - "file": "../../tests/t20033/t20033.cc", + "file": "t20033.cc", "line": 52, - "translation_unit": "../../tests/t20033/t20033.cc" + "translation_unit": "t20033.cc" }, "to": { "activity_id": "1686426476339443579", @@ -502,9 +494,9 @@ int tmain() "scope": "condition", "source_location": { "column": 30, - "file": "../../tests/t20033/t20033.cc", + "file": "t20033.cc", "line": 53, - "translation_unit": "../../tests/t20033/t20033.cc" + "translation_unit": "t20033.cc" }, "to": { "activity_id": "55903385814245839", @@ -534,9 +526,9 @@ int tmain() "scope": "condition", "source_location": { "column": 14, - "file": "../../tests/t20033/t20033.cc", + "file": "t20033.cc", "line": 55, - "translation_unit": "../../tests/t20033/t20033.cc" + "translation_unit": "t20033.cc" }, "to": { "activity_id": "1686426476339443579", @@ -572,9 +564,9 @@ int tmain() "scope": "normal", "source_location": { "column": 19, - "file": "../../tests/t20033/t20033.cc", + "file": "t20033.cc", "line": 59, - "translation_unit": "../../tests/t20033/t20033.cc" + "translation_unit": "t20033.cc" }, "to": { "activity_id": "1686426476339443579", diff --git a/docs/test_cases/t20033_sequence.svg b/docs/test_cases/t20033_sequence.svg index 8ae6d638..17fdbfa9 100644 --- a/docs/test_cases/t20033_sequence.svg +++ b/docs/test_cases/t20033_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,73 +9,73 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - + + + + + - + - - + + tmain() - + tmain() - - + + A - + A - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + alt [false] [reinterpret_cast<uint64_t>(&a) % 100 == 0ULL] - + a1() @@ -84,7 +84,7 @@ [reinterpret_cast<uint64_t>(&a) % 64 == 0ULL] - + a2() @@ -93,7 +93,7 @@ [a.a2() == 2 && a.a3() == 3] - + [ @@ -102,7 +102,7 @@ - + [ @@ -111,7 +111,7 @@ - + a3() @@ -119,7 +119,7 @@ - + a4() @@ -130,7 +130,7 @@ alt [int i = a.a2(); i != 2] - + [ @@ -139,7 +139,7 @@ - + a3() @@ -150,7 +150,7 @@ loop [int i = 0; i < a.a2(); i++] - + [ @@ -159,14 +159,14 @@ - + a3() - + a3() @@ -177,7 +177,7 @@ loop [retry_count--] - + a2() @@ -188,14 +188,14 @@ loop [retry_count++ < a.a3()] - + a4() - + [ @@ -208,7 +208,7 @@ alt [a.a4() % 6] - + [ @@ -222,7 +222,7 @@ loop [ints] - + a4() diff --git a/docs/test_cases/t20034.md b/docs/test_cases/t20034.md index 6b4c5390..b7a4b87e 100644 --- a/docs/test_cases/t20034.md +++ b/docs/test_cases/t20034.md @@ -1,18 +1,15 @@ # t20034 - Test case for rendering all call chains from one activity to another (from_to) ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20034_sequence: type: sequence glob: - - ../../tests/t20034/t20034.cc + - t20034.cc include: namespaces: - clanguml::t20034 - using_namespace: - - clanguml::t20034 + using_namespace: clanguml::t20034 from_to: - [function: "clanguml::t20034::D::d2()", function: "clanguml::t20034::A::a2()"] @@ -100,11 +97,6 @@ void B::b4() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20034_sequence", "participants": [ { @@ -112,9 +104,9 @@ void B::b4() "name": "clanguml::t20034::D", "source_location": { "column": 8, - "file": "../../tests/t20034/t20034.cc", + "file": "t20034.cc", "line": 44, - "translation_unit": "../../tests/t20034/t20034.cc" + "translation_unit": "t20034.cc" }, "type": "class" }, @@ -123,9 +115,9 @@ void B::b4() "name": "clanguml::t20034::C", "source_location": { "column": 8, - "file": "../../tests/t20034/t20034.cc", + "file": "t20034.cc", "line": 28, - "translation_unit": "../../tests/t20034/t20034.cc" + "translation_unit": "t20034.cc" }, "type": "class" }, @@ -134,9 +126,9 @@ void B::b4() "name": "clanguml::t20034::B", "source_location": { "column": 8, - "file": "../../tests/t20034/t20034.cc", + "file": "t20034.cc", "line": 13, - "translation_unit": "../../tests/t20034/t20034.cc" + "translation_unit": "t20034.cc" }, "type": "class" }, @@ -145,20 +137,20 @@ void B::b4() "name": "clanguml::t20034::A", "source_location": { "column": 8, - "file": "../../tests/t20034/t20034.cc", + "file": "t20034.cc", "line": 5, - "translation_unit": "../../tests/t20034/t20034.cc" + "translation_unit": "t20034.cc" }, "type": "class" }, { - "id": "1441889098721372112", - "name": "clanguml::t20034::D::d2()::(lambda ../../tests/t20034/t20034.cc:56:18)", + "id": "1026588549514900751", + "name": "clanguml::t20034::D::d2()::(lambda t20034.cc:56:18)", "source_location": { "column": 18, - "file": "../../tests/t20034/t20034.cc", + "file": "t20034.cc", "line": 56, - "translation_unit": "../../tests/t20034/t20034.cc" + "translation_unit": "t20034.cc" }, "type": "class" } @@ -189,9 +181,9 @@ void B::b4() "scope": "normal", "source_location": { "column": 9, - "file": "../../tests/t20034/t20034.cc", + "file": "t20034.cc", "line": 50, - "translation_unit": "../../tests/t20034/t20034.cc" + "translation_unit": "t20034.cc" }, "to": { "activity_id": "472904899982022039", @@ -211,9 +203,9 @@ void B::b4() "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20034/t20034.cc", + "file": "t20034.cc", "line": 30, - "translation_unit": "../../tests/t20034/t20034.cc" + "translation_unit": "t20034.cc" }, "to": { "activity_id": "1034410188120190919", @@ -233,9 +225,9 @@ void B::b4() "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20034/t20034.cc", + "file": "t20034.cc", "line": 19, - "translation_unit": "../../tests/t20034/t20034.cc" + "translation_unit": "t20034.cc" }, "to": { "activity_id": "1307188853155365430", @@ -259,9 +251,9 @@ void B::b4() "scope": "normal", "source_location": { "column": 9, - "file": "../../tests/t20034/t20034.cc", + "file": "t20034.cc", "line": 49, - "translation_unit": "../../tests/t20034/t20034.cc" + "translation_unit": "t20034.cc" }, "to": { "activity_id": "1307188853155365430", @@ -285,31 +277,31 @@ void B::b4() "scope": "normal", "source_location": { "column": 9, - "file": "../../tests/t20034/t20034.cc", + "file": "t20034.cc", "line": 57, - "translation_unit": "../../tests/t20034/t20034.cc" + "translation_unit": "t20034.cc" }, "to": { - "activity_id": "1828095161459098283", - "activity_name": "clanguml::t20034::D::d2()##(lambda ../../tests/t20034/t20034.cc:56:18)::operator()()", - "participant_id": "1441889098721372112" + "activity_id": "1996671438591925718", + "activity_name": "clanguml::t20034::D::d2()##(lambda t20034.cc:56:18)::operator()()", + "participant_id": "1026588549514900751" }, "type": "message" }, { "from": { - "activity_id": "1828095161459098283", - "activity_name": "clanguml::t20034::D::d2()::(lambda ../../tests/t20034/t20034.cc:56:18)::operator()()", - "participant_id": "1441889098721372112" + "activity_id": "1996671438591925718", + "activity_name": "clanguml::t20034::D::d2()::(lambda t20034.cc:56:18)::operator()()", + "participant_id": "1026588549514900751" }, "name": "a2()", "return_type": "void", "scope": "normal", "source_location": { "column": 29, - "file": "../../tests/t20034/t20034.cc", + "file": "t20034.cc", "line": 56, - "translation_unit": "../../tests/t20034/t20034.cc" + "translation_unit": "t20034.cc" }, "to": { "activity_id": "1307188853155365430", @@ -333,9 +325,9 @@ void B::b4() "scope": "normal", "source_location": { "column": 9, - "file": "../../tests/t20034/t20034.cc", + "file": "t20034.cc", "line": 54, - "translation_unit": "../../tests/t20034/t20034.cc" + "translation_unit": "t20034.cc" }, "to": { "activity_id": "395720534444062628", @@ -355,9 +347,9 @@ void B::b4() "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20034/t20034.cc", + "file": "t20034.cc", "line": 39, - "translation_unit": "../../tests/t20034/t20034.cc" + "translation_unit": "t20034.cc" }, "to": { "activity_id": "1774155279072101253", @@ -377,9 +369,9 @@ void B::b4() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20034/t20034.cc", + "file": "t20034.cc", "line": 68, - "translation_unit": "../../tests/t20034/t20034.cc" + "translation_unit": "t20034.cc" }, "to": { "activity_id": "1034410188120190919", @@ -399,9 +391,9 @@ void B::b4() "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20034/t20034.cc", + "file": "t20034.cc", "line": 19, - "translation_unit": "../../tests/t20034/t20034.cc" + "translation_unit": "t20034.cc" }, "to": { "activity_id": "1307188853155365430", @@ -425,9 +417,9 @@ void B::b4() "scope": "normal", "source_location": { "column": 9, - "file": "../../tests/t20034/t20034.cc", + "file": "t20034.cc", "line": 48, - "translation_unit": "../../tests/t20034/t20034.cc" + "translation_unit": "t20034.cc" }, "to": { "activity_id": "148530508384958711", @@ -447,9 +439,9 @@ void B::b4() "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20034/t20034.cc", + "file": "t20034.cc", "line": 29, - "translation_unit": "../../tests/t20034/t20034.cc" + "translation_unit": "t20034.cc" }, "to": { "activity_id": "289899516984058785", @@ -469,9 +461,9 @@ void B::b4() "scope": "normal", "source_location": { "column": 9, - "file": "../../tests/t20034/t20034.cc", + "file": "t20034.cc", "line": 17, - "translation_unit": "../../tests/t20034/t20034.cc" + "translation_unit": "t20034.cc" }, "to": { "activity_id": "1307188853155365430", @@ -495,9 +487,9 @@ void B::b4() "scope": "normal", "source_location": { "column": 9, - "file": "../../tests/t20034/t20034.cc", + "file": "t20034.cc", "line": 51, - "translation_unit": "../../tests/t20034/t20034.cc" + "translation_unit": "t20034.cc" }, "to": { "activity_id": "2116989777037608337", @@ -517,9 +509,9 @@ void B::b4() "scope": "normal", "source_location": { "column": 13, - "file": "../../tests/t20034/t20034.cc", + "file": "t20034.cc", "line": 36, - "translation_unit": "../../tests/t20034/t20034.cc" + "translation_unit": "t20034.cc" }, "to": { "activity_id": "472904899982022039", @@ -539,9 +531,9 @@ void B::b4() "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20034/t20034.cc", + "file": "t20034.cc", "line": 30, - "translation_unit": "../../tests/t20034/t20034.cc" + "translation_unit": "t20034.cc" }, "to": { "activity_id": "1034410188120190919", @@ -561,9 +553,9 @@ void B::b4() "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20034/t20034.cc", + "file": "t20034.cc", "line": 19, - "translation_unit": "../../tests/t20034/t20034.cc" + "translation_unit": "t20034.cc" }, "to": { "activity_id": "1307188853155365430", diff --git a/docs/test_cases/t20034_sequence.svg b/docs/test_cases/t20034_sequence.svg index 4f6c963c..e64ce05f 100644 --- a/docs/test_cases/t20034_sequence.svg +++ b/docs/test_cases/t20034_sequence.svg @@ -1,6 +1,6 @@ - + - + @@ -13,155 +13,155 @@ - - - + + + D - + D - - + + C - + C - - + + B - + B - - + + A - + A - - - D::d2()::(lambda ../../tests/t20034/t20034.cc:56:18) - - D::d2()::(lambda ../../tests/t20034/t20034.cc:56:18) + + + D::d2()::(lambda t20034.cc:56:18) + + D::d2()::(lambda t20034.cc:56:18) 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/t20034_sequence_mermaid.svg b/docs/test_cases/t20034_sequence_mermaid.svg index d10b6c93..e8db8167 100644 --- a/docs/test_cases/t20034_sequence_mermaid.svg +++ b/docs/test_cases/t20034_sequence_mermaid.svg @@ -1,8 +1,8 @@ - + - - - D::d2()::(lambda ../../tests/t20034/t20034.cc:56:18) + + + D::d2()::(lambda t20034.cc:56:18) @@ -36,11 +36,11 @@ - + - - - D::d2()::(lambda ../../tests/t20034/t20034.cc:56:18) + + + D::d2()::(lambda t20034.cc:56:18) @@ -141,10 +141,10 @@ d2() - operator()() - - a2() - + operator()() + + a2() + d2() c4() diff --git a/docs/test_cases/t20035.md b/docs/test_cases/t20035.md index bb14aa6d..1edc8b2a 100644 --- a/docs/test_cases/t20035.md +++ b/docs/test_cases/t20035.md @@ -1,18 +1,15 @@ # t20035 - from_to sequence diagram test case with free functions ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20035_sequence: type: sequence glob: - - ../../tests/t20035/t20035.cc + - t20035.cc include: namespaces: - clanguml::t20035 - using_namespace: - - clanguml::t20035 + using_namespace: clanguml::t20035 from_to: - [function: "clanguml::t20035::tmain(int,char **)", function: "clanguml::t20035::c(int)"] @@ -43,11 +40,6 @@ int tmain(int argc, char **argv) { return a(argc); } ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20035_sequence", "participants": [ { @@ -55,9 +47,9 @@ int tmain(int argc, char **argv) { return a(argc); } "name": "clanguml::t20035::tmain(int,char **)", "source_location": { "column": 5, - "file": "../../tests/t20035/t20035.cc", + "file": "t20035.cc", "line": 12, - "translation_unit": "../../tests/t20035/t20035.cc" + "translation_unit": "t20035.cc" }, "type": "function" }, @@ -66,9 +58,9 @@ int tmain(int argc, char **argv) { return a(argc); } "name": "clanguml::t20035::a(int)", "source_location": { "column": 5, - "file": "../../tests/t20035/t20035.cc", + "file": "t20035.cc", "line": 10, - "translation_unit": "../../tests/t20035/t20035.cc" + "translation_unit": "t20035.cc" }, "type": "function" }, @@ -77,9 +69,9 @@ int tmain(int argc, char **argv) { return a(argc); } "name": "clanguml::t20035::b1(int)", "source_location": { "column": 5, - "file": "../../tests/t20035/t20035.cc", + "file": "t20035.cc", "line": 6, - "translation_unit": "../../tests/t20035/t20035.cc" + "translation_unit": "t20035.cc" }, "type": "function" }, @@ -88,9 +80,9 @@ int tmain(int argc, char **argv) { return a(argc); } "name": "clanguml::t20035::c(int)", "source_location": { "column": 5, - "file": "../../tests/t20035/t20035.cc", + "file": "t20035.cc", "line": 4, - "translation_unit": "../../tests/t20035/t20035.cc" + "translation_unit": "t20035.cc" }, "type": "function" } @@ -122,9 +114,9 @@ int tmain(int argc, char **argv) { return a(argc); } "scope": "normal", "source_location": { "column": 43, - "file": "../../tests/t20035/t20035.cc", + "file": "t20035.cc", "line": 12, - "translation_unit": "../../tests/t20035/t20035.cc" + "translation_unit": "t20035.cc" }, "to": { "activity_id": "1503144831959453736", @@ -145,9 +137,9 @@ int tmain(int argc, char **argv) { return a(argc); } "scope": "normal", "source_location": { "column": 25, - "file": "../../tests/t20035/t20035.cc", + "file": "t20035.cc", "line": 10, - "translation_unit": "../../tests/t20035/t20035.cc" + "translation_unit": "t20035.cc" }, "to": { "activity_id": "440199113909747659", @@ -168,9 +160,9 @@ int tmain(int argc, char **argv) { return a(argc); } "scope": "normal", "source_location": { "column": 26, - "file": "../../tests/t20035/t20035.cc", + "file": "t20035.cc", "line": 6, - "translation_unit": "../../tests/t20035/t20035.cc" + "translation_unit": "t20035.cc" }, "to": { "activity_id": "709102392181022891", diff --git a/docs/test_cases/t20035_sequence.svg b/docs/test_cases/t20035_sequence.svg index 12115f1b..24fee3de 100644 --- a/docs/test_cases/t20035_sequence.svg +++ b/docs/test_cases/t20035_sequence.svg @@ -1,6 +1,6 @@ - + @@ -13,39 +13,39 @@ - - + + tmain(int,char **) - + tmain(int,char **) - - + + a(int) - + a(int) - - + + b1(int) - + b1(int) - - + + c(int) - + c(int) - + - + - + diff --git a/docs/test_cases/t20036.md b/docs/test_cases/t20036.md index 3ae6ec1d..3c20c1dc 100644 --- a/docs/test_cases/t20036.md +++ b/docs/test_cases/t20036.md @@ -1,18 +1,15 @@ # t20036 - Test case for rendering all call chains leading to an activity (to) ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20036_sequence: type: sequence glob: - - ../../tests/t20036/t20036.cc + - t20036.cc include: namespaces: - clanguml::t20036 - using_namespace: - - clanguml::t20036 + using_namespace: clanguml::t20036 to: - function: "clanguml::t20036::A::a2()" ``` @@ -72,11 +69,6 @@ struct D { ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20036_sequence", "participants": [ { @@ -84,9 +76,9 @@ struct D { "name": "clanguml::t20036::C", "source_location": { "column": 8, - "file": "../../tests/t20036/t20036.cc", + "file": "t20036.cc", "line": 19, - "translation_unit": "../../tests/t20036/t20036.cc" + "translation_unit": "t20036.cc" }, "type": "class" }, @@ -95,9 +87,9 @@ struct D { "name": "clanguml::t20036::B", "source_location": { "column": 8, - "file": "../../tests/t20036/t20036.cc", + "file": "t20036.cc", "line": 11, - "translation_unit": "../../tests/t20036/t20036.cc" + "translation_unit": "t20036.cc" }, "type": "class" }, @@ -106,9 +98,9 @@ struct D { "name": "clanguml::t20036::A", "source_location": { "column": 8, - "file": "../../tests/t20036/t20036.cc", + "file": "t20036.cc", "line": 5, - "translation_unit": "../../tests/t20036/t20036.cc" + "translation_unit": "t20036.cc" }, "type": "class" }, @@ -117,9 +109,9 @@ struct D { "name": "clanguml::t20036::D", "source_location": { "column": 8, - "file": "../../tests/t20036/t20036.cc", + "file": "t20036.cc", "line": 35, - "translation_unit": "../../tests/t20036/t20036.cc" + "translation_unit": "t20036.cc" }, "type": "class" } @@ -140,9 +132,9 @@ struct D { "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20036/t20036.cc", + "file": "t20036.cc", "line": 20, - "translation_unit": "../../tests/t20036/t20036.cc" + "translation_unit": "t20036.cc" }, "to": { "activity_id": "203660950902052846", @@ -162,9 +154,9 @@ struct D { "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20036/t20036.cc", + "file": "t20036.cc", "line": 12, - "translation_unit": "../../tests/t20036/t20036.cc" + "translation_unit": "t20036.cc" }, "to": { "activity_id": "2124074228514438863", @@ -188,9 +180,9 @@ struct D { "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20036/t20036.cc", + "file": "t20036.cc", "line": 36, - "translation_unit": "../../tests/t20036/t20036.cc" + "translation_unit": "t20036.cc" }, "to": { "activity_id": "128745191811378037", @@ -210,9 +202,9 @@ struct D { "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20036/t20036.cc", + "file": "t20036.cc", "line": 21, - "translation_unit": "../../tests/t20036/t20036.cc" + "translation_unit": "t20036.cc" }, "to": { "activity_id": "1726094580455938498", @@ -232,9 +224,9 @@ struct D { "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20036/t20036.cc", + "file": "t20036.cc", "line": 13, - "translation_unit": "../../tests/t20036/t20036.cc" + "translation_unit": "t20036.cc" }, "to": { "activity_id": "2124074228514438863", @@ -258,9 +250,9 @@ struct D { "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20036/t20036.cc", + "file": "t20036.cc", "line": 38, - "translation_unit": "../../tests/t20036/t20036.cc" + "translation_unit": "t20036.cc" }, "to": { "activity_id": "2124074228514438863", @@ -284,9 +276,9 @@ struct D { "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20036/t20036.cc", + "file": "t20036.cc", "line": 30, - "translation_unit": "../../tests/t20036/t20036.cc" + "translation_unit": "t20036.cc" }, "to": { "activity_id": "1726094580455938498", @@ -306,9 +298,9 @@ struct D { "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20036/t20036.cc", + "file": "t20036.cc", "line": 13, - "translation_unit": "../../tests/t20036/t20036.cc" + "translation_unit": "t20036.cc" }, "to": { "activity_id": "2124074228514438863", @@ -332,9 +324,9 @@ struct D { "scope": "normal", "source_location": { "column": 13, - "file": "../../tests/t20036/t20036.cc", + "file": "t20036.cc", "line": 27, - "translation_unit": "../../tests/t20036/t20036.cc" + "translation_unit": "t20036.cc" }, "to": { "activity_id": "128745191811378037", @@ -354,9 +346,9 @@ struct D { "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20036/t20036.cc", + "file": "t20036.cc", "line": 21, - "translation_unit": "../../tests/t20036/t20036.cc" + "translation_unit": "t20036.cc" }, "to": { "activity_id": "1726094580455938498", @@ -376,9 +368,9 @@ struct D { "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20036/t20036.cc", + "file": "t20036.cc", "line": 13, - "translation_unit": "../../tests/t20036/t20036.cc" + "translation_unit": "t20036.cc" }, "to": { "activity_id": "2124074228514438863", @@ -402,9 +394,9 @@ struct D { "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20036/t20036.cc", + "file": "t20036.cc", "line": 37, - "translation_unit": "../../tests/t20036/t20036.cc" + "translation_unit": "t20036.cc" }, "to": { "activity_id": "128745191811378037", @@ -424,9 +416,9 @@ struct D { "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20036/t20036.cc", + "file": "t20036.cc", "line": 21, - "translation_unit": "../../tests/t20036/t20036.cc" + "translation_unit": "t20036.cc" }, "to": { "activity_id": "1726094580455938498", @@ -446,9 +438,9 @@ struct D { "scope": "normal", "source_location": { "column": 17, - "file": "../../tests/t20036/t20036.cc", + "file": "t20036.cc", "line": 13, - "translation_unit": "../../tests/t20036/t20036.cc" + "translation_unit": "t20036.cc" }, "to": { "activity_id": "2124074228514438863", diff --git a/docs/test_cases/t20036_sequence.svg b/docs/test_cases/t20036_sequence.svg index 9f021832..e1ae44c1 100644 --- a/docs/test_cases/t20036_sequence.svg +++ b/docs/test_cases/t20036_sequence.svg @@ -1,6 +1,6 @@ - + @@ -13,131 +13,131 @@ - - + + C - + C - - + + B - + B - - + + A - + A - - + + D - + D 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 94c0d1c7..d2d11cd7 100644 --- a/docs/test_cases/t20037.md +++ b/docs/test_cases/t20037.md @@ -1,18 +1,15 @@ # t20037 - Test case checking if activities in static variable declarations appear only once ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t20037_sequence: type: sequence glob: - - ../../tests/t20037/t20037.cc + - t20037.cc include: namespaces: - clanguml::t20037 - using_namespace: - - clanguml::t20037 + using_namespace: clanguml::t20037 from: - function: "clanguml::t20037::tmain(int,char **)" ``` @@ -66,11 +63,6 @@ void tmain(int argc, char **argv) ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20037_sequence", "participants": [ { @@ -78,9 +70,9 @@ void tmain(int argc, char **argv) "name": "clanguml::t20037::tmain(int,char **)", "source_location": { "column": 6, - "file": "../../tests/t20037/t20037.cc", + "file": "t20037.cc", "line": 31, - "translation_unit": "../../tests/t20037/t20037.cc" + "translation_unit": "t20037.cc" }, "type": "function" }, @@ -89,9 +81,9 @@ void tmain(int argc, char **argv) "name": "clanguml::t20037::a()", "source_location": { "column": 5, - "file": "../../tests/t20037/t20037.cc", + "file": "t20037.cc", "line": 23, - "translation_unit": "../../tests/t20037/t20037.cc" + "translation_unit": "t20037.cc" }, "type": "function" }, @@ -100,9 +92,9 @@ void tmain(int argc, char **argv) "name": "clanguml::t20037::A", "source_location": { "column": 8, - "file": "../../tests/t20037/t20037.cc", + "file": "t20037.cc", "line": 4, - "translation_unit": "../../tests/t20037/t20037.cc" + "translation_unit": "t20037.cc" }, "type": "class" }, @@ -111,9 +103,9 @@ void tmain(int argc, char **argv) "name": "clanguml::t20037::initb()", "source_location": { "column": 3, - "file": "../../tests/t20037/t20037.cc", + "file": "t20037.cc", "line": 19, - "translation_unit": "../../tests/t20037/t20037.cc" + "translation_unit": "t20037.cc" }, "type": "function" }, @@ -122,9 +114,9 @@ void tmain(int argc, char **argv) "name": "clanguml::t20037::B", "source_location": { "column": 8, - "file": "../../tests/t20037/t20037.cc", + "file": "t20037.cc", "line": 13, - "translation_unit": "../../tests/t20037/t20037.cc" + "translation_unit": "t20037.cc" }, "type": "class" }, @@ -133,9 +125,9 @@ void tmain(int argc, char **argv) "name": "clanguml::t20037::c()", "source_location": { "column": 5, - "file": "../../tests/t20037/t20037.cc", + "file": "t20037.cc", "line": 21, - "translation_unit": "../../tests/t20037/t20037.cc" + "translation_unit": "t20037.cc" }, "type": "function" } @@ -155,9 +147,9 @@ void tmain(int argc, char **argv) "scope": "normal", "source_location": { "column": 15, - "file": "../../tests/t20037/t20037.cc", + "file": "t20037.cc", "line": 33, - "translation_unit": "../../tests/t20037/t20037.cc" + "translation_unit": "t20037.cc" }, "to": { "activity_id": "150460916850164805", @@ -178,9 +170,9 @@ void tmain(int argc, char **argv) "scope": "normal", "source_location": { "column": 14, - "file": "../../tests/t20037/t20037.cc", + "file": "t20037.cc", "line": 25, - "translation_unit": "../../tests/t20037/t20037.cc" + "translation_unit": "t20037.cc" }, "to": { "activity_id": "1135451191676888496", @@ -201,9 +193,9 @@ void tmain(int argc, char **argv) "scope": "normal", "source_location": { "column": 18, - "file": "../../tests/t20037/t20037.cc", + "file": "t20037.cc", "line": 26, - "translation_unit": "../../tests/t20037/t20037.cc" + "translation_unit": "t20037.cc" }, "to": { "activity_id": "1303264946914255327", @@ -224,9 +216,9 @@ void tmain(int argc, char **argv) "scope": "normal", "source_location": { "column": 18, - "file": "../../tests/t20037/t20037.cc", + "file": "t20037.cc", "line": 28, - "translation_unit": "../../tests/t20037/t20037.cc" + "translation_unit": "t20037.cc" }, "to": { "activity_id": "107877908217538137", @@ -247,9 +239,9 @@ void tmain(int argc, char **argv) "scope": "normal", "source_location": { "column": 28, - "file": "../../tests/t20037/t20037.cc", + "file": "t20037.cc", "line": 28, - "translation_unit": "../../tests/t20037/t20037.cc" + "translation_unit": "t20037.cc" }, "to": { "activity_id": "1349992361928784583", @@ -270,9 +262,9 @@ void tmain(int argc, char **argv) "scope": "normal", "source_location": { "column": 15, - "file": "../../tests/t20037/t20037.cc", + "file": "t20037.cc", "line": 34, - "translation_unit": "../../tests/t20037/t20037.cc" + "translation_unit": "t20037.cc" }, "to": { "activity_id": "150460916850164805", @@ -293,9 +285,9 @@ void tmain(int argc, char **argv) "scope": "normal", "source_location": { "column": 15, - "file": "../../tests/t20037/t20037.cc", + "file": "t20037.cc", "line": 35, - "translation_unit": "../../tests/t20037/t20037.cc" + "translation_unit": "t20037.cc" }, "to": { "activity_id": "150460916850164805", diff --git a/docs/test_cases/t20037_sequence.svg b/docs/test_cases/t20037_sequence.svg index 28b86795..3d8d6aef 100644 --- a/docs/test_cases/t20037_sequence.svg +++ b/docs/test_cases/t20037_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,95 +9,95 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - + + tmain(int,char **) - + tmain(int,char **) - - + + a() - + a() - - + + A - + A - - + + initb() - + initb() - - + + B - + B - - + + c() - + c() - - - - - - - - - - - - - + + + + + + + + + + + + + - + A() - + - + get() - + @@ -105,18 +105,18 @@ - + - + get() - + @@ -124,18 +124,18 @@ - + - + get() - + diff --git a/docs/test_cases/t20038.md b/docs/test_cases/t20038.md index 7aa23bc7..577e54dc 100644 --- a/docs/test_cases/t20038.md +++ b/docs/test_cases/t20038.md @@ -1,15 +1,13 @@ # t20038 - Sequence diagram comment decorator test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams add_compile_flags: - -fparse-all-comments diagrams: t20038_sequence: type: sequence glob: - - ../../tests/t20038/t20038.cc + - t20038.cc include: namespaces: - clanguml::t20038 @@ -17,8 +15,7 @@ diagrams: - function: clanguml::t20038::tmain() generate_message_comments: true message_comment_width: 35 - using_namespace: - - clanguml::t20038 + using_namespace: clanguml::t20038 ``` ## Source code File t20038.cc @@ -123,11 +120,6 @@ int tmain() ```json { "diagram_type": "sequence", - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t20038_sequence", "participants": [ { @@ -135,9 +127,9 @@ int tmain() "name": "clanguml::t20038::tmain()", "source_location": { "column": 5, - "file": "../../tests/t20038/t20038.cc", + "file": "t20038.cc", "line": 44, - "translation_unit": "../../tests/t20038/t20038.cc" + "translation_unit": "t20038.cc" }, "type": "function" }, @@ -146,9 +138,9 @@ int tmain() "name": "clanguml::t20038::B", "source_location": { "column": 8, - "file": "../../tests/t20038/t20038.cc", + "file": "t20038.cc", "line": 28, - "translation_unit": "../../tests/t20038/t20038.cc" + "translation_unit": "t20038.cc" }, "type": "class" }, @@ -157,9 +149,9 @@ int tmain() "name": "clanguml::t20038::A", "source_location": { "column": 8, - "file": "../../tests/t20038/t20038.cc", + "file": "t20038.cc", "line": 8, - "translation_unit": "../../tests/t20038/t20038.cc" + "translation_unit": "t20038.cc" }, "type": "class" }, @@ -168,9 +160,9 @@ int tmain() "name": "clanguml::t20038::add(int,int)", "source_location": { "column": 25, - "file": "../../tests/t20038/include/t20038.h", + "file": "include/t20038.h", "line": 8, - "translation_unit": "../../tests/t20038/t20038.cc" + "translation_unit": "t20038.cc" }, "type": "function_template" }, @@ -179,9 +171,9 @@ int tmain() "name": "clanguml::t20038::add_impl(int,int)", "source_location": { "column": 25, - "file": "../../tests/t20038/include/t20038.h", + "file": "include/t20038.h", "line": 6, - "translation_unit": "../../tests/t20038/t20038.cc" + "translation_unit": "t20038.cc" }, "type": "function_template" }, @@ -190,9 +182,9 @@ int tmain() "name": "clanguml::t20038::add_impl(double,double)", "source_location": { "column": 25, - "file": "../../tests/t20038/include/t20038.h", + "file": "include/t20038.h", "line": 6, - "translation_unit": "../../tests/t20038/t20038.cc" + "translation_unit": "t20038.cc" }, "type": "function_template" } @@ -220,9 +212,9 @@ int tmain() "scope": "normal", "source_location": { "column": 18, - "file": "../../tests/t20038/t20038.cc", + "file": "t20038.cc", "line": 59, - "translation_unit": "../../tests/t20038/t20038.cc" + "translation_unit": "t20038.cc" }, "to": { "activity_id": "690314603725772987", @@ -242,9 +234,9 @@ int tmain() "scope": "normal", "source_location": { "column": 22, - "file": "../../tests/t20038/t20038.cc", + "file": "t20038.cc", "line": 29, - "translation_unit": "../../tests/t20038/t20038.cc" + "translation_unit": "t20038.cc" }, "to": { "activity_id": "1311298747919334371", @@ -275,9 +267,9 @@ int tmain() "scope": "normal", "source_location": { "column": 20, - "file": "../../tests/t20038/t20038.cc", + "file": "t20038.cc", "line": 65, - "translation_unit": "../../tests/t20038/t20038.cc" + "translation_unit": "t20038.cc" }, "to": { "activity_id": "690314603725772987", @@ -305,9 +297,9 @@ int tmain() "scope": "normal", "source_location": { "column": 23, - "file": "../../tests/t20038/t20038.cc", + "file": "t20038.cc", "line": 72, - "translation_unit": "../../tests/t20038/t20038.cc" + "translation_unit": "t20038.cc" }, "to": { "activity_id": "1902331999195245434", @@ -327,9 +319,9 @@ int tmain() "scope": "normal", "source_location": { "column": 24, - "file": "../../tests/t20038/t20038.cc", + "file": "t20038.cc", "line": 33, - "translation_unit": "../../tests/t20038/t20038.cc" + "translation_unit": "t20038.cc" }, "to": { "activity_id": "2157208254318041144", @@ -350,9 +342,9 @@ int tmain() "scope": "normal", "source_location": { "column": 12, - "file": "../../tests/t20038/t20038.cc", + "file": "t20038.cc", "line": 77, - "translation_unit": "../../tests/t20038/t20038.cc" + "translation_unit": "t20038.cc" }, "to": { "activity_id": "57189865474209187", @@ -372,9 +364,9 @@ int tmain() "scope": "normal", "source_location": { "column": 25, - "file": "../../tests/t20038/t20038.cc", + "file": "t20038.cc", "line": 35, - "translation_unit": "../../tests/t20038/t20038.cc" + "translation_unit": "t20038.cc" }, "to": { "activity_id": "1370854824770046153", @@ -394,9 +386,9 @@ int tmain() "scope": "normal", "source_location": { "column": 25, - "file": "../../tests/t20038/t20038.cc", + "file": "t20038.cc", "line": 23, - "translation_unit": "../../tests/t20038/t20038.cc" + "translation_unit": "t20038.cc" }, "to": { "activity_id": "2008308445790932614", @@ -418,9 +410,9 @@ int tmain() "scope": "normal", "source_location": { "column": 12, - "file": "../../tests/t20038/include/t20038.h", + "file": "include/t20038.h", "line": 11, - "translation_unit": "../../tests/t20038/t20038.cc" + "translation_unit": "t20038.cc" }, "to": { "activity_id": "1863007445376981099", @@ -442,9 +434,9 @@ int tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20038/t20038.cc", + "file": "t20038.cc", "line": 77, - "translation_unit": "../../tests/t20038/t20038.cc" + "translation_unit": "t20038.cc" }, "to": { "activity_id": "732774941205637034", @@ -466,9 +458,9 @@ int tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20038/t20038.cc", + "file": "t20038.cc", "line": 79, - "translation_unit": "../../tests/t20038/t20038.cc" + "translation_unit": "t20038.cc" }, "to": { "activity_id": "1722521509166427875", @@ -490,9 +482,9 @@ int tmain() "scope": "normal", "source_location": { "column": 5, - "file": "../../tests/t20038/t20038.cc", + "file": "t20038.cc", "line": 85, - "translation_unit": "../../tests/t20038/t20038.cc" + "translation_unit": "t20038.cc" }, "to": { "activity_id": "726295067786650864", @@ -512,9 +504,9 @@ int tmain() "scope": "normal", "source_location": { "column": 26, - "file": "../../tests/t20038/t20038.cc", + "file": "t20038.cc", "line": 37, - "translation_unit": "../../tests/t20038/t20038.cc" + "translation_unit": "t20038.cc" }, "to": { "activity_id": "1370854824770046153", @@ -540,9 +532,9 @@ int tmain() "scope": "condition", "source_location": { "column": 12, - "file": "../../tests/t20038/t20038.cc", + "file": "t20038.cc", "line": 88, - "translation_unit": "../../tests/t20038/t20038.cc" + "translation_unit": "t20038.cc" }, "to": { "activity_id": "1902331999195245434", diff --git a/docs/test_cases/t20038_sequence.svg b/docs/test_cases/t20038_sequence.svg index b5a14631..eb44ecf1 100644 --- a/docs/test_cases/t20038_sequence.svg +++ b/docs/test_cases/t20038_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,29 +9,29 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + @@ -39,62 +39,62 @@ - - + + tmain() - + tmain() - - + + B - + B - - + + A - + A - - + + add<int>(int,int) - + add<int>(int,int) - - + + add_impl<int>(int,int) - + add_impl<int>(int,int) - - + + add_impl<double>(double,double) - + add_impl<double>(double,double) - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + Nisl purus in mollis nunc sed id semper. Varius vel pharetra vel turpis. Arcu @@ -111,18 +111,18 @@ alt - + Repeat 5 times... loop - + b() - + a() @@ -132,15 +132,15 @@ - + ... or just once - + b() - + a() @@ -149,12 +149,12 @@ - + bbb() - + aaa() @@ -163,24 +163,24 @@ - + bbbb() - + aaaa() - + - + Invoke 'add' implementation - + @@ -192,47 +192,47 @@ - + This comment should be rendered only once - + wrap(int) - + What is 2 + 2? - + - + Calling B::bbbbb() - + bbbbb() - + aaaa() - + - + Invoke 'add' implementation - + @@ -244,20 +244,20 @@ - + This is a conditional operator alt - + [ bbb() ] - + aaa() diff --git a/docs/test_cases/t30001.md b/docs/test_cases/t30001.md index 84d343a9..b310a418 100644 --- a/docs/test_cases/t30001.md +++ b/docs/test_cases/t30001.md @@ -1,22 +1,19 @@ # t30001 - Basic package diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t30001_package: type: package title: Basic package diagram example glob: - - ../../tests/t30001/t30001.cc + - t30001.cc include: namespaces: - clanguml::t30001 exclude: namespaces: - clanguml::t30001::detail - using_namespace: - - clanguml::t30001 + using_namespace: clanguml::t30001 plantuml: before: - "' t30001 test diagram of type {{ diagram.type }}" @@ -88,9 +85,9 @@ namespace BB { "name": "t30001", "source_location": { "column": 11, - "file": "../../tests/t30001/t30001.cc", + "file": "t30001.cc", "line": 2, - "translation_unit": "../../tests/t30001/t30001.cc" + "translation_unit": "t30001.cc" }, "type": "namespace" } @@ -100,9 +97,9 @@ namespace BB { "name": "clanguml", "source_location": { "column": 11, - "file": "../../tests/t30001/t30001.cc", + "file": "t30001.cc", "line": 1, - "translation_unit": "../../tests/t30001/t30001.cc" + "translation_unit": "t30001.cc" }, "type": "namespace" }, @@ -123,9 +120,9 @@ namespace BB { "name": "AAA", "source_location": { "column": 11, - "file": "../../tests/t30001/t30001.cc", + "file": "t30001.cc", "line": 6, - "translation_unit": "../../tests/t30001/t30001.cc" + "translation_unit": "t30001.cc" }, "type": "namespace" }, @@ -136,9 +133,9 @@ namespace BB { "name": "BBB", "source_location": { "column": 11, - "file": "../../tests/t30001/t30001.cc", + "file": "t30001.cc", "line": 8, - "translation_unit": "../../tests/t30001/t30001.cc" + "translation_unit": "t30001.cc" }, "type": "namespace" } @@ -148,9 +145,9 @@ namespace BB { "name": "AA", "source_location": { "column": 11, - "file": "../../tests/t30001/t30001.cc", + "file": "t30001.cc", "line": 5, - "translation_unit": "../../tests/t30001/t30001.cc" + "translation_unit": "t30001.cc" }, "type": "namespace" }, @@ -161,9 +158,9 @@ namespace BB { "name": "BB", "source_location": { "column": 11, - "file": "../../tests/t30001/t30001.cc", + "file": "t30001.cc", "line": 11, - "translation_unit": "../../tests/t30001/t30001.cc" + "translation_unit": "t30001.cc" }, "type": "namespace" } @@ -173,9 +170,9 @@ namespace BB { "name": "A", "source_location": { "column": 11, - "file": "../../tests/t30001/t30001.cc", + "file": "t30001.cc", "line": 3, - "translation_unit": "../../tests/t30001/t30001.cc" + "translation_unit": "t30001.cc" }, "type": "namespace" }, @@ -196,9 +193,9 @@ namespace BB { "name": "AAA", "source_location": { "column": 11, - "file": "../../tests/t30001/t30001.cc", + "file": "t30001.cc", "line": 17, - "translation_unit": "../../tests/t30001/t30001.cc" + "translation_unit": "t30001.cc" }, "type": "namespace" }, @@ -209,9 +206,9 @@ namespace BB { "name": "BBB", "source_location": { "column": 11, - "file": "../../tests/t30001/t30001.cc", + "file": "t30001.cc", "line": 19, - "translation_unit": "../../tests/t30001/t30001.cc" + "translation_unit": "t30001.cc" }, "type": "namespace" } @@ -221,9 +218,9 @@ namespace BB { "name": "AA", "source_location": { "column": 11, - "file": "../../tests/t30001/t30001.cc", + "file": "t30001.cc", "line": 16, - "translation_unit": "../../tests/t30001/t30001.cc" + "translation_unit": "t30001.cc" }, "type": "namespace" }, @@ -234,9 +231,9 @@ namespace BB { "name": "BB", "source_location": { "column": 11, - "file": "../../tests/t30001/t30001.cc", + "file": "t30001.cc", "line": 22, - "translation_unit": "../../tests/t30001/t30001.cc" + "translation_unit": "t30001.cc" }, "type": "namespace" } @@ -246,18 +243,13 @@ namespace BB { "name": "B", "source_location": { "column": 11, - "file": "../../tests/t30001/t30001.cc", + "file": "t30001.cc", "line": 14, - "translation_unit": "../../tests/t30001/t30001.cc" + "translation_unit": "t30001.cc" }, "type": "namespace" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t30001_package", "relationships": [], "title": "Basic package diagram example", diff --git a/docs/test_cases/t30001_package.svg b/docs/test_cases/t30001_package.svg index 2ee499b8..cbfe2c5b 100644 --- a/docs/test_cases/t30001_package.svg +++ b/docs/test_cases/t30001_package.svg @@ -1,6 +1,6 @@ - + @@ -10,67 +10,67 @@ Basic package diagram example - - + + A - - + + AA - - + + B - - + + AA - - + + AAA - - + + BBB - - + + 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/t30002.md b/docs/test_cases/t30002.md index c46385d7..453879bd 100644 --- a/docs/test_cases/t30002.md +++ b/docs/test_cases/t30002.md @@ -1,21 +1,18 @@ # t30002 - Package dependency test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t30002_package: type: package glob: - - ../../tests/t30002/t30002.cc + - t30002.cc include: namespaces: - clanguml::t30002 exclude: namespaces: - clanguml::t30002::detail - using_namespace: - - clanguml::t30002 + using_namespace: clanguml::t30002 plantuml: before: - "' t30002 test package diagram" @@ -162,9 +159,9 @@ template std::map> cm() "name": "t30002", "source_location": { "column": 11, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 8, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" } @@ -174,9 +171,9 @@ template std::map> cm() "name": "clanguml", "source_location": { "column": 11, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 7, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" }, @@ -193,9 +190,9 @@ template std::map> cm() "name": "A1", "source_location": { "column": 11, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 10, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" }, @@ -206,9 +203,9 @@ template std::map> cm() "name": "A2", "source_location": { "column": 11, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 13, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" }, @@ -219,9 +216,9 @@ template std::map> cm() "name": "A3", "source_location": { "column": 11, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 18, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" }, @@ -232,9 +229,9 @@ template std::map> cm() "name": "A4", "source_location": { "column": 11, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 21, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" }, @@ -245,9 +242,9 @@ template std::map> cm() "name": "A5", "source_location": { "column": 11, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 24, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" }, @@ -258,9 +255,9 @@ template std::map> cm() "name": "A6", "source_location": { "column": 11, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 27, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" }, @@ -271,9 +268,9 @@ template std::map> cm() "name": "A7", "source_location": { "column": 11, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 30, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" }, @@ -284,9 +281,9 @@ template std::map> cm() "name": "A8", "source_location": { "column": 11, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 33, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" }, @@ -297,9 +294,9 @@ template std::map> cm() "name": "A9", "source_location": { "column": 11, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 36, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" }, @@ -310,9 +307,9 @@ template std::map> cm() "name": "A10", "source_location": { "column": 11, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 39, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" }, @@ -323,9 +320,9 @@ template std::map> cm() "name": "A11", "source_location": { "column": 11, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 42, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" }, @@ -336,9 +333,9 @@ template std::map> cm() "name": "A12", "source_location": { "column": 11, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 45, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" }, @@ -349,9 +346,9 @@ template std::map> cm() "name": "A13", "source_location": { "column": 11, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 48, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" }, @@ -362,9 +359,9 @@ template std::map> cm() "name": "A14", "source_location": { "column": 11, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 51, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" }, @@ -375,9 +372,9 @@ template std::map> cm() "name": "A15", "source_location": { "column": 11, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 54, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" }, @@ -388,9 +385,9 @@ template std::map> cm() "name": "A16", "source_location": { "column": 11, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 57, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" }, @@ -401,9 +398,9 @@ template std::map> cm() "name": "A17", "source_location": { "column": 11, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 60, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" }, @@ -414,9 +411,9 @@ template std::map> cm() "name": "A18", "source_location": { "column": 11, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 63, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" } @@ -426,9 +423,9 @@ template std::map> cm() "name": "AA", "source_location": { "column": 14, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 9, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" } @@ -438,9 +435,9 @@ template std::map> cm() "name": "A", "source_location": { "column": 11, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 9, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" }, @@ -457,9 +454,9 @@ template std::map> cm() "name": "BBB", "source_location": { "column": 18, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 67, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" } @@ -469,9 +466,9 @@ template std::map> cm() "name": "BB", "source_location": { "column": 14, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 67, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" } @@ -481,18 +478,13 @@ template std::map> cm() "name": "B", "source_location": { "column": 11, - "file": "../../tests/t30002/t30002.cc", + "file": "t30002.cc", "line": 67, - "translation_unit": "../../tests/t30002/t30002.cc" + "translation_unit": "t30002.cc" }, "type": "namespace" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t30002_package", "relationships": [ { diff --git a/docs/test_cases/t30002_package.svg b/docs/test_cases/t30002_package.svg index 10e6f695..caaacf08 100644 --- a/docs/test_cases/t30002_package.svg +++ b/docs/test_cases/t30002_package.svg @@ -1,6 +1,6 @@ - + @@ -9,118 +9,118 @@ - - + + A - - + + AA - - + + B - - + + BB - - + + A1 - - + + A2 - - + + A3 - - + + A4 - - + + A5 - - + + A6 - - + + A7 - - + + A8 - - + + A9 - - + + A10 - - + + A11 - - + + A12 - - + + A13 - - + + A14 - - + + A15 - - + + A16 - - + + A17 - - + + A18 - - + + BBB diff --git a/docs/test_cases/t30003.md b/docs/test_cases/t30003.md index 8a0bc169..3d3525d2 100644 --- a/docs/test_cases/t30003.md +++ b/docs/test_cases/t30003.md @@ -1,18 +1,15 @@ # t30003 - Package deprecated attribute test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t30003_package: type: package glob: - - ../../tests/t30003/t30003.cc + - t30003.cc include: namespaces: - clanguml::t30003 - using_namespace: - - clanguml::t30003 + using_namespace: clanguml::t30003 plantuml: before: - "' t30003 test package diagram" @@ -67,9 +64,9 @@ class B : public ns1::ns2::Anon { }; "name": "t30003", "source_location": { "column": 11, - "file": "../../tests/t30003/t30003.cc", + "file": "t30003.cc", "line": 2, - "translation_unit": "../../tests/t30003/t30003.cc" + "translation_unit": "t30003.cc" }, "type": "namespace" } @@ -79,9 +76,9 @@ class B : public ns1::ns2::Anon { }; "name": "clanguml", "source_location": { "column": 11, - "file": "../../tests/t30003/t30003.cc", + "file": "t30003.cc", "line": 1, - "translation_unit": "../../tests/t30003/t30003.cc" + "translation_unit": "t30003.cc" }, "type": "namespace" }, @@ -95,9 +92,9 @@ class B : public ns1::ns2::Anon { }; "name": "ns2_v1_0_0", "source_location": { "column": 11, - "file": "../../tests/t30003/t30003.cc", + "file": "t30003.cc", "line": 5, - "translation_unit": "../../tests/t30003/t30003.cc" + "translation_unit": "t30003.cc" }, "type": "namespace" }, @@ -108,9 +105,9 @@ class B : public ns1::ns2::Anon { }; "name": "ns2_v0_9_0", "source_location": { "column": 26, - "file": "../../tests/t30003/t30003.cc", + "file": "t30003.cc", "line": 9, - "translation_unit": "../../tests/t30003/t30003.cc" + "translation_unit": "t30003.cc" }, "type": "namespace" } @@ -120,9 +117,9 @@ class B : public ns1::ns2::Anon { }; "name": "ns1", "source_location": { "column": 11, - "file": "../../tests/t30003/t30003.cc", + "file": "t30003.cc", "line": 4, - "translation_unit": "../../tests/t30003/t30003.cc" + "translation_unit": "t30003.cc" }, "type": "namespace" }, @@ -139,9 +136,9 @@ class B : public ns1::ns2::Anon { }; "name": "ns2", "source_location": { "column": 16, - "file": "../../tests/t30003/t30003.cc", + "file": "t30003.cc", "line": 20, - "translation_unit": "../../tests/t30003/t30003.cc" + "translation_unit": "t30003.cc" }, "type": "namespace" } @@ -151,9 +148,9 @@ class B : public ns1::ns2::Anon { }; "name": "ns1", "source_location": { "column": 11, - "file": "../../tests/t30003/t30003.cc", + "file": "t30003.cc", "line": 20, - "translation_unit": "../../tests/t30003/t30003.cc" + "translation_unit": "t30003.cc" }, "type": "namespace" } @@ -163,18 +160,13 @@ class B : public ns1::ns2::Anon { }; "name": "ns3", "source_location": { "column": 26, - "file": "../../tests/t30003/t30003.cc", + "file": "t30003.cc", "line": 18, - "translation_unit": "../../tests/t30003/t30003.cc" + "translation_unit": "t30003.cc" }, "type": "namespace" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t30003_package", "relationships": [ { diff --git a/docs/test_cases/t30003_package.svg b/docs/test_cases/t30003_package.svg index f39aea97..d82c24d4 100644 --- a/docs/test_cases/t30003_package.svg +++ b/docs/test_cases/t30003_package.svg @@ -1,6 +1,6 @@ - + @@ -9,35 +9,35 @@ - - + + ns1 - - + + ns3 «deprecated» - - + + ns1 - - + + ns2_v1_0_0 - - + + ns2_v0_9_0 «deprecated» - - + + ns2 diff --git a/docs/test_cases/t30004.md b/docs/test_cases/t30004.md index 21a3261b..d24125f7 100644 --- a/docs/test_cases/t30004.md +++ b/docs/test_cases/t30004.md @@ -1,18 +1,15 @@ # t30004 - PlantUML package decorators test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t30004_package: type: package glob: - - ../../tests/t30004/t30004.cc + - t30004.cc include: namespaces: - clanguml::t30004 - using_namespace: - - clanguml::t30004 + using_namespace: clanguml::t30004 plantuml: before: - "' t30004 test package diagram" @@ -75,9 +72,9 @@ namespace CCC { "name": "t30004", "source_location": { "column": 11, - "file": "../../tests/t30004/t30004.cc", + "file": "t30004.cc", "line": 2, - "translation_unit": "../../tests/t30004/t30004.cc" + "translation_unit": "t30004.cc" }, "type": "namespace" } @@ -87,9 +84,9 @@ namespace CCC { "name": "clanguml", "source_location": { "column": 11, - "file": "../../tests/t30004/t30004.cc", + "file": "t30004.cc", "line": 1, - "translation_unit": "../../tests/t30004/t30004.cc" + "translation_unit": "t30004.cc" }, "type": "namespace" }, @@ -111,9 +108,9 @@ namespace CCC { "name": "AAA", "source_location": { "column": 11, - "file": "../../tests/t30004/t30004.cc", + "file": "t30004.cc", "line": 8, - "translation_unit": "../../tests/t30004/t30004.cc" + "translation_unit": "t30004.cc" }, "type": "namespace" }, @@ -128,9 +125,9 @@ namespace CCC { "name": "BBB", "source_location": { "column": 11, - "file": "../../tests/t30004/t30004.cc", + "file": "t30004.cc", "line": 12, - "translation_unit": "../../tests/t30004/t30004.cc" + "translation_unit": "t30004.cc" }, "type": "namespace" }, @@ -145,9 +142,9 @@ namespace CCC { "name": "CCC", "source_location": { "column": 11, - "file": "../../tests/t30004/t30004.cc", + "file": "t30004.cc", "line": 18, - "translation_unit": "../../tests/t30004/t30004.cc" + "translation_unit": "t30004.cc" }, "type": "namespace" }, @@ -162,9 +159,9 @@ namespace CCC { "name": "EEE", "source_location": { "column": 11, - "file": "../../tests/t30004/t30004.cc", + "file": "t30004.cc", "line": 27, - "translation_unit": "../../tests/t30004/t30004.cc" + "translation_unit": "t30004.cc" }, "type": "namespace" } @@ -174,18 +171,13 @@ namespace CCC { "name": "A", "source_location": { "column": 11, - "file": "../../tests/t30004/t30004.cc", + "file": "t30004.cc", "line": 5, - "translation_unit": "../../tests/t30004/t30004.cc" + "translation_unit": "t30004.cc" }, "type": "namespace" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t30004_package", "relationships": [], "using_namespace": "clanguml::t30004" diff --git a/docs/test_cases/t30004_package.svg b/docs/test_cases/t30004_package.svg index 895d4068..ef57ee6b 100644 --- a/docs/test_cases/t30004_package.svg +++ b/docs/test_cases/t30004_package.svg @@ -1,6 +1,6 @@ - + @@ -9,46 +9,46 @@ - - + + A - + Package AAA. - + Package BBB. - + CCCC package note. - + We skipped DDD. - - + + AAA - - + + BBB - - + + CCC - - + + EEE - - - - + + + + diff --git a/docs/test_cases/t30005.md b/docs/test_cases/t30005.md index 0765fda0..daf72e72 100644 --- a/docs/test_cases/t30005.md +++ b/docs/test_cases/t30005.md @@ -1,18 +1,15 @@ # t30005 - Package namespace alias test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t30005_package: type: package glob: - - ../../tests/t30005/t30005.cc + - t30005.cc include: namespaces: - clanguml::t30005 - using_namespace: - - clanguml::t30005 + using_namespace: clanguml::t30005 plantuml: before: - "' t30005 test package diagram" @@ -67,9 +64,9 @@ struct C2 { "name": "t30005", "source_location": { "column": 11, - "file": "../../tests/t30005/t30005.cc", + "file": "t30005.cc", "line": 2, - "translation_unit": "../../tests/t30005/t30005.cc" + "translation_unit": "t30005.cc" }, "type": "namespace" } @@ -79,9 +76,9 @@ struct C2 { "name": "clanguml", "source_location": { "column": 11, - "file": "../../tests/t30005/t30005.cc", + "file": "t30005.cc", "line": 1, - "translation_unit": "../../tests/t30005/t30005.cc" + "translation_unit": "t30005.cc" }, "type": "namespace" }, @@ -98,9 +95,9 @@ struct C2 { "name": "AAA", "source_location": { "column": 18, - "file": "../../tests/t30005/t30005.cc", + "file": "t30005.cc", "line": 4, - "translation_unit": "../../tests/t30005/t30005.cc" + "translation_unit": "t30005.cc" }, "type": "namespace" } @@ -110,9 +107,9 @@ struct C2 { "name": "AA", "source_location": { "column": 14, - "file": "../../tests/t30005/t30005.cc", + "file": "t30005.cc", "line": 4, - "translation_unit": "../../tests/t30005/t30005.cc" + "translation_unit": "t30005.cc" }, "type": "namespace" } @@ -122,9 +119,9 @@ struct C2 { "name": "A", "source_location": { "column": 11, - "file": "../../tests/t30005/t30005.cc", + "file": "t30005.cc", "line": 4, - "translation_unit": "../../tests/t30005/t30005.cc" + "translation_unit": "t30005.cc" }, "type": "namespace" }, @@ -141,9 +138,9 @@ struct C2 { "name": "BBB", "source_location": { "column": 18, - "file": "../../tests/t30005/t30005.cc", + "file": "t30005.cc", "line": 8, - "translation_unit": "../../tests/t30005/t30005.cc" + "translation_unit": "t30005.cc" }, "type": "namespace" } @@ -153,9 +150,9 @@ struct C2 { "name": "BB", "source_location": { "column": 14, - "file": "../../tests/t30005/t30005.cc", + "file": "t30005.cc", "line": 8, - "translation_unit": "../../tests/t30005/t30005.cc" + "translation_unit": "t30005.cc" }, "type": "namespace" } @@ -165,9 +162,9 @@ struct C2 { "name": "B", "source_location": { "column": 11, - "file": "../../tests/t30005/t30005.cc", + "file": "t30005.cc", "line": 8, - "translation_unit": "../../tests/t30005/t30005.cc" + "translation_unit": "t30005.cc" }, "type": "namespace" }, @@ -184,9 +181,9 @@ struct C2 { "name": "CCC", "source_location": { "column": 18, - "file": "../../tests/t30005/t30005.cc", + "file": "t30005.cc", "line": 16, - "translation_unit": "../../tests/t30005/t30005.cc" + "translation_unit": "t30005.cc" }, "type": "namespace" } @@ -196,9 +193,9 @@ struct C2 { "name": "CC", "source_location": { "column": 14, - "file": "../../tests/t30005/t30005.cc", + "file": "t30005.cc", "line": 16, - "translation_unit": "../../tests/t30005/t30005.cc" + "translation_unit": "t30005.cc" }, "type": "namespace" } @@ -208,18 +205,13 @@ struct C2 { "name": "C", "source_location": { "column": 11, - "file": "../../tests/t30005/t30005.cc", + "file": "t30005.cc", "line": 16, - "translation_unit": "../../tests/t30005/t30005.cc" + "translation_unit": "t30005.cc" }, "type": "namespace" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t30005_package", "relationships": [ { diff --git a/docs/test_cases/t30005_package.svg b/docs/test_cases/t30005_package.svg index e804f7d7..3a9903d3 100644 --- a/docs/test_cases/t30005_package.svg +++ b/docs/test_cases/t30005_package.svg @@ -1,6 +1,6 @@ - + @@ -9,48 +9,48 @@ - - + + A - - + + AA - - + + B - - + + BB - - + + C - - + + CC - - + + AAA - - + + BBB - - + + CCC diff --git a/docs/test_cases/t30006.md b/docs/test_cases/t30006.md index d81a31d8..8433eccb 100644 --- a/docs/test_cases/t30006.md +++ b/docs/test_cases/t30006.md @@ -1,18 +1,15 @@ # t30006 - Package split namespace test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t30006_package: type: package glob: - - ../../tests/t30006/t30006.cc + - t30006.cc include: namespaces: - clanguml::t30006 - using_namespace: - - clanguml::t30006 + using_namespace: clanguml::t30006 plantuml: before: - "' t30006 test package diagram" @@ -67,9 +64,9 @@ struct A2 { "name": "t30006", "source_location": { "column": 11, - "file": "../../tests/t30006/t30006.cc", + "file": "t30006.cc", "line": 2, - "translation_unit": "../../tests/t30006/t30006.cc" + "translation_unit": "t30006.cc" }, "type": "namespace" } @@ -79,9 +76,9 @@ struct A2 { "name": "clanguml", "source_location": { "column": 11, - "file": "../../tests/t30006/t30006.cc", + "file": "t30006.cc", "line": 1, - "translation_unit": "../../tests/t30006/t30006.cc" + "translation_unit": "t30006.cc" }, "type": "namespace" }, @@ -92,9 +89,9 @@ struct A2 { "name": "B", "source_location": { "column": 11, - "file": "../../tests/t30006/t30006.cc", + "file": "t30006.cc", "line": 4, - "translation_unit": "../../tests/t30006/t30006.cc" + "translation_unit": "t30006.cc" }, "type": "namespace" }, @@ -109,9 +106,9 @@ struct A2 { "name": "A", "source_location": { "column": 11, - "file": "../../tests/t30006/t30006.cc", + "file": "t30006.cc", "line": 9, - "translation_unit": "../../tests/t30006/t30006.cc" + "translation_unit": "t30006.cc" }, "type": "namespace" }, @@ -122,18 +119,13 @@ struct A2 { "name": "C", "source_location": { "column": 11, - "file": "../../tests/t30006/t30006.cc", + "file": "t30006.cc", "line": 15, - "translation_unit": "../../tests/t30006/t30006.cc" + "translation_unit": "t30006.cc" }, "type": "namespace" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t30006_package", "relationships": [ { diff --git a/docs/test_cases/t30006_package.svg b/docs/test_cases/t30006_package.svg index eb128c5e..368b881b 100644 --- a/docs/test_cases/t30006_package.svg +++ b/docs/test_cases/t30006_package.svg @@ -1,6 +1,6 @@ - + @@ -9,25 +9,25 @@ - - + + B - - + + A - - + + C - + Top A note. - + diff --git a/docs/test_cases/t30007.md b/docs/test_cases/t30007.md index e82397f3..93579985 100644 --- a/docs/test_cases/t30007.md +++ b/docs/test_cases/t30007.md @@ -1,18 +1,15 @@ # t30007 - Package diagram layout hints test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t30007_package: type: package glob: - - ../../tests/t30007/t30007.cc + - t30007.cc include: namespaces: - clanguml::t30007 - using_namespace: - - clanguml::t30007 + using_namespace: clanguml::t30007 layout: C: - up: 'A::AA' @@ -75,9 +72,9 @@ struct A2 { "name": "t30007", "source_location": { "column": 11, - "file": "../../tests/t30007/t30007.cc", + "file": "t30007.cc", "line": 2, - "translation_unit": "../../tests/t30007/t30007.cc" + "translation_unit": "t30007.cc" }, "type": "namespace" } @@ -87,9 +84,9 @@ struct A2 { "name": "clanguml", "source_location": { "column": 11, - "file": "../../tests/t30007/t30007.cc", + "file": "t30007.cc", "line": 1, - "translation_unit": "../../tests/t30007/t30007.cc" + "translation_unit": "t30007.cc" }, "type": "namespace" }, @@ -100,9 +97,9 @@ struct A2 { "name": "B", "source_location": { "column": 11, - "file": "../../tests/t30007/t30007.cc", + "file": "t30007.cc", "line": 4, - "translation_unit": "../../tests/t30007/t30007.cc" + "translation_unit": "t30007.cc" }, "type": "namespace" }, @@ -120,9 +117,9 @@ struct A2 { "name": "AA", "source_location": { "column": 11, - "file": "../../tests/t30007/t30007.cc", + "file": "t30007.cc", "line": 10, - "translation_unit": "../../tests/t30007/t30007.cc" + "translation_unit": "t30007.cc" }, "type": "namespace" } @@ -132,9 +129,9 @@ struct A2 { "name": "A", "source_location": { "column": 11, - "file": "../../tests/t30007/t30007.cc", + "file": "t30007.cc", "line": 9, - "translation_unit": "../../tests/t30007/t30007.cc" + "translation_unit": "t30007.cc" }, "type": "namespace" }, @@ -145,18 +142,13 @@ struct A2 { "name": "C", "source_location": { "column": 11, - "file": "../../tests/t30007/t30007.cc", + "file": "t30007.cc", "line": 17, - "translation_unit": "../../tests/t30007/t30007.cc" + "translation_unit": "t30007.cc" }, "type": "namespace" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t30007_package", "relationships": [ { diff --git a/docs/test_cases/t30007_package.svg b/docs/test_cases/t30007_package.svg index 3d186f38..c6698ec1 100644 --- a/docs/test_cases/t30007_package.svg +++ b/docs/test_cases/t30007_package.svg @@ -1,6 +1,6 @@ - + @@ -9,30 +9,30 @@ - - + + A - - + + B - - + + AA - - + + C - + Compare layout with t30006. - + diff --git a/docs/test_cases/t30008.md b/docs/test_cases/t30008.md index c7f3f22e..8d96d838 100644 --- a/docs/test_cases/t30008.md +++ b/docs/test_cases/t30008.md @@ -1,20 +1,17 @@ # t30008 - Dependants and dependencies package diagram filter test ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t30008_package: type: package glob: - - ../../tests/t30008/t30008.cc + - t30008.cc include: dependants: - clanguml::t30008::dependants::A dependencies: - clanguml::t30008::dependencies::F - using_namespace: - - clanguml::t30008 + using_namespace: clanguml::t30008 plantuml: before: - "' t30008 test package diagram" @@ -85,9 +82,9 @@ struct FF { "name": "t30008", "source_location": { "column": 11, - "file": "../../tests/t30008/t30008.cc", + "file": "t30008.cc", "line": 2, - "translation_unit": "../../tests/t30008/t30008.cc" + "translation_unit": "t30008.cc" }, "type": "namespace" } @@ -97,9 +94,9 @@ struct FF { "name": "clanguml", "source_location": { "column": 11, - "file": "../../tests/t30008/t30008.cc", + "file": "t30008.cc", "line": 1, - "translation_unit": "../../tests/t30008/t30008.cc" + "translation_unit": "t30008.cc" }, "type": "namespace" }, @@ -113,9 +110,9 @@ struct FF { "name": "A", "source_location": { "column": 11, - "file": "../../tests/t30008/t30008.cc", + "file": "t30008.cc", "line": 7, - "translation_unit": "../../tests/t30008/t30008.cc" + "translation_unit": "t30008.cc" }, "type": "namespace" }, @@ -126,9 +123,9 @@ struct FF { "name": "B", "source_location": { "column": 11, - "file": "../../tests/t30008/t30008.cc", + "file": "t30008.cc", "line": 10, - "translation_unit": "../../tests/t30008/t30008.cc" + "translation_unit": "t30008.cc" }, "type": "namespace" }, @@ -139,9 +136,9 @@ struct FF { "name": "C", "source_location": { "column": 11, - "file": "../../tests/t30008/t30008.cc", + "file": "t30008.cc", "line": 15, - "translation_unit": "../../tests/t30008/t30008.cc" + "translation_unit": "t30008.cc" }, "type": "namespace" } @@ -151,9 +148,9 @@ struct FF { "name": "dependants", "source_location": { "column": 11, - "file": "../../tests/t30008/t30008.cc", + "file": "t30008.cc", "line": 4, - "translation_unit": "../../tests/t30008/t30008.cc" + "translation_unit": "t30008.cc" }, "type": "namespace" }, @@ -167,9 +164,9 @@ struct FF { "name": "D", "source_location": { "column": 11, - "file": "../../tests/t30008/t30008.cc", + "file": "t30008.cc", "line": 27, - "translation_unit": "../../tests/t30008/t30008.cc" + "translation_unit": "t30008.cc" }, "type": "namespace" }, @@ -180,9 +177,9 @@ struct FF { "name": "E", "source_location": { "column": 11, - "file": "../../tests/t30008/t30008.cc", + "file": "t30008.cc", "line": 30, - "translation_unit": "../../tests/t30008/t30008.cc" + "translation_unit": "t30008.cc" }, "type": "namespace" }, @@ -193,9 +190,9 @@ struct FF { "name": "F", "source_location": { "column": 11, - "file": "../../tests/t30008/t30008.cc", + "file": "t30008.cc", "line": 35, - "translation_unit": "../../tests/t30008/t30008.cc" + "translation_unit": "t30008.cc" }, "type": "namespace" } @@ -205,18 +202,13 @@ struct FF { "name": "dependencies", "source_location": { "column": 11, - "file": "../../tests/t30008/t30008.cc", + "file": "t30008.cc", "line": 23, - "translation_unit": "../../tests/t30008/t30008.cc" + "translation_unit": "t30008.cc" }, "type": "namespace" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t30008_package", "relationships": [ { diff --git a/docs/test_cases/t30008_package.svg b/docs/test_cases/t30008_package.svg index c7d913ca..0bb1e986 100644 --- a/docs/test_cases/t30008_package.svg +++ b/docs/test_cases/t30008_package.svg @@ -1,6 +1,6 @@ - + @@ -9,43 +9,43 @@ - - + + dependants - - + + dependencies - - + + A - - + + B - - + + C - - + + D - - + + E - - + + F diff --git a/docs/test_cases/t30009.md b/docs/test_cases/t30009.md index 0db889b0..f89777c4 100644 --- a/docs/test_cases/t30009.md +++ b/docs/test_cases/t30009.md @@ -1,18 +1,15 @@ # t30009 - Together layout hint test ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t30009_package: type: package glob: - - ../../tests/t30009/t30009.cc + - t30009.cc include: namespaces: - clanguml::t30009 - using_namespace: - - clanguml::t30009 + using_namespace: clanguml::t30009 layout: One::A: - together: [One::C] @@ -65,9 +62,9 @@ namespace D { "name": "t30009", "source_location": { "column": 21, - "file": "../../tests/t30009/t30009.cc", + "file": "t30009.cc", "line": 1, - "translation_unit": "../../tests/t30009/t30009.cc" + "translation_unit": "t30009.cc" }, "type": "namespace" } @@ -77,9 +74,9 @@ namespace D { "name": "clanguml", "source_location": { "column": 11, - "file": "../../tests/t30009/t30009.cc", + "file": "t30009.cc", "line": 1, - "translation_unit": "../../tests/t30009/t30009.cc" + "translation_unit": "t30009.cc" }, "type": "namespace" }, @@ -93,9 +90,9 @@ namespace D { "name": "A", "source_location": { "column": 11, - "file": "../../tests/t30009/t30009.cc", + "file": "t30009.cc", "line": 3, - "translation_unit": "../../tests/t30009/t30009.cc" + "translation_unit": "t30009.cc" }, "type": "namespace" }, @@ -106,9 +103,9 @@ namespace D { "name": "B", "source_location": { "column": 11, - "file": "../../tests/t30009/t30009.cc", + "file": "t30009.cc", "line": 5, - "translation_unit": "../../tests/t30009/t30009.cc" + "translation_unit": "t30009.cc" }, "type": "namespace" }, @@ -119,9 +116,9 @@ namespace D { "name": "C", "source_location": { "column": 11, - "file": "../../tests/t30009/t30009.cc", + "file": "t30009.cc", "line": 7, - "translation_unit": "../../tests/t30009/t30009.cc" + "translation_unit": "t30009.cc" }, "type": "namespace" }, @@ -132,9 +129,9 @@ namespace D { "name": "D", "source_location": { "column": 11, - "file": "../../tests/t30009/t30009.cc", + "file": "t30009.cc", "line": 9, - "translation_unit": "../../tests/t30009/t30009.cc" + "translation_unit": "t30009.cc" }, "type": "namespace" } @@ -144,9 +141,9 @@ namespace D { "name": "One", "source_location": { "column": 11, - "file": "../../tests/t30009/t30009.cc", + "file": "t30009.cc", "line": 2, - "translation_unit": "../../tests/t30009/t30009.cc" + "translation_unit": "t30009.cc" }, "type": "namespace" }, @@ -160,9 +157,9 @@ namespace D { "name": "A", "source_location": { "column": 11, - "file": "../../tests/t30009/t30009.cc", + "file": "t30009.cc", "line": 13, - "translation_unit": "../../tests/t30009/t30009.cc" + "translation_unit": "t30009.cc" }, "type": "namespace" }, @@ -173,9 +170,9 @@ namespace D { "name": "B", "source_location": { "column": 11, - "file": "../../tests/t30009/t30009.cc", + "file": "t30009.cc", "line": 15, - "translation_unit": "../../tests/t30009/t30009.cc" + "translation_unit": "t30009.cc" }, "type": "namespace" }, @@ -186,9 +183,9 @@ namespace D { "name": "C", "source_location": { "column": 11, - "file": "../../tests/t30009/t30009.cc", + "file": "t30009.cc", "line": 17, - "translation_unit": "../../tests/t30009/t30009.cc" + "translation_unit": "t30009.cc" }, "type": "namespace" }, @@ -199,9 +196,9 @@ namespace D { "name": "D", "source_location": { "column": 11, - "file": "../../tests/t30009/t30009.cc", + "file": "t30009.cc", "line": 19, - "translation_unit": "../../tests/t30009/t30009.cc" + "translation_unit": "t30009.cc" }, "type": "namespace" } @@ -211,18 +208,13 @@ namespace D { "name": "Two", "source_location": { "column": 11, - "file": "../../tests/t30009/t30009.cc", + "file": "t30009.cc", "line": 12, - "translation_unit": "../../tests/t30009/t30009.cc" + "translation_unit": "t30009.cc" }, "type": "namespace" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t30009_package", "relationships": [], "using_namespace": "clanguml::t30009" diff --git a/docs/test_cases/t30009_package.svg b/docs/test_cases/t30009_package.svg index 16bd8745..da27fb5c 100644 --- a/docs/test_cases/t30009_package.svg +++ b/docs/test_cases/t30009_package.svg @@ -1,6 +1,6 @@ - + @@ -9,53 +9,53 @@ - - + + One - - + + Two - - + + B - - + + D - - + + A - - + + C - - + + A - - + + B - - + + C - - + + D diff --git a/docs/test_cases/t30010.md b/docs/test_cases/t30010.md index e03977e7..ffb10e57 100644 --- a/docs/test_cases/t30010.md +++ b/docs/test_cases/t30010.md @@ -1,8 +1,6 @@ # t30010 - Package diagram with packages from directory structure ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t30010_package: type: package @@ -10,13 +8,11 @@ diagrams: package_type: directory glob: - t30010.cc - relative_to: ../../../tests/t30010 include: paths: - app - libraries - using_namespace: - - clanguml::t30010 + using_namespace: clanguml::t30010 ``` ## Source code File t30010.cc @@ -51,9 +47,9 @@ App app; "name": "lib1", "source_location": { "column": 8, - "file": "../../clang-uml/tests/t30010/libraries/lib1/lib1.h", + "file": "libraries/lib1/lib1.h", "line": 7, - "translation_unit": "../../clang-uml/tests/t30010/t30010.cc" + "translation_unit": "t30010.cc" }, "type": "namespace" }, @@ -64,9 +60,9 @@ App app; "name": "lib2", "source_location": { "column": 30, - "file": "../../clang-uml/tests/t30010/libraries/lib2/lib2.h", + "file": "libraries/lib2/lib2.h", "line": 7, - "translation_unit": "../../clang-uml/tests/t30010/t30010.cc" + "translation_unit": "t30010.cc" }, "type": "namespace" }, @@ -77,9 +73,9 @@ App app; "name": "lib3", "source_location": { "column": 6, - "file": "../../clang-uml/tests/t30010/libraries/lib3/lib3.h", + "file": "libraries/lib3/lib3.h", "line": 7, - "translation_unit": "../../clang-uml/tests/t30010/t30010.cc" + "translation_unit": "t30010.cc" }, "type": "namespace" }, @@ -90,9 +86,9 @@ App app; "name": "lib4", "source_location": { "column": 8, - "file": "../../clang-uml/tests/t30010/libraries/lib4/lib4.h", + "file": "libraries/lib4/lib4.h", "line": 7, - "translation_unit": "../../clang-uml/tests/t30010/t30010.cc" + "translation_unit": "t30010.cc" }, "type": "namespace" } @@ -109,18 +105,13 @@ App app; "name": "app", "source_location": { "column": 8, - "file": "../../clang-uml/tests/t30010/app/app.h", + "file": "app/app.h", "line": 11, - "translation_unit": "../../clang-uml/tests/t30010/t30010.cc" + "translation_unit": "t30010.cc" }, "type": "namespace" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t30010_package", "relationships": [ { diff --git a/docs/test_cases/t30010_package.svg b/docs/test_cases/t30010_package.svg index 90163556..5fa2651b 100644 --- a/docs/test_cases/t30010_package.svg +++ b/docs/test_cases/t30010_package.svg @@ -1,6 +1,6 @@ - + @@ -9,31 +9,31 @@ - + libraries - - + + lib1 - - + + lib2 - - + + lib3 - - + + lib4 - - + + app diff --git a/docs/test_cases/t30011.md b/docs/test_cases/t30011.md index aaf7f6a0..eb7e87f0 100644 --- a/docs/test_cases/t30011.md +++ b/docs/test_cases/t30011.md @@ -1,15 +1,12 @@ # t30011 - Package diagram with packages from directory structure for plain C ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t30011_package: type: package package_type: directory glob: - t30011.c - relative_to: ../../../tests/t30011 include: paths: - . @@ -41,9 +38,9 @@ struct t30011_App app; "name": "lib1", "source_location": { "column": 8, - "file": "../../clang-uml/tests/t30011/libraries/lib1/lib1.h", + "file": "libraries/lib1/lib1.h", "line": 3, - "translation_unit": "../../clang-uml/tests/t30011/t30011.c" + "translation_unit": "t30011.c" }, "type": "namespace" }, @@ -54,9 +51,9 @@ struct t30011_App app; "name": "lib2", "source_location": { "column": 8, - "file": "../../clang-uml/tests/t30011/libraries/lib2/lib2.h", + "file": "libraries/lib2/lib2.h", "line": 3, - "translation_unit": "../../clang-uml/tests/t30011/t30011.c" + "translation_unit": "t30011.c" }, "type": "namespace" }, @@ -67,9 +64,9 @@ struct t30011_App app; "name": "lib3", "source_location": { "column": 6, - "file": "../../clang-uml/tests/t30011/libraries/lib3/lib3.h", + "file": "libraries/lib3/lib3.h", "line": 3, - "translation_unit": "../../clang-uml/tests/t30011/t30011.c" + "translation_unit": "t30011.c" }, "type": "namespace" }, @@ -80,9 +77,9 @@ struct t30011_App app; "name": "lib4", "source_location": { "column": 8, - "file": "../../clang-uml/tests/t30011/libraries/lib4/lib4.h", + "file": "libraries/lib4/lib4.h", "line": 3, - "translation_unit": "../../clang-uml/tests/t30011/t30011.c" + "translation_unit": "t30011.c" }, "type": "namespace" } @@ -99,18 +96,13 @@ struct t30011_App app; "name": "app", "source_location": { "column": 8, - "file": "../../clang-uml/tests/t30011/app/app.h", + "file": "app/app.h", "line": 8, - "translation_unit": "../../clang-uml/tests/t30011/t30011.c" + "translation_unit": "t30011.c" }, "type": "namespace" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t30011_package", "relationships": [ { diff --git a/docs/test_cases/t30011_package.svg b/docs/test_cases/t30011_package.svg index 38354677..cc03aae3 100644 --- a/docs/test_cases/t30011_package.svg +++ b/docs/test_cases/t30011_package.svg @@ -1,6 +1,6 @@ - + @@ -9,31 +9,31 @@ - + libraries - - + + lib1 - - + + lib2 - - + + lib3 - - + + lib4 - - + + app diff --git a/docs/test_cases/t40001.md b/docs/test_cases/t40001.md index 538b5619..c26034af 100644 --- a/docs/test_cases/t40001.md +++ b/docs/test_cases/t40001.md @@ -1,8 +1,6 @@ # t40001 - Basic include graph diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t40001_include: type: include @@ -10,9 +8,7 @@ diagrams: # Provide the files to parse in order to look # for #include directives glob: - - ../../tests/t40001/src/t40001.cc - # Render the paths relative to this directory - relative_to: ../../../tests/t40001 + - src/t40001.cc # Include also external system headers generate_system_headers: true include: @@ -109,11 +105,6 @@ diagrams: "type": "file" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t40001_include", "relationships": [ { diff --git a/docs/test_cases/t40001_include.svg b/docs/test_cases/t40001_include.svg index 51202869..fbd4168b 100644 --- a/docs/test_cases/t40001_include.svg +++ b/docs/test_cases/t40001_include.svg @@ -1,6 +1,6 @@ - + @@ -10,43 +10,43 @@ 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 @@ -61,7 +61,7 @@ - - + + diff --git a/docs/test_cases/t40001_include_mermaid.svg b/docs/test_cases/t40001_include_mermaid.svg index d8c9b675..ef79cc7e 100644 --- a/docs/test_cases/t40001_include_mermaid.svg +++ b/docs/test_cases/t40001_include_mermaid.svg @@ -138,7 +138,7 @@ - + @@ -151,7 +151,7 @@ - + @@ -164,7 +164,7 @@ - + diff --git a/docs/test_cases/t40002.md b/docs/test_cases/t40002.md index 0d679303..567dd5e9 100644 --- a/docs/test_cases/t40002.md +++ b/docs/test_cases/t40002.md @@ -1,19 +1,15 @@ # t40002 - Cyclic include graph diagram test case ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t40002_include: type: include # Provide the files to parse in order to look # for #include directives glob: - - ../../tests/t40002/src/t40002.cc - - ../../tests/t40002/src/lib1/lib1.cc - - ../../tests/t40002/src/lib2/lib2.cc - # Render the paths relative to this directory - relative_to: ../../../tests/t40002 + - src/t40002.cc + - src/lib1/lib1.cc + - src/lib2/lib2.cc include: # Include only files belonging to these paths relative to relative_to paths: @@ -120,11 +116,6 @@ diagrams: "type": "folder" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t40002_include", "relationships": [ { diff --git a/docs/test_cases/t40002_include.svg b/docs/test_cases/t40002_include.svg index cdf32ead..64fa9f17 100644 --- a/docs/test_cases/t40002_include.svg +++ b/docs/test_cases/t40002_include.svg @@ -1,6 +1,6 @@ - + @@ -9,46 +9,46 @@ - + 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 308233b1..bc57828c 100644 --- a/docs/test_cases/t40002_include_mermaid.svg +++ b/docs/test_cases/t40002_include_mermaid.svg @@ -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 3a284ad3..7ec6847c 100644 --- a/docs/test_cases/t40003.md +++ b/docs/test_cases/t40003.md @@ -1,18 +1,15 @@ # t40003 - Dependants and dependencies include diagram filter test ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t40003_include: type: include # Provide the files to parse in order to look # for #include directives glob: - - ../../tests/t40003/src/dependants/t1.cc - - ../../tests/t40003/src/dependencies/t2.cc + - src/dependants/t1.cc + - src/dependencies/t2.cc # Render the paths relative to this directory - relative_to: ../../../tests/t40003 include: # Include only files which depend on t1.h dependants: @@ -146,11 +143,6 @@ diagrams: "type": "folder" } ], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t40003_include", "relationships": [ { diff --git a/docs/test_cases/t40003_include.svg b/docs/test_cases/t40003_include.svg index 6ef3fc34..ea2b3030 100644 --- a/docs/test_cases/t40003_include.svg +++ b/docs/test_cases/t40003_include.svg @@ -1,6 +1,6 @@ - + @@ -9,66 +9,66 @@ - + 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 b5ad562d..8f910757 100644 --- a/docs/test_cases/t40003_include_mermaid.svg +++ b/docs/test_cases/t40003_include_mermaid.svg @@ -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 35b75a04..bb678889 100644 --- a/docs/test_cases/t90000.md +++ b/docs/test_cases/t90000.md @@ -1,8 +1,6 @@ # t90000 - Basic config test ## Config ```yaml -compilation_database_dir: .. -output_directory: diagrams diagrams: t90000_class: type: class @@ -49,11 +47,6 @@ File t90000.cc { "diagram_type": "class", "elements": [], - "metadata": { - "clang_uml_version": "0.4.1-11-g39d3e1f", - "llvm_version": "Ubuntu clang version 16.0.6 (++20230710042027+7cbf1a259152-1~exp1~20230710162048.105)", - "schema_version": 1 - }, "name": "t90000_class", "relationships": [] } diff --git a/docs/test_cases/t90000_class.svg b/docs/test_cases/t90000_class.svg index 1ce9370e..64b6d962 100644 --- a/docs/test_cases/t90000_class.svg +++ b/docs/test_cases/t90000_class.svg @@ -1,6 +1,6 @@ - + @@ -9,7 +9,7 @@ - + Foo @@ -17,24 +17,24 @@ int value - + ArrayList - + This is a very important class. - + This is a floating note - + This note is connected to several objects. - + Boo