diff --git a/docs/test_cases.md b/docs/test_cases.md index 08b1e655..337c40d0 100644 --- a/docs/test_cases.md +++ b/docs/test_cases.md @@ -80,6 +80,10 @@ * [t00073](./test_cases/t00073.md) - Class diagram for template overload pattern * [t00074](./test_cases/t00074.md) - Test case for rendering concepts without requirements * [t00075](./test_cases/t00075.md) - Test case for class diagram styles in config file + * [t00076](./test_cases/t00076.md) - Test case for context diagram with inward direction flag + * [t00077](./test_cases/t00077.md) - Test case for context diagram with outward direction flag + * [t00078](./test_cases/t00078.md) - Test case for context diagram with relationships option + * [t00079](./test_cases/t00079.md) - Test case for context diagram exclude filter with relationships option ## Sequence diagrams * [t20001](./test_cases/t20001.md) - Basic sequence diagram test case * [t20002](./test_cases/t20002.md) - Free function sequence diagram test case @@ -134,6 +138,7 @@ * [t20051](./test_cases/t20051.md) - Test case for CUDA calls callee_type filter * [t20052](./test_cases/t20052.md) - Test case for inlining lambda operator calls * [t20053](./test_cases/t20053.md) - Test case for inlining nested lambda operator calls + * [t20054](./test_cases/t20054.md) - Test case for sequence diagram with nested classes ## Package diagrams * [t30001](./test_cases/t30001.md) - Basic package diagram test case * [t30002](./test_cases/t30002.md) - Package dependency test case diff --git a/docs/test_cases/t00002.md b/docs/test_cases/t00002.md index dfad9b8e..be6d5333 100644 --- a/docs/test_cases/t00002.md +++ b/docs/test_cases/t00002.md @@ -140,7 +140,7 @@ private: "text": "\n \n" }, "display_name": "A", - "id": "987634239855407298", + "id": "7901073918843258388", "is_abstract": true, "is_nested": false, "is_struct": false, @@ -236,7 +236,7 @@ private: "bases": [ { "access": "public", - "id": "987634239855407298", + "id": "7901073918843258388", "is_virtual": false, "name": "clanguml::t00002::A" } @@ -253,7 +253,7 @@ private: "text": "\n \n" }, "display_name": "B", - "id": "594234458687375950", + "id": "4753875669499007606", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -305,7 +305,7 @@ private: "bases": [ { "access": "public", - "id": "987634239855407298", + "id": "7901073918843258388", "is_virtual": false, "name": "clanguml::t00002::A" } @@ -323,7 +323,7 @@ private: "text": "\n \n\n Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,\n euismod libero facilisi aptent elementum felis blandit cursus gravida sociis\n erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est\n ad.\n" }, "display_name": "C", - "id": "1142499429598587507", + "id": "9139995436788700062", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -383,13 +383,13 @@ private: "bases": [ { "access": "public", - "id": "594234458687375950", + "id": "4753875669499007606", "is_virtual": false, "name": "clanguml::t00002::B" }, { "access": "public", - "id": "1142499429598587507", + "id": "9139995436788700062", "is_virtual": false, "name": "clanguml::t00002::C" } @@ -403,7 +403,7 @@ private: "text": "\n This is class D\n which is a little like B\n and a little like C\n" }, "display_name": "D", - "id": "60950494980414724", + "id": "487603959843317797", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -520,19 +520,19 @@ private: "bases": [ { "access": "public", - "id": "594234458687375950", + "id": "4753875669499007606", "is_virtual": true, "name": "clanguml::t00002::B" }, { "access": "public", - "id": "1142499429598587507", + "id": "9139995436788700062", "is_virtual": true, "name": "clanguml::t00002::C" } ], "display_name": "E", - "id": "2237886670308966220", + "id": "17903093362471729766", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -651,52 +651,52 @@ private: "relationships": [ { "access": "public", - "destination": "987634239855407298", - "source": "594234458687375950", + "destination": "7901073918843258388", + "source": "4753875669499007606", "type": "extension" }, { "access": "public", - "destination": "987634239855407298", - "source": "1142499429598587507", + "destination": "7901073918843258388", + "source": "9139995436788700062", "type": "extension" }, { "access": "private", - "destination": "987634239855407298", + "destination": "7901073918843258388", "label": "as", - "source": "60950494980414724", + "source": "487603959843317797", "type": "association" }, { "access": "public", - "destination": "594234458687375950", - "source": "60950494980414724", + "destination": "4753875669499007606", + "source": "487603959843317797", "type": "extension" }, { "access": "public", - "destination": "1142499429598587507", - "source": "60950494980414724", + "destination": "9139995436788700062", + "source": "487603959843317797", "type": "extension" }, { "access": "private", - "destination": "987634239855407298", + "destination": "7901073918843258388", "label": "as", - "source": "2237886670308966220", + "source": "17903093362471729766", "type": "association" }, { "access": "public", - "destination": "594234458687375950", - "source": "2237886670308966220", + "destination": "4753875669499007606", + "source": "17903093362471729766", "type": "extension" }, { "access": "public", - "destination": "1142499429598587507", - "source": "2237886670308966220", + "destination": "9139995436788700062", + "source": "17903093362471729766", "type": "extension" } ], diff --git a/docs/test_cases/t00002_class.svg b/docs/test_cases/t00002_class.svg index d5ca305a..ff2fe6f0 100644 --- a/docs/test_cases/t00002_class.svg +++ b/docs/test_cases/t00002_class.svg @@ -1,6 +1,6 @@ - + @@ -10,148 +10,148 @@ 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 which is a little like B and a little like C - + - + - + as - + - + - + as - + - + diff --git a/docs/test_cases/t00002_class_mermaid.svg b/docs/test_cases/t00002_class_mermaid.svg index 071b3e85..cf6f8393 100644 --- a/docs/test_cases/t00002_class_mermaid.svg +++ b/docs/test_cases/t00002_class_mermaid.svg @@ -169,8 +169,8 @@ - - + + @@ -198,8 +198,8 @@ - - + + @@ -222,8 +222,8 @@ - - + + @@ -246,8 +246,8 @@ - - + + @@ -280,8 +280,8 @@ - - + + diff --git a/docs/test_cases/t00003.md b/docs/test_cases/t00003.md index 7bcc4ba5..dc825e2e 100644 --- a/docs/test_cases/t00003.md +++ b/docs/test_cases/t00003.md @@ -104,7 +104,7 @@ int A::static_int = 1; { "bases": [], "display_name": "A", - "id": "1371951663534295727", + "id": "10975613308274365816", "is_abstract": false, "is_nested": false, "is_struct": false, diff --git a/docs/test_cases/t00003_class.svg b/docs/test_cases/t00003_class.svg index 44096fb7..e9a84bc3 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 a16db618..ae29925e 100644 --- a/docs/test_cases/t00003_class_mermaid.svg +++ b/docs/test_cases/t00003_class_mermaid.svg @@ -52,8 +52,8 @@ - - + + diff --git a/docs/test_cases/t00004.md b/docs/test_cases/t00004.md index 8ab87c4a..d63461e7 100644 --- a/docs/test_cases/t00004.md +++ b/docs/test_cases/t00004.md @@ -92,7 +92,7 @@ public: "Blue" ], "display_name": "Color", - "id": "1105524423720352599", + "id": "8844195389762820798", "is_nested": false, "name": "Color", "namespace": "clanguml::t00004", @@ -107,7 +107,7 @@ public: { "bases": [], "display_name": "B", - "id": "1232624428734051711", + "id": "9860995429872413691", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -158,7 +158,7 @@ public: "AA_3" ], "display_name": "B::AA", - "id": "1630205507215126623", + "id": "13041644057721012989", "is_nested": true, "name": "B::AA", "namespace": "clanguml::t00004", @@ -173,7 +173,7 @@ public: { "bases": [], "display_name": "A", - "id": "1552274940876611774", + "id": "12418199527012894198", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -252,7 +252,7 @@ public: { "bases": [], "display_name": "A::AA", - "id": "1742499843727859552", + "id": "13939998749822876416", "is_abstract": false, "is_nested": true, "is_struct": false, @@ -278,7 +278,7 @@ public: "Red" ], "display_name": "A::AA::Lights", - "id": "590936874508841244", + "id": "4727494996070729955", "is_nested": true, "name": "A::AA::Lights", "namespace": "clanguml::t00004", @@ -293,7 +293,7 @@ public: { "bases": [], "display_name": "A::AA::AAA", - "id": "1430186633004282131", + "id": "11441493064034257052", "is_abstract": false, "is_nested": true, "is_struct": false, @@ -328,7 +328,7 @@ public: { "bases": [], "display_name": "C::B", - "id": "287819369330075965", + "id": "2302554954640607720", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -357,7 +357,7 @@ public: { "bases": [], "display_name": "C", - "id": "2278328177727440136", + "id": "18226625421819521092", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -411,7 +411,7 @@ public: { "bases": [], "display_name": "C::AA", - "id": "623940132897927654", + "id": "4991521063183421232", "is_abstract": false, "is_nested": true, "is_struct": false, @@ -433,7 +433,7 @@ public: { "bases": [], "display_name": "C::AA::AAA", - "id": "1597801087286500866", + "id": "12782408698292006929", "is_abstract": false, "is_nested": true, "is_struct": false, @@ -458,7 +458,7 @@ public: "CCC_2" ], "display_name": "C::AA::CCC", - "id": "81819202639599734", + "id": "654553621116797875", "is_nested": true, "name": "C::AA::CCC", "namespace": "clanguml::t00004", @@ -473,7 +473,7 @@ public: { "bases": [], "display_name": "C::B", - "id": "1381298335849583950", + "id": "11050386686796671606", "is_abstract": false, "is_nested": true, "is_struct": false, @@ -518,7 +518,7 @@ public: "CC_2" ], "display_name": "C::CC", - "id": "2037378936100378699", + "id": "16299031488803029599", "is_nested": true, "name": "C::CC", "namespace": "clanguml::t00004", @@ -533,7 +533,7 @@ public: { "bases": [], "display_name": "detail::D", - "id": "612133170877135796", + "id": "4897065367017086369", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -559,7 +559,7 @@ public: "AA_3" ], "display_name": "detail::D::AA", - "id": "1572080057917630922", + "id": "12576640463341047379", "is_nested": true, "name": "D::AA", "namespace": "clanguml::t00004::detail", @@ -574,7 +574,7 @@ public: { "bases": [], "display_name": "detail::D::DD", - "id": "600916232677555492", + "id": "4807329861420443943", "is_abstract": false, "is_nested": true, "is_struct": false, @@ -599,102 +599,102 @@ public: "relationships": [ { "access": "public", - "destination": "1630205507215126623", + "destination": "13041644057721012989", "label": "aa", - "source": "1232624428734051711", + "source": "9860995429872413691", "type": "aggregation" }, { "access": "public", - "destination": "1105524423720352599", + "destination": "8844195389762820798", "label": "color", - "source": "1232624428734051711", + "source": "9860995429872413691", "type": "association" }, { "access": "public", - "destination": "1232624428734051711", - "source": "1630205507215126623", + "destination": "9860995429872413691", + "source": "13041644057721012989", "type": "containment" }, { "access": "public", - "destination": "1552274940876611774", - "source": "1742499843727859552", + "destination": "12418199527012894198", + "source": "13939998749822876416", "type": "containment" }, { "access": "public", - "destination": "1742499843727859552", - "source": "590936874508841244", + "destination": "13939998749822876416", + "source": "4727494996070729955", "type": "containment" }, { "access": "public", - "destination": "1742499843727859552", - "source": "1430186633004282131", + "destination": "13939998749822876416", + "source": "11441493064034257052", "type": "containment" }, { "access": "private", - "destination": "590936874508841244", + "destination": "4727494996070729955", "label": "lights", - "source": "1430186633004282131", + "source": "11441493064034257052", "type": "aggregation" }, { "access": "public", - "destination": "1381298335849583950", - "source": "287819369330075965", + "destination": "11050386686796671606", + "source": "2302554954640607720", "type": "instantiation" }, { "access": "public", - "destination": "287819369330075965", + "destination": "2302554954640607720", "label": "b_int", - "source": "2278328177727440136", + "source": "18226625421819521092", "type": "aggregation" }, { "access": "public", - "destination": "2278328177727440136", - "source": "623940132897927654", + "destination": "18226625421819521092", + "source": "4991521063183421232", "type": "containment" }, { "access": "public", - "destination": "623940132897927654", - "source": "1597801087286500866", + "destination": "4991521063183421232", + "source": "12782408698292006929", "type": "containment" }, { "access": "public", - "destination": "623940132897927654", - "source": "81819202639599734", + "destination": "4991521063183421232", + "source": "654553621116797875", "type": "containment" }, { "access": "public", - "destination": "2278328177727440136", - "source": "1381298335849583950", + "destination": "18226625421819521092", + "source": "11050386686796671606", "type": "containment" }, { "access": "public", - "destination": "2278328177727440136", - "source": "2037378936100378699", + "destination": "18226625421819521092", + "source": "16299031488803029599", "type": "containment" }, { "access": "public", - "destination": "612133170877135796", - "source": "1572080057917630922", + "destination": "4897065367017086369", + "source": "12576640463341047379", "type": "containment" }, { "access": "public", - "destination": "612133170877135796", - "source": "600916232677555492", + "destination": "4897065367017086369", + "source": "4807329861420443943", "type": "containment" } ], diff --git a/docs/test_cases/t00004_class.svg b/docs/test_cases/t00004_class.svg index cd3e34e3..3334275d 100644 --- a/docs/test_cases/t00004_class.svg +++ b/docs/test_cases/t00004_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + Color @@ -20,30 +20,30 @@ Blue - - + + B - + - + aa : AA - + - + color : Color * - - + + B::AA @@ -53,38 +53,38 @@ AA_3 - - + + A - + - + foo() const : void - + - + foo2() const : void - - + + A::AA - - + + A::AA::Lights @@ -94,23 +94,23 @@ Red - - + + A::AA::AAA - + - + lights : Lights - - + + C::B @@ -119,8 +119,8 @@ - - + + C @@ -129,38 +129,38 @@ - + - + b_int : B<int> - + - + t : T - - + + C::AA - - + + C::AA::AAA - - + + C::AA::CCC @@ -169,8 +169,8 @@ CCC_2 - - + + C::B @@ -179,15 +179,15 @@ - + - + b : V - - + + C::CC @@ -196,16 +196,16 @@ CC_2 - - + + detail::D - - + + detail::D::AA @@ -215,73 +215,73 @@ AA_3 - - + + detail::D::DD - + aa - + - + color - + - + - + - + lights - + - + b_int - + - + - + - + - + - + - + diff --git a/docs/test_cases/t00004_class_mermaid.svg b/docs/test_cases/t00004_class_mermaid.svg index 2725480b..dd860a8e 100644 --- a/docs/test_cases/t00004_class_mermaid.svg +++ b/docs/test_cases/t00004_class_mermaid.svg @@ -246,8 +246,8 @@ - - + + @@ -280,8 +280,8 @@ - - + + @@ -309,8 +309,8 @@ - - + + @@ -343,8 +343,8 @@ - - + + @@ -372,8 +372,8 @@ - - + + @@ -391,8 +391,8 @@ - - + + @@ -425,8 +425,8 @@ - - + + @@ -449,8 +449,8 @@ - - + + @@ -468,8 +468,8 @@ - - + + @@ -497,8 +497,8 @@ - - + + @@ -516,8 +516,8 @@ - - + + @@ -535,8 +535,8 @@ - - + + @@ -564,8 +564,8 @@ - - + + @@ -588,8 +588,8 @@ - - + + @@ -617,8 +617,8 @@ - - + + @@ -636,8 +636,8 @@ - - + + @@ -670,8 +670,8 @@ - - + + diff --git a/docs/test_cases/t00005.md b/docs/test_cases/t00005.md index 398e3f3a..3b37054f 100644 --- a/docs/test_cases/t00005.md +++ b/docs/test_cases/t00005.md @@ -73,7 +73,7 @@ public: { "bases": [], "display_name": "A", - "id": "96355893895780319", + "id": "770847151166242555", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -95,7 +95,7 @@ public: { "bases": [], "display_name": "B", - "id": "1909425857334087541", + "id": "15275406858672700331", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -117,7 +117,7 @@ public: { "bases": [], "display_name": "C", - "id": "968176384460064907", + "id": "7745411075680519262", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -139,7 +139,7 @@ public: { "bases": [], "display_name": "D", - "id": "1735599590836186693", + "id": "13884796726689493544", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -161,7 +161,7 @@ public: { "bases": [], "display_name": "E", - "id": "887960136921844658", + "id": "7103681095374757269", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -183,7 +183,7 @@ public: { "bases": [], "display_name": "F", - "id": "772719357856231772", + "id": "6181754862849854182", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -205,7 +205,7 @@ public: { "bases": [], "display_name": "G", - "id": "979147885884736437", + "id": "7833183087077891503", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -227,7 +227,7 @@ public: { "bases": [], "display_name": "H", - "id": "1440673301054236675", + "id": "11525386408433893405", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -249,7 +249,7 @@ public: { "bases": [], "display_name": "I", - "id": "109681731550086430", + "id": "877453852400691446", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -271,7 +271,7 @@ public: { "bases": [], "display_name": "J", - "id": "338330011969650325", + "id": "2706640095757202600", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -293,7 +293,7 @@ public: { "bases": [], "display_name": "K", - "id": "2179119389830432509", + "id": "17432955118643460073", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -315,7 +315,7 @@ public: { "bases": [], "display_name": "R", - "id": "630692407373144211", + "id": "5045539258985153690", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -521,79 +521,79 @@ public: "relationships": [ { "access": "public", - "destination": "96355893895780319", + "destination": "770847151166242555", "label": "a", - "source": "630692407373144211", + "source": "5045539258985153690", "type": "aggregation" }, { "access": "public", - "destination": "1909425857334087541", + "destination": "15275406858672700331", "label": "b", - "source": "630692407373144211", + "source": "5045539258985153690", "type": "association" }, { "access": "public", - "destination": "968176384460064907", + "destination": "7745411075680519262", "label": "c", - "source": "630692407373144211", + "source": "5045539258985153690", "type": "association" }, { "access": "public", - "destination": "1735599590836186693", + "destination": "13884796726689493544", "label": "d", - "source": "630692407373144211", + "source": "5045539258985153690", "type": "association" }, { "access": "public", - "destination": "887960136921844658", + "destination": "7103681095374757269", "label": "e", - "source": "630692407373144211", + "source": "5045539258985153690", "type": "association" }, { "access": "public", - "destination": "772719357856231772", + "destination": "6181754862849854182", "label": "f", - "source": "630692407373144211", + "source": "5045539258985153690", "type": "aggregation" }, { "access": "public", - "destination": "979147885884736437", + "destination": "7833183087077891503", "label": "g", - "source": "630692407373144211", + "source": "5045539258985153690", "type": "association" }, { "access": "public", - "destination": "1440673301054236675", + "destination": "11525386408433893405", "label": "h", - "source": "630692407373144211", + "source": "5045539258985153690", "type": "association" }, { "access": "public", - "destination": "109681731550086430", + "destination": "877453852400691446", "label": "i", - "source": "630692407373144211", + "source": "5045539258985153690", "type": "association" }, { "access": "public", - "destination": "338330011969650325", + "destination": "2706640095757202600", "label": "j", - "source": "630692407373144211", + "source": "5045539258985153690", "type": "association" }, { "access": "public", - "destination": "2179119389830432509", + "destination": "17432955118643460073", "label": "k", - "source": "630692407373144211", + "source": "5045539258985153690", "type": "association" } ], diff --git a/docs/test_cases/t00005_class.svg b/docs/test_cases/t00005_class.svg index 0f2678ec..e46b6a26 100644 --- a/docs/test_cases/t00005_class.svg +++ b/docs/test_cases/t00005_class.svg @@ -1,6 +1,6 @@ - + @@ -9,238 +9,238 @@ - - + + 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 & - + +a - + +b - + +c - + +d - + +e - + +f - + +g - + +h - + +i - + +j - + +k diff --git a/docs/test_cases/t00005_class_mermaid.svg b/docs/test_cases/t00005_class_mermaid.svg index 5cb781c9..ca463cd9 100644 --- a/docs/test_cases/t00005_class_mermaid.svg +++ b/docs/test_cases/t00005_class_mermaid.svg @@ -186,8 +186,8 @@ - - + + @@ -205,8 +205,8 @@ - - + + @@ -224,8 +224,8 @@ - - + + @@ -243,8 +243,8 @@ - - + + @@ -262,8 +262,8 @@ - - + + @@ -281,8 +281,8 @@ - - + + @@ -300,8 +300,8 @@ - - + + @@ -319,8 +319,8 @@ - - + + @@ -338,8 +338,8 @@ - - + + @@ -357,8 +357,8 @@ - - + + @@ -376,8 +376,8 @@ - - + + @@ -395,8 +395,8 @@ - - + + diff --git a/docs/test_cases/t00006.md b/docs/test_cases/t00006.md index ff3fe2cf..8650a1a1 100644 --- a/docs/test_cases/t00006.md +++ b/docs/test_cases/t00006.md @@ -97,7 +97,7 @@ public: { "bases": [], "display_name": "A", - "id": "989095304444672400", + "id": "7912762435557379205", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -119,7 +119,7 @@ public: { "bases": [], "display_name": "B", - "id": "648285260245005311", + "id": "5186282081960042491", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -141,7 +141,7 @@ public: { "bases": [], "display_name": "C", - "id": "323304333007297774", + "id": "2586434664058382197", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -163,7 +163,7 @@ public: { "bases": [], "display_name": "D", - "id": "1006912399043633492", + "id": "8055299192349067940", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -185,7 +185,7 @@ public: { "bases": [], "display_name": "E", - "id": "1092550394020578978", + "id": "8740403152164631827", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -207,7 +207,7 @@ public: { "bases": [], "display_name": "F", - "id": "965398761810782236", + "id": "7723190094486257891", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -229,7 +229,7 @@ public: { "bases": [], "display_name": "G", - "id": "1764732000887030464", + "id": "14117856007096243716", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -251,7 +251,7 @@ public: { "bases": [], "display_name": "H", - "id": "1669285599837552146", + "id": "13354284798700417170", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -273,7 +273,7 @@ public: { "bases": [], "display_name": "I", - "id": "2234750598599000377", + "id": "17878004788792003021", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -295,7 +295,7 @@ public: { "bases": [], "display_name": "J", - "id": "1335933649375465369", + "id": "10687469195003722956", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -317,7 +317,7 @@ public: { "bases": [], "display_name": "K", - "id": "1603190364864080123", + "id": "12825522918912640984", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -339,7 +339,7 @@ public: { "bases": [], "display_name": "L", - "id": "305487238408320046", + "id": "2443897907266560370", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -361,7 +361,7 @@ public: { "bases": [], "display_name": "M", - "id": "1664744512423723275", + "id": "13317956099389786204", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -383,7 +383,7 @@ public: { "bases": [], "display_name": "N", - "id": "950210019792152600", + "id": "7601680158337220805", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -405,7 +405,7 @@ public: { "bases": [], "display_name": "NN", - "id": "1662349735899726224", + "id": "13298797887197809793", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -427,7 +427,7 @@ public: { "bases": [], "display_name": "NNN", - "id": "1963145075481599858", + "id": "15705160603852798870", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -449,7 +449,7 @@ public: { "bases": [], "display_name": "custom_container", - "id": "916380191954937631", + "id": "7331041535639501055", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -491,7 +491,7 @@ public: { "bases": [], "display_name": "custom_container", - "id": "50153113082434858", + "id": "401224904659478871", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -520,7 +520,7 @@ public: { "bases": [], "display_name": "R", - "id": "303025561016882526", + "id": "2424204488135060211", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -702,128 +702,128 @@ public: "relationships": [ { "access": "public", - "destination": "1092550394020578978", - "source": "50153113082434858", + "destination": "8740403152164631827", + "source": "401224904659478871", "type": "dependency" }, { "access": "public", - "destination": "916380191954937631", - "source": "50153113082434858", + "destination": "7331041535639501055", + "source": "401224904659478871", "type": "instantiation" }, { "access": "public", - "destination": "989095304444672400", + "destination": "7912762435557379205", "label": "a", - "source": "303025561016882526", + "source": "2424204488135060211", "type": "aggregation" }, { "access": "public", - "destination": "648285260245005311", + "destination": "5186282081960042491", "label": "b", - "source": "303025561016882526", + "source": "2424204488135060211", "type": "association" }, { "access": "public", - "destination": "323304333007297774", + "destination": "2586434664058382197", "label": "c", - "source": "303025561016882526", + "source": "2424204488135060211", "type": "aggregation" }, { "access": "public", - "destination": "1006912399043633492", + "destination": "8055299192349067940", "label": "d", - "source": "303025561016882526", + "source": "2424204488135060211", "type": "association" }, { "access": "public", - "destination": "50153113082434858", + "destination": "401224904659478871", "label": "e", - "source": "303025561016882526", + "source": "2424204488135060211", "type": "aggregation" }, { "access": "public", - "destination": "965398761810782236", + "destination": "7723190094486257891", "label": "f", - "source": "303025561016882526", + "source": "2424204488135060211", "type": "aggregation" }, { "access": "public", - "destination": "1764732000887030464", + "destination": "14117856007096243716", "label": "g", - "source": "303025561016882526", + "source": "2424204488135060211", "type": "association" }, { "access": "public", - "destination": "1669285599837552146", + "destination": "13354284798700417170", "label": "h", - "source": "303025561016882526", + "source": "2424204488135060211", "type": "aggregation" }, { "access": "public", - "destination": "2234750598599000377", + "destination": "17878004788792003021", "label": "i", - "source": "303025561016882526", + "source": "2424204488135060211", "type": "association" }, { "access": "public", - "destination": "1335933649375465369", + "destination": "10687469195003722956", "label": "j", "multiplicity_destination": "10", - "source": "303025561016882526", + "source": "2424204488135060211", "type": "aggregation" }, { "access": "public", - "destination": "1603190364864080123", + "destination": "12825522918912640984", "label": "k", "multiplicity_destination": "20", - "source": "303025561016882526", + "source": "2424204488135060211", "type": "association" }, { "access": "public", - "destination": "305487238408320046", + "destination": "2443897907266560370", "label": "lm", - "source": "303025561016882526", + "source": "2424204488135060211", "type": "aggregation" }, { "access": "public", - "destination": "1664744512423723275", + "destination": "13317956099389786204", "label": "lm", - "source": "303025561016882526", + "source": "2424204488135060211", "type": "aggregation" }, { "access": "public", - "destination": "950210019792152600", + "destination": "7601680158337220805", "label": "ns", - "source": "303025561016882526", + "source": "2424204488135060211", "type": "aggregation" }, { "access": "public", - "destination": "1662349735899726224", + "destination": "13298797887197809793", "label": "ns", - "source": "303025561016882526", + "source": "2424204488135060211", "type": "aggregation" }, { "access": "public", - "destination": "1963145075481599858", + "destination": "15705160603852798870", "label": "ns", - "source": "303025561016882526", + "source": "2424204488135060211", "type": "aggregation" } ], diff --git a/docs/test_cases/t00006_class.svg b/docs/test_cases/t00006_class.svg index 89926556..83e50ec0 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,161 +164,161 @@ - - + + R - + - + a : std::vector<A> - + - + b : std::vector<B *> - + - + c : std::map<int,C> - + - + d : std::map<int,D *> - + - + e : custom_container<E> - + - + f : std::vector<std::vector<F>> - + - + g : std::map<int,std::vector<G *>> - + - + h : std::array<H,10> - + - + i : std::array<I *,5> - + - + j : J[10] - + - + k : K *[20] - + - + lm : std::vector<std::pair<L,M>> - + - + ns : std::tuple<N,NN,NNN> - + - + - + +a - + +b - + +c - + +d - + +e - + +f - + +g - + +h - + +i - + +j 10 - + +k 20 - + lm - + lm - + ns - + ns - + ns diff --git a/docs/test_cases/t00006_class_mermaid.svg b/docs/test_cases/t00006_class_mermaid.svg index c59f8dde..68a91666 100644 --- a/docs/test_cases/t00006_class_mermaid.svg +++ b/docs/test_cases/t00006_class_mermaid.svg @@ -286,8 +286,8 @@ - - + + @@ -305,8 +305,8 @@ - - + + @@ -324,8 +324,8 @@ - - + + @@ -343,8 +343,8 @@ - - + + @@ -362,8 +362,8 @@ - - + + @@ -381,8 +381,8 @@ - - + + @@ -400,8 +400,8 @@ - - + + @@ -419,8 +419,8 @@ - - + + @@ -438,8 +438,8 @@ - - + + @@ -457,8 +457,8 @@ - - + + @@ -476,8 +476,8 @@ - - + + @@ -495,8 +495,8 @@ - - + + @@ -514,8 +514,8 @@ - - + + @@ -533,8 +533,8 @@ - - + + @@ -552,8 +552,8 @@ - - + + @@ -571,8 +571,8 @@ - - + + @@ -590,8 +590,8 @@ - - + + @@ -614,8 +614,8 @@ - - + + @@ -633,8 +633,8 @@ - - + + diff --git a/docs/test_cases/t00007.md b/docs/test_cases/t00007.md index 73bb122d..d9164b38 100644 --- a/docs/test_cases/t00007.md +++ b/docs/test_cases/t00007.md @@ -47,7 +47,7 @@ public: { "bases": [], "display_name": "A", - "id": "98876622534017019", + "id": "791012980272136155", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -69,7 +69,7 @@ public: { "bases": [], "display_name": "B", - "id": "696381312773707784", + "id": "5571050502189662274", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -91,7 +91,7 @@ public: { "bases": [], "display_name": "C", - "id": "972031178679364068", + "id": "7776249429434912544", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -113,7 +113,7 @@ public: { "bases": [], "display_name": "R", - "id": "66905874721300157", + "id": "535246997770401258", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -175,23 +175,23 @@ public: "relationships": [ { "access": "public", - "destination": "98876622534017019", + "destination": "791012980272136155", "label": "a", - "source": "66905874721300157", + "source": "535246997770401258", "type": "aggregation" }, { "access": "public", - "destination": "696381312773707784", + "destination": "5571050502189662274", "label": "b", - "source": "66905874721300157", + "source": "535246997770401258", "type": "association" }, { "access": "public", - "destination": "972031178679364068", + "destination": "7776249429434912544", "label": "c", - "source": "66905874721300157", + "source": "535246997770401258", "type": "association" } ], diff --git a/docs/test_cases/t00007_class.svg b/docs/test_cases/t00007_class.svg index 2ffcec13..753e10a0 100644 --- a/docs/test_cases/t00007_class.svg +++ b/docs/test_cases/t00007_class.svg @@ -1,6 +1,6 @@ - + @@ -9,66 +9,66 @@ - - + + A - - + + B - - + + C - - + + R - + - + a : std::unique_ptr<A> - + - + b : std::shared_ptr<B> - + - + c : std::weak_ptr<C> - + +a - + +b - + +c diff --git a/docs/test_cases/t00007_class_mermaid.svg b/docs/test_cases/t00007_class_mermaid.svg index 0f6a24b3..4ab86415 100644 --- a/docs/test_cases/t00007_class_mermaid.svg +++ b/docs/test_cases/t00007_class_mermaid.svg @@ -90,8 +90,8 @@ - - + + @@ -109,8 +109,8 @@ - - + + @@ -128,8 +128,8 @@ - - + + @@ -147,8 +147,8 @@ - - + + diff --git a/docs/test_cases/t00008.md b/docs/test_cases/t00008.md index ada54ea5..16504ec2 100644 --- a/docs/test_cases/t00008.md +++ b/docs/test_cases/t00008.md @@ -80,7 +80,7 @@ template <> struct E::nested_template { { "bases": [], "display_name": "A", - "id": "2293517130897538130", + "id": "18348137047180305042", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -204,7 +204,7 @@ template <> struct E::nested_template { { "bases": [], "display_name": "Vector", - "id": "1677407014842680311", + "id": "13419256118741442489", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -246,7 +246,7 @@ template <> struct E::nested_template { { "bases": [], "display_name": "B>", - "id": "1968575752686868237", + "id": "15748606021494945899", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -294,7 +294,7 @@ template <> struct E::nested_template { { "bases": [], "display_name": "B", - "id": "1449136415707203971", + "id": "11593091325657631773", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -329,7 +329,7 @@ template <> struct E::nested_template { { "bases": [], "display_name": "D", - "id": "1562396858816419857", + "id": "12499174870531358858", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -432,7 +432,7 @@ template <> struct E::nested_template { { "bases": [], "display_name": "E", - "id": "1787658457052431115", + "id": "14301267656419448926", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -454,7 +454,7 @@ template <> struct E::nested_template { { "bases": [], "display_name": "E::nested_template", - "id": "1549419203490064906", + "id": "12395353627920519248", "is_abstract": false, "is_nested": true, "is_struct": true, @@ -517,7 +517,7 @@ template <> struct E::nested_template { { "bases": [], "display_name": "E::nested_template", - "id": "33637089897037832", + "id": "269096719176302663", "is_abstract": false, "is_nested": true, "is_struct": true, @@ -583,33 +583,33 @@ template <> struct E::nested_template { "relationships": [ { "access": "public", - "destination": "1968575752686868237", - "source": "1449136415707203971", + "destination": "15748606021494945899", + "source": "11593091325657631773", "type": "instantiation" }, { "access": "public", - "destination": "1449136415707203971", + "destination": "11593091325657631773", "label": "ints", - "source": "1562396858816419857", + "source": "12499174870531358858", "type": "aggregation" }, { "access": "public", - "destination": "1787658457052431115", - "source": "1549419203490064906", + "destination": "14301267656419448926", + "source": "12395353627920519248", "type": "containment" }, { "access": "public", - "destination": "1787658457052431115", - "source": "33637089897037832", + "destination": "14301267656419448926", + "source": "269096719176302663", "type": "containment" }, { "access": "public", - "destination": "1549419203490064906", - "source": "33637089897037832", + "destination": "12395353627920519248", + "source": "269096719176302663", "type": "instantiation" } ], diff --git a/docs/test_cases/t00008_class.svg b/docs/test_cases/t00008_class.svg index ec197e82..58286d0a 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,29 +164,29 @@ char - + - + getDecl(char * c) : DeclType * - + - + ints - + - + - + diff --git a/docs/test_cases/t00008_class_mermaid.svg b/docs/test_cases/t00008_class_mermaid.svg index 6d0915ec..822756b3 100644 --- a/docs/test_cases/t00008_class_mermaid.svg +++ b/docs/test_cases/t00008_class_mermaid.svg @@ -114,8 +114,8 @@ - - + + @@ -163,8 +163,8 @@ - - + + @@ -187,8 +187,8 @@ - - + + @@ -211,8 +211,8 @@ - - + + @@ -230,8 +230,8 @@ - - + + @@ -264,8 +264,8 @@ - - + + @@ -283,8 +283,8 @@ - - + + @@ -307,8 +307,8 @@ - - + + diff --git a/docs/test_cases/t00009.md b/docs/test_cases/t00009.md index 6fcd5b31..ac71f0ce 100644 --- a/docs/test_cases/t00009.md +++ b/docs/test_cases/t00009.md @@ -53,7 +53,7 @@ public: { "bases": [], "display_name": "A", - "id": "412228989111660105", + "id": "3297831912893280842", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -95,7 +95,7 @@ public: { "bases": [], "display_name": "A", - "id": "1894387438043499", + "id": "15155099504347999", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -124,7 +124,7 @@ public: { "bases": [], "display_name": "A", - "id": "1340793233843139195", + "id": "10726345870745113562", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -153,7 +153,7 @@ public: { "bases": [], "display_name": "A>", - "id": "1370808797762248850", + "id": "10966470382097990802", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -189,7 +189,7 @@ public: { "bases": [], "display_name": "B", - "id": "176239714450247310", + "id": "1409917715601978480", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -251,55 +251,55 @@ public: "relationships": [ { "access": "public", - "destination": "412228989111660105", - "source": "1894387438043499", + "destination": "3297831912893280842", + "source": "15155099504347999", "type": "instantiation" }, { "access": "public", - "destination": "412228989111660105", - "source": "1340793233843139195", + "destination": "3297831912893280842", + "source": "10726345870745113562", "type": "instantiation" }, { "access": "public", - "destination": "412228989111660105", - "source": "1370808797762248850", + "destination": "3297831912893280842", + "source": "10966470382097990802", "type": "instantiation" }, { "access": "public", - "destination": "1894387438043499", + "destination": "15155099504347999", "label": "aint", - "source": "176239714450247310", + "source": "1409917715601978480", "type": "aggregation" }, { "access": "public", - "destination": "1340793233843139195", + "destination": "10726345870745113562", "label": "astring", - "source": "176239714450247310", + "source": "1409917715601978480", "type": "association" }, { "access": "public", - "destination": "412228989111660105", + "destination": "3297831912893280842", "label": "astring", - "source": "176239714450247310", + "source": "1409917715601978480", "type": "association" }, { "access": "public", - "destination": "1370808797762248850", + "destination": "10966470382097990802", "label": "avector", - "source": "176239714450247310", + "source": "1409917715601978480", "type": "association" }, { "access": "public", - "destination": "412228989111660105", + "destination": "3297831912893280842", "label": "avector", - "source": "176239714450247310", + "source": "1409917715601978480", "type": "association" } ], diff --git a/docs/test_cases/t00009_class.svg b/docs/test_cases/t00009_class.svg index fc3bd21e..dbd17144 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,54 +56,54 @@ - - + + B - + - + aint : A<int> - + - + astring : A<std::string> * - + - + avector : A<std::vector<std::string>> & - + - + - + - + aint - + astring - + astring - + avector - + avector diff --git a/docs/test_cases/t00009_class_mermaid.svg b/docs/test_cases/t00009_class_mermaid.svg index 38dae5e7..544ff845 100644 --- a/docs/test_cases/t00009_class_mermaid.svg +++ b/docs/test_cases/t00009_class_mermaid.svg @@ -150,8 +150,8 @@ - - + + @@ -174,8 +174,8 @@ - - + + @@ -193,8 +193,8 @@ - - + + @@ -212,8 +212,8 @@ - - + + @@ -231,8 +231,8 @@ - - + + diff --git a/docs/test_cases/t00010.md b/docs/test_cases/t00010.md index 0ae27f3b..8a2d2d24 100644 --- a/docs/test_cases/t00010.md +++ b/docs/test_cases/t00010.md @@ -52,7 +52,7 @@ public: { "bases": [], "display_name": "A", - "id": "2222216618904514099", + "id": "17777732951236112797", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -112,7 +112,7 @@ public: { "bases": [], "display_name": "A", - "id": "1861520693741915300", + "id": "14892165549935322401", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -147,7 +147,7 @@ public: { "bases": [], "display_name": "B", - "id": "2303611426082708583", + "id": "18428891408661668669", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -189,7 +189,7 @@ public: { "bases": [], "display_name": "B", - "id": "1498376939480949099", + "id": "11987015515847592796", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -218,7 +218,7 @@ public: { "bases": [], "display_name": "C", - "id": "1880966578968892571", + "id": "15047732631751140570", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -256,28 +256,28 @@ public: "relationships": [ { "access": "public", - "destination": "2222216618904514099", - "source": "1861520693741915300", + "destination": "17777732951236112797", + "source": "14892165549935322401", "type": "instantiation" }, { "access": "public", - "destination": "1861520693741915300", + "destination": "14892165549935322401", "label": "astring", - "source": "2303611426082708583", + "source": "18428891408661668669", "type": "aggregation" }, { "access": "public", - "destination": "2303611426082708583", - "source": "1498376939480949099", + "destination": "18428891408661668669", + "source": "11987015515847592796", "type": "instantiation" }, { "access": "public", - "destination": "1498376939480949099", + "destination": "11987015515847592796", "label": "aintstring", - "source": "1880966578968892571", + "source": "15047732631751140570", "type": "aggregation" } ], diff --git a/docs/test_cases/t00010_class.svg b/docs/test_cases/t00010_class.svg index df5b984e..1c2a65ef 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,30 +70,30 @@ - - + + C - + - + aintstring : B<int> - + - + astring - + - + aintstring diff --git a/docs/test_cases/t00010_class_mermaid.svg b/docs/test_cases/t00010_class_mermaid.svg index f0d004b8..02a63665 100644 --- a/docs/test_cases/t00010_class_mermaid.svg +++ b/docs/test_cases/t00010_class_mermaid.svg @@ -102,8 +102,8 @@ - - + + @@ -131,8 +131,8 @@ - - + + @@ -150,8 +150,8 @@ - - + + @@ -174,8 +174,8 @@ - - + + @@ -193,8 +193,8 @@ - - + + diff --git a/docs/test_cases/t00011.md b/docs/test_cases/t00011.md index 16344d60..e63ce815 100644 --- a/docs/test_cases/t00011.md +++ b/docs/test_cases/t00011.md @@ -61,7 +61,7 @@ public: { "bases": [], "display_name": "D", - "id": "1150639902748052276", + "id": "9205119221984418212", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -103,7 +103,7 @@ public: { "bases": [], "display_name": "A", - "id": "1420516952857803719", + "id": "11364135622862429756", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -154,7 +154,7 @@ public: { "bases": [], "display_name": "B", - "id": "1687427603952049829", + "id": "13499420831616398636", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -221,16 +221,16 @@ public: "relationships": [ { "access": "public", - "destination": "1687427603952049829", + "destination": "13499420831616398636", "label": "<>", - "source": "1420516952857803719", + "source": "11364135622862429756", "type": "friendship" }, { "access": "public", - "destination": "1420516952857803719", + "destination": "11364135622862429756", "label": "m_a", - "source": "1687427603952049829", + "source": "13499420831616398636", "type": "association" } ], diff --git a/docs/test_cases/t00011_class.svg b/docs/test_cases/t00011_class.svg index c77dbf9c..2516a977 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,55 +19,55 @@ - + - + value : T - - + + A - + - + foo() : void - - + + B - + - + foo() : void - + - + m_a : A * - + «friend» - + m_a diff --git a/docs/test_cases/t00011_class_mermaid.svg b/docs/test_cases/t00011_class_mermaid.svg index 1770a324..5bd2ddd5 100644 --- a/docs/test_cases/t00011_class_mermaid.svg +++ b/docs/test_cases/t00011_class_mermaid.svg @@ -78,8 +78,8 @@ - - + + @@ -102,8 +102,8 @@ - - + + @@ -126,8 +126,8 @@ - - + + diff --git a/docs/test_cases/t00012.md b/docs/test_cases/t00012.md index 47106719..1f3af351 100644 --- a/docs/test_cases/t00012.md +++ b/docs/test_cases/t00012.md @@ -68,7 +68,7 @@ class R { { "bases": [], "display_name": "A", - "id": "1773299890023132282", + "id": "14186399120185058260", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -128,7 +128,7 @@ class R { { "bases": [], "display_name": "B", - "id": "2061171077567279746", + "id": "16489368620538237973", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -171,7 +171,7 @@ class R { { "bases": [], "display_name": "C", - "id": "627809578407650629", + "id": "5022476627261205034", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -220,7 +220,7 @@ class R { { "bases": [], "display_name": "A", - "id": "286972398942005457", + "id": "2295779191536043659", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -261,7 +261,7 @@ class R { { "bases": [], "display_name": "A", - "id": "299466181098300963", + "id": "2395729448786407708", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -302,7 +302,7 @@ class R { { "bases": [], "display_name": "B<3,2,1>", - "id": "489063277971613593", + "id": "3912506223772908750", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -343,7 +343,7 @@ class R { { "bases": [], "display_name": "B<1,1,1,1>", - "id": "14232362483200599", + "id": "113858899865604792", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -390,7 +390,7 @@ class R { { "bases": [], "display_name": "C>>>,3,3,3>", - "id": "1478239414632239754", + "id": "11825915317057918032", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -471,7 +471,7 @@ class R { { "bases": [], "display_name": "R", - "id": "559263385732885469", + "id": "4474107085863083753", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -557,67 +557,67 @@ class R { "relationships": [ { "access": "public", - "destination": "1773299890023132282", - "source": "286972398942005457", + "destination": "14186399120185058260", + "source": "2295779191536043659", "type": "instantiation" }, { "access": "public", - "destination": "1773299890023132282", - "source": "299466181098300963", + "destination": "14186399120185058260", + "source": "2395729448786407708", "type": "instantiation" }, { "access": "public", - "destination": "2061171077567279746", - "source": "489063277971613593", + "destination": "16489368620538237973", + "source": "3912506223772908750", "type": "instantiation" }, { "access": "public", - "destination": "2061171077567279746", - "source": "14232362483200599", + "destination": "16489368620538237973", + "source": "113858899865604792", "type": "instantiation" }, { "access": "public", - "destination": "627809578407650629", - "source": "1478239414632239754", + "destination": "5022476627261205034", + "source": "11825915317057918032", "type": "instantiation" }, { "access": "private", - "destination": "286972398942005457", + "destination": "2295779191536043659", "label": "a1", - "source": "559263385732885469", + "source": "4474107085863083753", "type": "aggregation" }, { "access": "private", - "destination": "299466181098300963", + "destination": "2395729448786407708", "label": "a2", - "source": "559263385732885469", + "source": "4474107085863083753", "type": "aggregation" }, { "access": "private", - "destination": "489063277971613593", + "destination": "3912506223772908750", "label": "b1", - "source": "559263385732885469", + "source": "4474107085863083753", "type": "aggregation" }, { "access": "private", - "destination": "14232362483200599", + "destination": "113858899865604792", "label": "b2", - "source": "559263385732885469", + "source": "4474107085863083753", "type": "aggregation" }, { "access": "private", - "destination": "1478239414632239754", + "destination": "11825915317057918032", "label": "c1", - "source": "559263385732885469", + "source": "4474107085863083753", "type": "aggregation" } ], diff --git a/docs/test_cases/t00012_class.svg b/docs/test_cases/t00012_class.svg index bdee54fd..8aadba46 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,79 +117,79 @@ - - + + R - + - + a1 : A<int,std::string,float> - + - + a2 : A<int,std::string,bool> - + - + b1 : B<3,2,1> - + - + b2 : B<1,1,1,1> - + - + c1 : C<std::map<int,std::vector<std::vector<std::vector<std::string>>>>,3,3,3> - + Long template annotation - + - + - + - + - + - + a1 - + a2 - + b1 - + b2 - + c1 diff --git a/docs/test_cases/t00012_class_mermaid.svg b/docs/test_cases/t00012_class_mermaid.svg index c666147b..1ff6ef4c 100644 --- a/docs/test_cases/t00012_class_mermaid.svg +++ b/docs/test_cases/t00012_class_mermaid.svg @@ -174,8 +174,8 @@ - - + + @@ -203,8 +203,8 @@ - - + + @@ -227,8 +227,8 @@ - - + + @@ -251,8 +251,8 @@ - - + + @@ -270,8 +270,8 @@ - - + + @@ -289,8 +289,8 @@ - - + + @@ -308,8 +308,8 @@ - - + + @@ -327,8 +327,8 @@ - - + + @@ -346,8 +346,8 @@ - - + + diff --git a/docs/test_cases/t00013.md b/docs/test_cases/t00013.md index 8c4b3f2e..33b9920a 100644 --- a/docs/test_cases/t00013.md +++ b/docs/test_cases/t00013.md @@ -96,7 +96,7 @@ private: { "bases": [], "display_name": "ABCD::F", - "id": "952770730316239752", + "id": "7622165842529918021", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -138,7 +138,7 @@ private: { "bases": [], "display_name": "ABCD::F", - "id": "2304215469403389354", + "id": "18433723755227114832", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -167,7 +167,7 @@ private: { "bases": [], "display_name": "A", - "id": "519995486237427479", + "id": "4159963889899419835", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -202,7 +202,7 @@ private: { "bases": [], "display_name": "B", - "id": "1177487653597650440", + "id": "9419901228781203525", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -237,7 +237,7 @@ private: { "bases": [], "display_name": "C", - "id": "1028245818073128358", + "id": "8225966544585026866", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -272,7 +272,7 @@ private: { "bases": [], "display_name": "D", - "id": "409373870621931875", + "id": "3274990964975455007", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -341,7 +341,7 @@ private: { "bases": [], "display_name": "E", - "id": "864055993755439230", + "id": "6912447950043513847", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -383,7 +383,7 @@ private: { "bases": [], "display_name": "G", - "id": "205927019127027617", + "id": "1647416153016220941", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -443,7 +443,7 @@ private: { "bases": [], "display_name": "E", - "id": "1977486318799565722", + "id": "15819890550396525783", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -472,7 +472,7 @@ private: { "bases": [], "display_name": "G", - "id": "1526733274613822014", + "id": "12213866196910576114", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -513,7 +513,7 @@ private: { "bases": [], "display_name": "E", - "id": "531523220915557686", + "id": "4252185767324461489", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -542,7 +542,7 @@ private: { "bases": [], "display_name": "R", - "id": "2198686676355573844", + "id": "17589493410844590756", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -958,106 +958,106 @@ private: "relationships": [ { "access": "public", - "destination": "952770730316239752", - "source": "2304215469403389354", + "destination": "7622165842529918021", + "source": "18433723755227114832", "type": "instantiation" }, { "access": "public", - "destination": "2198686676355573844", - "source": "409373870621931875", + "destination": "17589493410844590756", + "source": "3274990964975455007", "type": "dependency" }, { "access": "public", - "destination": "864055993755439230", - "source": "1977486318799565722", + "destination": "6912447950043513847", + "source": "15819890550396525783", "type": "instantiation" }, { "access": "public", - "destination": "205927019127027617", - "source": "1526733274613822014", + "destination": "1647416153016220941", + "source": "12213866196910576114", "type": "instantiation" }, { "access": "public", - "destination": "864055993755439230", - "source": "531523220915557686", + "destination": "6912447950043513847", + "source": "4252185767324461489", "type": "instantiation" }, { "access": "public", - "destination": "519995486237427479", - "source": "2198686676355573844", + "destination": "4159963889899419835", + "source": "17589493410844590756", "type": "dependency" }, { "access": "public", - "destination": "1177487653597650440", - "source": "2198686676355573844", + "destination": "9419901228781203525", + "source": "17589493410844590756", "type": "dependency" }, { "access": "public", - "destination": "1028245818073128358", - "source": "2198686676355573844", + "destination": "8225966544585026866", + "source": "17589493410844590756", "type": "dependency" }, { "access": "public", - "destination": "409373870621931875", - "source": "2198686676355573844", + "destination": "3274990964975455007", + "source": "17589493410844590756", "type": "dependency" }, { "access": "public", - "destination": "1977486318799565722", - "source": "2198686676355573844", + "destination": "15819890550396525783", + "source": "17589493410844590756", "type": "dependency" }, { "access": "public", - "destination": "864055993755439230", - "source": "2198686676355573844", + "destination": "6912447950043513847", + "source": "17589493410844590756", "type": "dependency" }, { "access": "public", - "destination": "2304215469403389354", - "source": "2198686676355573844", + "destination": "18433723755227114832", + "source": "17589493410844590756", "type": "dependency" }, { "access": "public", - "destination": "952770730316239752", - "source": "2198686676355573844", + "destination": "7622165842529918021", + "source": "17589493410844590756", "type": "dependency" }, { "access": "public", - "destination": "864055993755439230", - "source": "2198686676355573844", + "destination": "6912447950043513847", + "source": "17589493410844590756", "type": "dependency" }, { "access": "public", - "destination": "952770730316239752", - "source": "2198686676355573844", + "destination": "7622165842529918021", + "source": "17589493410844590756", "type": "dependency" }, { "access": "public", - "destination": "1526733274613822014", + "destination": "12213866196910576114", "label": "gintstring", - "source": "2198686676355573844", + "source": "17589493410844590756", "type": "aggregation" }, { "access": "private", - "destination": "531523220915557686", + "destination": "4252185767324461489", "label": "estring", - "source": "2198686676355573844", + "source": "17589493410844590756", "type": "aggregation" } ], diff --git a/docs/test_cases/t00013_class.svg b/docs/test_cases/t00013_class.svg index 9417dfd5..ac0c1592 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,126 +174,126 @@ - - + + R - + - + get_a(A * a) : int - + - + get_b(B & b) : int - + - + get_c(C c) : int - + - + get_const_b(const B & b) : int - + - + get_d(D && d) : int - + - + get_d2(D && d) : int get_e<T>(E<T> e) : T get_f<T>(const F<T> & f) : T - + - + get_int_e(const E<int> & e) : int - + - + get_int_e2(E<int> & e) : int - + - + get_int_f(const ABCD::F<int> & f) : int - + - + estring : E<std::string> - + - + gintstring : G<int,float,std::string> - + - + - + - + - + - + - + - + - + - + - + - + - + - + gintstring - + estring diff --git a/docs/test_cases/t00013_class_mermaid.svg b/docs/test_cases/t00013_class_mermaid.svg index 8f5ea338..66641826 100644 --- a/docs/test_cases/t00013_class_mermaid.svg +++ b/docs/test_cases/t00013_class_mermaid.svg @@ -234,8 +234,8 @@ - - + + @@ -258,8 +258,8 @@ - - + + @@ -277,8 +277,8 @@ - - + + @@ -301,8 +301,8 @@ - - + + @@ -325,8 +325,8 @@ - - + + @@ -349,8 +349,8 @@ - - + + @@ -378,8 +378,8 @@ - - + + @@ -402,8 +402,8 @@ - - + + @@ -431,8 +431,8 @@ - - + + @@ -450,8 +450,8 @@ - - + + @@ -469,8 +469,8 @@ - - + + @@ -488,8 +488,8 @@ - - + + diff --git a/docs/test_cases/t00014.md b/docs/test_cases/t00014.md index 03cbdeed..f8692260 100644 --- a/docs/test_cases/t00014.md +++ b/docs/test_cases/t00014.md @@ -116,7 +116,7 @@ public: { "bases": [], "display_name": "A", - "id": "765890579167335652", + "id": "6127124633338685220", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -176,7 +176,7 @@ public: { "bases": [], "display_name": "B", - "id": "934136012292043506", + "id": "7473088098336348050", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -211,7 +211,7 @@ public: { "bases": [], "display_name": "A", - "id": "2186387853087008570", + "id": "17491102824696068567", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -246,7 +246,7 @@ public: { "bases": [], "display_name": "A>", - "id": "947292733740993297", + "id": "7578341869927946377", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -288,7 +288,7 @@ public: { "bases": [], "display_name": "A", - "id": "1700006390494465667", + "id": "13600051123955725337", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -323,7 +323,7 @@ public: { "bases": [], "display_name": "A", - "id": "2017665567517853203", + "id": "16141324540142825631", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -358,7 +358,7 @@ public: { "bases": [], "display_name": "A", - "id": "906557320263235873", + "id": "7252458562105886987", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -393,7 +393,7 @@ public: { "bases": [], "display_name": "A", - "id": "378898020828430636", + "id": "3031184166627445092", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -428,7 +428,7 @@ public: { "bases": [], "display_name": "A", - "id": "2082013375525130414", + "id": "16656107004201043317", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -463,7 +463,7 @@ public: { "bases": [], "display_name": "A", - "id": "51978493292659230", + "id": "415827946341273846", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -498,7 +498,7 @@ public: { "bases": [], "display_name": "A", - "id": "197769253782961588", + "id": "1582154030263692708", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -533,7 +533,7 @@ public: { "bases": [], "display_name": "A", - "id": "895940711566401184", + "id": "7167525692531209473", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -568,7 +568,7 @@ public: { "bases": [], "display_name": "A>", - "id": "1751732625010742161", + "id": "14013861000085937293", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -610,7 +610,7 @@ public: { "bases": [], "display_name": "A", - "id": "887121441210847583", + "id": "7096971529686780666", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -645,7 +645,7 @@ public: { "bases": [], "display_name": "A", - "id": "1119452495635561975", + "id": "8955619965084495806", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -680,7 +680,7 @@ public: { "bases": [], "display_name": "A", - "id": "340562099063642390", + "id": "2724496792509139121", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -715,7 +715,7 @@ public: { "bases": [], "display_name": "A", - "id": "1388877149159894665", + "id": "11111017193279157322", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -750,7 +750,7 @@ public: { "bases": [], "display_name": "R", - "id": "1758213171584933144", + "id": "14065705372679465152", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -975,230 +975,230 @@ public: "relationships": [ { "access": "public", - "destination": "765890579167335652", - "source": "2186387853087008570", + "destination": "6127124633338685220", + "source": "17491102824696068567", "type": "instantiation" }, { "access": "public", - "destination": "765890579167335652", - "source": "947292733740993297", + "destination": "6127124633338685220", + "source": "7578341869927946377", "type": "instantiation" }, { "access": "public", - "destination": "765890579167335652", - "source": "1700006390494465667", + "destination": "6127124633338685220", + "source": "13600051123955725337", "type": "instantiation" }, { "access": "public", - "destination": "765890579167335652", - "source": "2017665567517853203", + "destination": "6127124633338685220", + "source": "16141324540142825631", "type": "instantiation" }, { "access": "public", - "destination": "1700006390494465667", - "source": "906557320263235873", + "destination": "13600051123955725337", + "source": "7252458562105886987", "type": "instantiation" }, { "access": "public", - "destination": "1700006390494465667", - "source": "378898020828430636", + "destination": "13600051123955725337", + "source": "3031184166627445092", "type": "instantiation" }, { "access": "public", - "destination": "2017665567517853203", - "source": "2082013375525130414", + "destination": "16141324540142825631", + "source": "16656107004201043317", "type": "instantiation" }, { "access": "public", - "destination": "1700006390494465667", - "source": "51978493292659230", + "destination": "13600051123955725337", + "source": "415827946341273846", "type": "instantiation" }, { "access": "public", - "destination": "2017665567517853203", - "source": "197769253782961588", + "destination": "16141324540142825631", + "source": "1582154030263692708", "type": "instantiation" }, { "access": "public", - "destination": "2186387853087008570", - "source": "895940711566401184", + "destination": "17491102824696068567", + "source": "7167525692531209473", "type": "instantiation" }, { "access": "public", - "destination": "947292733740993297", - "source": "1751732625010742161", + "destination": "7578341869927946377", + "source": "14013861000085937293", "type": "instantiation" }, { "access": "public", - "destination": "2186387853087008570", - "source": "887121441210847583", + "destination": "17491102824696068567", + "source": "7096971529686780666", "type": "instantiation" }, { "access": "public", - "destination": "2186387853087008570", - "source": "1119452495635561975", + "destination": "17491102824696068567", + "source": "8955619965084495806", "type": "instantiation" }, { "access": "public", - "destination": "2186387853087008570", - "source": "340562099063642390", + "destination": "17491102824696068567", + "source": "2724496792509139121", "type": "instantiation" }, { "access": "public", - "destination": "2186387853087008570", - "source": "1388877149159894665", + "destination": "17491102824696068567", + "source": "11111017193279157322", "type": "instantiation" }, { "access": "private", - "destination": "934136012292043506", + "destination": "7473088098336348050", "label": "bapair", - "source": "1758213171584933144", + "source": "14065705372679465152", "type": "aggregation" }, { "access": "private", - "destination": "378898020828430636", + "destination": "3031184166627445092", "label": "bapair", - "source": "1758213171584933144", + "source": "14065705372679465152", "type": "aggregation" }, { "access": "private", - "destination": "2082013375525130414", + "destination": "16656107004201043317", "label": "abool", - "source": "1758213171584933144", + "source": "14065705372679465152", "type": "aggregation" }, { "access": "private", - "destination": "2082013375525130414", + "destination": "16656107004201043317", "label": "aboolfloat", - "source": "1758213171584933144", + "source": "14065705372679465152", "type": "aggregation" }, { "access": "private", - "destination": "51978493292659230", + "destination": "415827946341273846", "label": "aboolfloat", - "source": "1758213171584933144", + "source": "14065705372679465152", "type": "aggregation" }, { "access": "private", - "destination": "197769253782961588", + "destination": "1582154030263692708", "label": "afloat", - "source": "1758213171584933144", + "source": "14065705372679465152", "type": "association" }, { "access": "private", - "destination": "895940711566401184", + "destination": "7167525692531209473", "label": "boolstring", - "source": "1758213171584933144", + "source": "14065705372679465152", "type": "aggregation" }, { "access": "private", - "destination": "1751732625010742161", + "destination": "14013861000085937293", "label": "floatstring", - "source": "1758213171584933144", + "source": "14065705372679465152", "type": "aggregation" }, { "access": "private", - "destination": "887121441210847583", + "destination": "7096971529686780666", "label": "intstring", - "source": "1758213171584933144", + "source": "14065705372679465152", "type": "aggregation" }, { "access": "private", - "destination": "1119452495635561975", + "destination": "8955619965084495806", "label": "stringstring", - "source": "1758213171584933144", + "source": "14065705372679465152", "type": "aggregation" }, { "access": "private", - "destination": "1119452495635561975", + "destination": "8955619965084495806", "label": "bstringstring", - "source": "1758213171584933144", + "source": "14065705372679465152", "type": "aggregation" }, { "access": "private", - "destination": "2017665567517853203", + "destination": "16141324540142825631", "label": "atfloat", - "source": "1758213171584933144", + "source": "14065705372679465152", "type": "aggregation" }, { "access": "private", - "destination": "51978493292659230", + "destination": "415827946341273846", "label": "atfloat", - "source": "1758213171584933144", + "source": "14065705372679465152", "type": "aggregation" }, { "access": "protected", - "destination": "934136012292043506", + "destination": "7473088098336348050", "label": "bs", - "source": "1758213171584933144", + "source": "14065705372679465152", "type": "aggregation" }, { "access": "public", - "destination": "934136012292043506", + "destination": "7473088098336348050", "label": "bs2", - "source": "1758213171584933144", + "source": "14065705372679465152", "type": "aggregation" }, { "access": "public", - "destination": "340562099063642390", - "source": "1758213171584933144", + "destination": "2724496792509139121", + "source": "14065705372679465152", "type": "dependency" }, { "access": "public", - "destination": "340562099063642390", + "destination": "2724496792509139121", "label": "cb", - "source": "1758213171584933144", + "source": "14065705372679465152", "type": "dependency" }, { "access": "public", - "destination": "1388877149159894665", - "source": "1758213171584933144", + "destination": "11111017193279157322", + "source": "14065705372679465152", "type": "dependency" }, { "access": "public", - "destination": "1388877149159894665", + "destination": "11111017193279157322", "label": "gcb", - "source": "1758213171584933144", + "source": "14065705372679465152", "type": "dependency" }, { "access": "public", - "destination": "934136012292043506", + "destination": "7473088098336348050", "label": "vps", - "source": "1758213171584933144", + "source": "14065705372679465152", "type": "aggregation" } ], diff --git a/docs/test_cases/t00014_class.svg b/docs/test_cases/t00014_class.svg index ba486885..f61b1f2a 100644 --- a/docs/test_cases/t00014_class.svg +++ b/docs/test_cases/t00014_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + A @@ -19,37 +19,37 @@ - + - + p : P - + - + t : T - - + + B - + - + value : std::string - - + + A @@ -58,8 +58,8 @@ - - + + A @@ -68,8 +68,8 @@ - - + + A @@ -78,8 +78,8 @@ - - + + A @@ -88,8 +88,8 @@ - - + + A @@ -98,8 +98,8 @@ - - + + A @@ -108,8 +108,8 @@ - - + + A @@ -118,8 +118,8 @@ - - + + A @@ -128,8 +128,8 @@ - - + + A @@ -138,8 +138,8 @@ - - + + A @@ -148,8 +148,8 @@ - - + + A @@ -158,8 +158,8 @@ - - + + A @@ -168,8 +168,8 @@ - - + + A @@ -178,7 +178,7 @@ - + A @@ -186,7 +186,7 @@ char,std::string - + A @@ -194,8 +194,8 @@ wchar_t,std::string - - + + R @@ -204,221 +204,221 @@ - + - + abool : APtr<bool> - + - + aboolfloat : AAPtr<bool,float> - + - + afloat : ASharedPtr<float> - + - + atfloat : AAPtr<T,float> - + - + bapair : PairPairBA<bool> - + - + boolstring : A<bool,std::string> - + - + bs : BVector - + - + bs2 : BVector2 - + - + bstringstring : BStringString - + - + cb : SimpleCallback<ACharString> - + - + floatstring : AStringPtr<float> - + - + gcb : GenericCallback<AWCharString> - + - + intstring : AIntString - + - + stringstring : AStringString - + - + vcb : VoidCallback - + - + vps : VectorPtr<B> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + bapair - + bs - + bs2 - + vps - + bapair - + abool - + aboolfloat - + aboolfloat - + atfloat - + afloat - + boolstring - + floatstring - + intstring - + stringstring - + bstringstring - + atfloat - + - + cb - + - + gcb diff --git a/docs/test_cases/t00014_class_mermaid.svg b/docs/test_cases/t00014_class_mermaid.svg index cb1ac705..ddf78420 100644 --- a/docs/test_cases/t00014_class_mermaid.svg +++ b/docs/test_cases/t00014_class_mermaid.svg @@ -474,8 +474,8 @@ - - + + @@ -503,8 +503,8 @@ - - + + @@ -527,8 +527,8 @@ - - + + @@ -546,8 +546,8 @@ - - + + @@ -565,8 +565,8 @@ - - + + @@ -584,8 +584,8 @@ - - + + @@ -603,8 +603,8 @@ - - + + @@ -622,8 +622,8 @@ - - + + @@ -641,8 +641,8 @@ - - + + @@ -660,8 +660,8 @@ - - + + @@ -679,8 +679,8 @@ - - + + @@ -698,8 +698,8 @@ - - + + @@ -717,8 +717,8 @@ - - + + @@ -736,8 +736,8 @@ - - + + @@ -755,8 +755,8 @@ - - + + @@ -774,8 +774,8 @@ - - + + @@ -793,8 +793,8 @@ - - + + @@ -812,8 +812,8 @@ - - + + diff --git a/docs/test_cases/t00015.md b/docs/test_cases/t00015.md index f2490582..96fb4643 100644 --- a/docs/test_cases/t00015.md +++ b/docs/test_cases/t00015.md @@ -56,7 +56,7 @@ class B : public ns1::ns2::Anon { }; { "bases": [], "display_name": "ns1::A", - "id": "1410694888805149453", + "id": "11285559110441195627", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -78,7 +78,7 @@ class B : public ns1::ns2::Anon { }; { "bases": [], "display_name": "ns1::ns2_v0_9_0::A", - "id": "485552648049088863", + "id": "3884421184392710906", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -101,13 +101,13 @@ class B : public ns1::ns2::Anon { }; "bases": [ { "access": "public", - "id": "1410694888805149453", + "id": "11285559110441195627", "is_virtual": false, "name": "clanguml::t00015::ns1::A" } ], "display_name": "ns1::Anon", - "id": "1060731132374575329", + "id": "8485849058996602634", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -130,13 +130,13 @@ class B : public ns1::ns2::Anon { }; "bases": [ { "access": "public", - "id": "1410694888805149453", + "id": "11285559110441195627", "is_virtual": false, "name": "clanguml::t00015::ns1::A" } ], "display_name": "ns3::ns1::ns2::Anon", - "id": "1797521288354158629", + "id": "14380170306833269036", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -159,13 +159,13 @@ class B : public ns1::ns2::Anon { }; "bases": [ { "access": "public", - "id": "1797521288354158629", + "id": "14380170306833269036", "is_virtual": false, "name": "clanguml::t00015::ns3::ns1::ns2::Anon" } ], "display_name": "ns3::B", - "id": "870882387819356092", + "id": "6967059102554848740", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -190,20 +190,20 @@ class B : public ns1::ns2::Anon { }; "relationships": [ { "access": "public", - "destination": "1410694888805149453", - "source": "1060731132374575329", + "destination": "11285559110441195627", + "source": "8485849058996602634", "type": "extension" }, { "access": "public", - "destination": "1410694888805149453", - "source": "1797521288354158629", + "destination": "11285559110441195627", + "source": "14380170306833269036", "type": "extension" }, { "access": "public", - "destination": "1797521288354158629", - "source": "870882387819356092", + "destination": "14380170306833269036", + "source": "6967059102554848740", "type": "extension" } ], diff --git a/docs/test_cases/t00015_class.svg b/docs/test_cases/t00015_class.svg index aef71f33..df48a736 100644 --- a/docs/test_cases/t00015_class.svg +++ b/docs/test_cases/t00015_class.svg @@ -1,6 +1,6 @@ - + @@ -9,51 +9,51 @@ - - + + 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 3d4c7a92..04828bdd 100644 --- a/docs/test_cases/t00015_class_mermaid.svg +++ b/docs/test_cases/t00015_class_mermaid.svg @@ -84,8 +84,8 @@ - - + + @@ -103,8 +103,8 @@ - - + + @@ -122,8 +122,8 @@ - - + + @@ -141,8 +141,8 @@ - - + + @@ -160,8 +160,8 @@ - - + + diff --git a/docs/test_cases/t00016.md b/docs/test_cases/t00016.md index ad39cd2b..8c318d51 100644 --- a/docs/test_cases/t00016.md +++ b/docs/test_cases/t00016.md @@ -60,7 +60,7 @@ template <> struct is_numeric { { "bases": [], "display_name": "is_numeric", - "id": "932856332558460389", + "id": "7462850660467683116", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -96,7 +96,7 @@ template <> struct is_numeric { { "bases": [], "display_name": "is_numeric", - "id": "95618295648274199", + "id": "764946365186193592", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -132,7 +132,7 @@ template <> struct is_numeric { { "bases": [], "display_name": "is_numeric", - "id": "979129381790761728", + "id": "7833035054326093824", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -168,7 +168,7 @@ template <> struct is_numeric { { "bases": [], "display_name": "is_numeric", - "id": "2090787690027341836", + "id": "16726301520218734694", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -204,7 +204,7 @@ template <> struct is_numeric { { "bases": [], "display_name": "is_numeric", - "id": "500603075237446075", + "id": "4004824601899568602", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -240,7 +240,7 @@ template <> struct is_numeric { { "bases": [], "display_name": "is_numeric", - "id": "2111316837513419920", + "id": "16890534700107359361", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -279,32 +279,32 @@ template <> struct is_numeric { "relationships": [ { "access": "public", - "destination": "932856332558460389", - "source": "95618295648274199", + "destination": "7462850660467683116", + "source": "764946365186193592", "type": "instantiation" }, { "access": "public", - "destination": "932856332558460389", - "source": "979129381790761728", + "destination": "7462850660467683116", + "source": "7833035054326093824", "type": "instantiation" }, { "access": "public", - "destination": "932856332558460389", - "source": "2090787690027341836", + "destination": "7462850660467683116", + "source": "16726301520218734694", "type": "instantiation" }, { "access": "public", - "destination": "932856332558460389", - "source": "500603075237446075", + "destination": "7462850660467683116", + "source": "4004824601899568602", "type": "instantiation" }, { "access": "public", - "destination": "932856332558460389", - "source": "2111316837513419920", + "destination": "7462850660467683116", + "source": "16890534700107359361", "type": "instantiation" } ], diff --git a/docs/test_cases/t00016_class.svg b/docs/test_cases/t00016_class.svg index 098c1eab..0699f1da 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 @@ -81,15 +81,15 @@ value : enum - + - + - + - + - + diff --git a/docs/test_cases/t00016_class_mermaid.svg b/docs/test_cases/t00016_class_mermaid.svg index 41da6af9..68cb784f 100644 --- a/docs/test_cases/t00016_class_mermaid.svg +++ b/docs/test_cases/t00016_class_mermaid.svg @@ -114,8 +114,8 @@ - - + + @@ -138,8 +138,8 @@ - - + + @@ -162,8 +162,8 @@ - - + + @@ -186,8 +186,8 @@ - - + + @@ -210,8 +210,8 @@ - - + + @@ -234,8 +234,8 @@ - - + + diff --git a/docs/test_cases/t00017.md b/docs/test_cases/t00017.md index 8b71b728..1bf94d2c 100644 --- a/docs/test_cases/t00017.md +++ b/docs/test_cases/t00017.md @@ -85,7 +85,7 @@ private: { "bases": [], "display_name": "A", - "id": "121332093434690887", + "id": "970656747477527100", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -107,7 +107,7 @@ private: { "bases": [], "display_name": "B", - "id": "1424864837456200487", + "id": "11398918699649603899", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -129,7 +129,7 @@ private: { "bases": [], "display_name": "C", - "id": "2151170391844743478", + "id": "17209363134757947829", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -151,7 +151,7 @@ private: { "bases": [], "display_name": "D", - "id": "1378112127131766972", + "id": "11024897017054135776", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -173,7 +173,7 @@ private: { "bases": [], "display_name": "E", - "id": "1535300935831802489", + "id": "12282407486654419914", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -195,7 +195,7 @@ private: { "bases": [], "display_name": "F", - "id": "1803800465279710134", + "id": "14430403722237681072", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -217,7 +217,7 @@ private: { "bases": [], "display_name": "G", - "id": "1135797791892670246", + "id": "9086382335141361974", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -239,7 +239,7 @@ private: { "bases": [], "display_name": "H", - "id": "1243547836571712317", + "id": "9948382692573698543", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -261,7 +261,7 @@ private: { "bases": [], "display_name": "I", - "id": "387733199705628658", + "id": "3101865597645029270", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -283,7 +283,7 @@ private: { "bases": [], "display_name": "J", - "id": "747991828672433537", + "id": "5983934629379468301", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -305,7 +305,7 @@ private: { "bases": [], "display_name": "K", - "id": "1783571342994833467", + "id": "14268570743958667740", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -327,7 +327,7 @@ private: { "bases": [], "display_name": "R", - "id": "287495916564113342", + "id": "2299967332512906736", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -583,79 +583,79 @@ private: "relationships": [ { "access": "private", - "destination": "121332093434690887", + "destination": "970656747477527100", "label": "a", - "source": "287495916564113342", + "source": "2299967332512906736", "type": "aggregation" }, { "access": "private", - "destination": "1424864837456200487", + "destination": "11398918699649603899", "label": "b", - "source": "287495916564113342", + "source": "2299967332512906736", "type": "association" }, { "access": "private", - "destination": "2151170391844743478", + "destination": "17209363134757947829", "label": "c", - "source": "287495916564113342", + "source": "2299967332512906736", "type": "association" }, { "access": "private", - "destination": "1378112127131766972", + "destination": "11024897017054135776", "label": "d", - "source": "287495916564113342", + "source": "2299967332512906736", "type": "association" }, { "access": "private", - "destination": "1535300935831802489", + "destination": "12282407486654419914", "label": "e", - "source": "287495916564113342", + "source": "2299967332512906736", "type": "association" }, { "access": "private", - "destination": "1803800465279710134", + "destination": "14430403722237681072", "label": "f", - "source": "287495916564113342", + "source": "2299967332512906736", "type": "aggregation" }, { "access": "private", - "destination": "1135797791892670246", + "destination": "9086382335141361974", "label": "g", - "source": "287495916564113342", + "source": "2299967332512906736", "type": "association" }, { "access": "private", - "destination": "1243547836571712317", + "destination": "9948382692573698543", "label": "h", - "source": "287495916564113342", + "source": "2299967332512906736", "type": "association" }, { "access": "private", - "destination": "387733199705628658", + "destination": "3101865597645029270", "label": "i", - "source": "287495916564113342", + "source": "2299967332512906736", "type": "association" }, { "access": "private", - "destination": "747991828672433537", + "destination": "5983934629379468301", "label": "j", - "source": "287495916564113342", + "source": "2299967332512906736", "type": "association" }, { "access": "private", - "destination": "1783571342994833467", + "destination": "14268570743958667740", "label": "k", - "source": "287495916564113342", + "source": "2299967332512906736", "type": "association" } ], diff --git a/docs/test_cases/t00017_class.svg b/docs/test_cases/t00017_class.svg index 57965436..65fdf8dc 100644 --- a/docs/test_cases/t00017_class.svg +++ b/docs/test_cases/t00017_class.svg @@ -1,6 +1,6 @@ - + @@ -9,168 +9,168 @@ - - + + 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 & - + -a - + -b - + -c - + -d - + -e - + -f - + -g - + -h - + -i - + -j - + -k diff --git a/docs/test_cases/t00017_class_mermaid.svg b/docs/test_cases/t00017_class_mermaid.svg index e48f1d10..382ed713 100644 --- a/docs/test_cases/t00017_class_mermaid.svg +++ b/docs/test_cases/t00017_class_mermaid.svg @@ -186,8 +186,8 @@ - - + + @@ -205,8 +205,8 @@ - - + + @@ -224,8 +224,8 @@ - - + + @@ -243,8 +243,8 @@ - - + + @@ -262,8 +262,8 @@ - - + + @@ -281,8 +281,8 @@ - - + + @@ -300,8 +300,8 @@ - - + + @@ -319,8 +319,8 @@ - - + + @@ -338,8 +338,8 @@ - - + + @@ -357,8 +357,8 @@ - - + + @@ -376,8 +376,8 @@ - - + + @@ -395,8 +395,8 @@ - - + + diff --git a/docs/test_cases/t00018.md b/docs/test_cases/t00018.md index 639523e5..90b5ad80 100644 --- a/docs/test_cases/t00018.md +++ b/docs/test_cases/t00018.md @@ -142,7 +142,7 @@ void widget::draw(const clanguml::t00018::widget &w) { "bases": [], "display_name": "impl::widget", - "id": "130502639682787993", + "id": "1044021117462303949", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -277,7 +277,7 @@ void widget::draw(const clanguml::t00018::widget &w) { "bases": [], "display_name": "widget", - "id": "1005661284373854088", + "id": "8045290274990832704", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -593,15 +593,15 @@ void widget::draw(const clanguml::t00018::widget &w) "relationships": [ { "access": "public", - "destination": "1005661284373854088", - "source": "130502639682787993", + "destination": "8045290274990832704", + "source": "1044021117462303949", "type": "dependency" }, { "access": "private", - "destination": "130502639682787993", + "destination": "1044021117462303949", "label": "pImpl", - "source": "1005661284373854088", + "source": "8045290274990832704", "type": "aggregation" } ], diff --git a/docs/test_cases/t00018_class.svg b/docs/test_cases/t00018_class.svg index 8ded8435..b2a434b5 100644 --- a/docs/test_cases/t00018_class.svg +++ b/docs/test_cases/t00018_class.svg @@ -1,6 +1,6 @@ - + @@ -9,126 +9,126 @@ - - + + 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> - + - + pImpl diff --git a/docs/test_cases/t00018_class_mermaid.svg b/docs/test_cases/t00018_class_mermaid.svg index 4ac32bba..8bc94297 100644 --- a/docs/test_cases/t00018_class_mermaid.svg +++ b/docs/test_cases/t00018_class_mermaid.svg @@ -78,8 +78,8 @@ - - + + @@ -117,8 +117,8 @@ - - + + diff --git a/docs/test_cases/t00019.md b/docs/test_cases/t00019.md index c4e9c510..4b52a2ed 100644 --- a/docs/test_cases/t00019.md +++ b/docs/test_cases/t00019.md @@ -163,7 +163,7 @@ class Base { { "bases": [], "display_name": "Base", - "id": "261668487476634123", + "id": "2093347899813072991", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -298,7 +298,7 @@ class Base { { "bases": [], "display_name": "Layer1", - "id": "902631298537519271", + "id": "7221050388300154171", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -384,7 +384,7 @@ class Base { { "bases": [], "display_name": "Layer2", - "id": "1115150925302580647", + "id": "8921207402420645183", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -442,7 +442,7 @@ class Base { { "bases": [], "display_name": "Layer3", - "id": "1853410560073854945", + "id": "14827284480590839565", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -610,13 +610,13 @@ class Base { "bases": [ { "access": "public", - "id": "261668487476634123", + "id": "2093347899813072991", "is_virtual": false, "name": "clanguml::t00019::Base" } ], "display_name": "Layer3", - "id": "972890420743280319", + "id": "7783123365946242556", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -646,13 +646,13 @@ class Base { "bases": [ { "access": "public", - "id": "972890420743280319", + "id": "7783123365946242556", "is_virtual": false, "name": "clanguml::t00019::Layer3" } ], "display_name": "Layer2>", - "id": "129784999866998870", + "id": "1038279998935990962", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -689,13 +689,13 @@ class Base { "bases": [ { "access": "public", - "id": "129784999866998870", + "id": "1038279998935990962", "is_virtual": false, "name": "clanguml::t00019::Layer2>" } ], "display_name": "Layer1>>", - "id": "659076058325663708", + "id": "5272608466605309667", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -738,7 +738,7 @@ class Base { { "bases": [], "display_name": "A", - "id": "1015164998787089197", + "id": "8121319990296713582", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -776,45 +776,45 @@ class Base { "relationships": [ { "access": "public", - "destination": "1853410560073854945", - "source": "972890420743280319", + "destination": "14827284480590839565", + "source": "7783123365946242556", "type": "instantiation" }, { "access": "public", - "destination": "261668487476634123", - "source": "972890420743280319", + "destination": "2093347899813072991", + "source": "7783123365946242556", "type": "extension" }, { "access": "public", - "destination": "1115150925302580647", - "source": "129784999866998870", + "destination": "8921207402420645183", + "source": "1038279998935990962", "type": "instantiation" }, { "access": "public", - "destination": "972890420743280319", - "source": "129784999866998870", + "destination": "7783123365946242556", + "source": "1038279998935990962", "type": "extension" }, { "access": "public", - "destination": "902631298537519271", - "source": "659076058325663708", + "destination": "7221050388300154171", + "source": "5272608466605309667", "type": "instantiation" }, { "access": "public", - "destination": "129784999866998870", - "source": "659076058325663708", + "destination": "1038279998935990962", + "source": "5272608466605309667", "type": "extension" }, { "access": "public", - "destination": "659076058325663708", + "destination": "5272608466605309667", "label": "layers", - "source": "1015164998787089197", + "source": "8121319990296713582", "type": "aggregation" } ], diff --git a/docs/test_cases/t00019_class.svg b/docs/test_cases/t00019_class.svg index e39bc597..d9b9a8d9 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,50 +96,50 @@ LowerLayer - + - + m1() : int - + - + m1_calls() const : int - + - + m2() : std::string - + - + m2_calls() const : int - + - + m_m1_calls : int - + - + m_m2_calls : int - + Layer3 @@ -147,7 +147,7 @@ Base - + Layer2 @@ -155,7 +155,7 @@ Layer3<Base> - + Layer1 @@ -163,34 +163,34 @@ Layer2<Layer3<Base>> - - + + A - + - + layers : std::unique_ptr<Layer1<Layer2<Layer3<Base>>>> - + - + - + - + - + - + - + layers diff --git a/docs/test_cases/t00019_class_mermaid.svg b/docs/test_cases/t00019_class_mermaid.svg index 4f371d09..c4d7acb7 100644 --- a/docs/test_cases/t00019_class_mermaid.svg +++ b/docs/test_cases/t00019_class_mermaid.svg @@ -132,8 +132,8 @@ - - + + @@ -171,8 +171,8 @@ - - + + @@ -200,8 +200,8 @@ - - + + @@ -224,8 +224,8 @@ - - + + @@ -273,8 +273,8 @@ - - + + @@ -292,8 +292,8 @@ - - + + @@ -311,8 +311,8 @@ - - + + @@ -330,8 +330,8 @@ - - + + diff --git a/docs/test_cases/t00020.md b/docs/test_cases/t00020.md index 4413ea2b..8dcbd142 100644 --- a/docs/test_cases/t00020.md +++ b/docs/test_cases/t00020.md @@ -12,11 +12,16 @@ diagrams: - clanguml::t00020 plantuml: after: - - '@A(ProductA1) <.. @A(Factory1)' - - '@A(ProductB1) <.. @A(Factory1)' - - '{{ alias("ProductA2") }} <.. {{ alias("Factory2") }}' - - '{{ alias("ProductB2") }} <.. {{ alias("Factory2") }}' - + - '@A(Factory1) ..> @A(ProductA1)' + - '@A(Factory1) ..> @A(ProductB1)' + - '{{ alias("Factory2") }} ..> {{ alias("ProductA2") }}' + - '{{ alias("Factory2") }} ..> {{ alias("ProductB2") }}' + mermaid: + after: + - '@A(Factory1) ..> @A(ProductA1)' + - '@A(Factory1) ..> @A(ProductB1)' + - '{{ alias("Factory2") }} ..> {{ alias("ProductA2") }}' + - '{{ alias("Factory2") }} ..> {{ alias("ProductB2") }}' ``` ## Source code File `tests/t00020/t00020.cc` @@ -105,7 +110,7 @@ public: { "bases": [], "display_name": "ProductA", - "id": "425267229659464944", + "id": "3402137837275719558", "is_abstract": true, "is_nested": false, "is_struct": false, @@ -190,13 +195,13 @@ public: "bases": [ { "access": "public", - "id": "425267229659464944", + "id": "3402137837275719558", "is_virtual": false, "name": "clanguml::t00020::ProductA" } ], "display_name": "ProductA1", - "id": "1756496029797864207", + "id": "14051968238382913662", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -253,13 +258,13 @@ public: "bases": [ { "access": "public", - "id": "425267229659464944", + "id": "3402137837275719558", "is_virtual": false, "name": "clanguml::t00020::ProductA" } ], "display_name": "ProductA2", - "id": "1531708592885216981", + "id": "12253668743081735855", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -315,7 +320,7 @@ public: { "bases": [], "display_name": "ProductB", - "id": "2235759006374865842", + "id": "17886072050998926742", "is_abstract": true, "is_nested": false, "is_struct": false, @@ -400,13 +405,13 @@ public: "bases": [ { "access": "public", - "id": "2235759006374865842", + "id": "17886072050998926742", "is_virtual": false, "name": "clanguml::t00020::ProductB" } ], "display_name": "ProductB1", - "id": "1465493024233223845", + "id": "11723944193865790765", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -463,13 +468,13 @@ public: "bases": [ { "access": "public", - "id": "2235759006374865842", + "id": "17886072050998926742", "is_virtual": false, "name": "clanguml::t00020::ProductB" } ], "display_name": "ProductB2", - "id": "2154665562370057871", + "id": "17237324498960462969", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -525,7 +530,7 @@ public: { "bases": [], "display_name": "AbstractFactory", - "id": "1705546469218961425", + "id": "13644371753751691404", "is_abstract": true, "is_nested": false, "is_struct": false, @@ -605,13 +610,13 @@ public: "bases": [ { "access": "public", - "id": "1705546469218961425", + "id": "13644371753751691404", "is_virtual": false, "name": "clanguml::t00020::AbstractFactory" } ], "display_name": "Factory1", - "id": "692346848484854107", + "id": "5538774787878832856", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -691,13 +696,13 @@ public: "bases": [ { "access": "public", - "id": "1705546469218961425", + "id": "13644371753751691404", "is_virtual": false, "name": "clanguml::t00020::AbstractFactory" } ], "display_name": "Factory2", - "id": "1566325870805013023", + "id": "12530606966440104191", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -779,74 +784,74 @@ public: "relationships": [ { "access": "public", - "destination": "425267229659464944", - "source": "1756496029797864207", + "destination": "3402137837275719558", + "source": "14051968238382913662", "type": "extension" }, { "access": "public", - "destination": "425267229659464944", - "source": "1531708592885216981", + "destination": "3402137837275719558", + "source": "12253668743081735855", "type": "extension" }, { "access": "public", - "destination": "2235759006374865842", - "source": "1465493024233223845", + "destination": "17886072050998926742", + "source": "11723944193865790765", "type": "extension" }, { "access": "public", - "destination": "2235759006374865842", - "source": "2154665562370057871", + "destination": "17886072050998926742", + "source": "17237324498960462969", "type": "extension" }, { "access": "public", - "destination": "425267229659464944", - "source": "1705546469218961425", + "destination": "3402137837275719558", + "source": "13644371753751691404", "type": "dependency" }, { "access": "public", - "destination": "2235759006374865842", - "source": "1705546469218961425", + "destination": "17886072050998926742", + "source": "13644371753751691404", "type": "dependency" }, { "access": "public", - "destination": "425267229659464944", - "source": "692346848484854107", + "destination": "3402137837275719558", + "source": "5538774787878832856", "type": "dependency" }, { "access": "public", - "destination": "2235759006374865842", - "source": "692346848484854107", + "destination": "17886072050998926742", + "source": "5538774787878832856", "type": "dependency" }, { "access": "public", - "destination": "1705546469218961425", - "source": "692346848484854107", + "destination": "13644371753751691404", + "source": "5538774787878832856", "type": "extension" }, { "access": "public", - "destination": "425267229659464944", - "source": "1566325870805013023", + "destination": "3402137837275719558", + "source": "12530606966440104191", "type": "dependency" }, { "access": "public", - "destination": "2235759006374865842", - "source": "1566325870805013023", + "destination": "17886072050998926742", + "source": "12530606966440104191", "type": "dependency" }, { "access": "public", - "destination": "1705546469218961425", - "source": "1566325870805013023", + "destination": "13644371753751691404", + "source": "12530606966440104191", "type": "extension" } ], diff --git a/docs/test_cases/t00020_class.svg b/docs/test_cases/t00020_class.svg index d349c17b..5f332a57 100644 --- a/docs/test_cases/t00020_class.svg +++ b/docs/test_cases/t00020_class.svg @@ -1,6 +1,6 @@ - + - + @@ -9,209 +9,209 @@ - - - - - ProductA - + + + + + ProductA + - - - + + + - - ~ProductA() constexpr = default : void + + ~ProductA() constexpr = default : void - - - - + + + + - - sell(int price) const = 0 : bool + + sell(int price) const = 0 : bool - - - - - - ProductA1 - + + + + + + ProductA1 + - - - + + + - - sell(int price) const : bool + + sell(int price) const : bool - - - - - - ProductA2 - + + + + + + ProductA2 + - - - + + + - - sell(int price) const : bool + + sell(int price) const : bool - - - - - - ProductB - + + + + + + ProductB + - - - + + + - - ~ProductB() constexpr = default : void + + ~ProductB() constexpr = default : void - - - - + + + + - - buy(int price) const = 0 : bool + + buy(int price) const = 0 : bool - - - - - - ProductB1 - + + + + + + ProductB1 + - - - + + + - - buy(int price) const : bool + + buy(int price) const : bool - - - - - - ProductB2 - + + + + + + ProductB2 + - - - + + + - - buy(int price) const : bool + + buy(int price) const : bool - - - - - - AbstractFactory - + + + + + + AbstractFactory + - - - + + + - - make_a() const = 0 : std::unique_ptr<ProductA> + + make_a() const = 0 : std::unique_ptr<ProductA> - - - + + + - - make_b() const = 0 : std::unique_ptr<ProductB> + + make_b() const = 0 : std::unique_ptr<ProductB> - - - - - - Factory1 - + + + + + + Factory1 + - - - + + + - - make_a() const : std::unique_ptr<ProductA> + + make_a() const : std::unique_ptr<ProductA> - - - + + + - - make_b() const : std::unique_ptr<ProductB> + + make_b() const : std::unique_ptr<ProductB> - - - - - - Factory2 - + + + + + + Factory2 + - - - + + + - - make_a() const : std::unique_ptr<ProductA> + + make_a() const : std::unique_ptr<ProductA> - - - + + + - - make_b() const : std::unique_ptr<ProductB> + + make_b() const : std::unique_ptr<ProductB> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/test_cases/t00020_class_mermaid.svg b/docs/test_cases/t00020_class_mermaid.svg index 96991909..76778d9b 100644 --- a/docs/test_cases/t00020_class_mermaid.svg +++ b/docs/test_cases/t00020_class_mermaid.svg @@ -1,4 +1,4 @@ - + @@ -50,18 +50,22 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -184,10 +188,46 @@ + + + +
+ +
+ + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + +
+ +
+ + + - - + + @@ -215,8 +255,8 @@ - - + + @@ -239,8 +279,8 @@ - - + + @@ -263,8 +303,8 @@ - - + + @@ -292,8 +332,8 @@ - - + + @@ -316,8 +356,8 @@ - - + + @@ -340,8 +380,8 @@ - - + + @@ -369,8 +409,8 @@ - - + + @@ -398,8 +438,8 @@ - - + + diff --git a/docs/test_cases/t00021.md b/docs/test_cases/t00021.md index 61934cfc..7c074c43 100644 --- a/docs/test_cases/t00021.md +++ b/docs/test_cases/t00021.md @@ -79,7 +79,7 @@ public: { "bases": [], "display_name": "Visitor", - "id": "1668671110672744395", + "id": "13349368885381955166", "is_abstract": true, "is_nested": false, "is_struct": false, @@ -197,13 +197,13 @@ public: "bases": [ { "access": "public", - "id": "1668671110672744395", + "id": "13349368885381955166", "is_virtual": false, "name": "clanguml::t00021::Visitor" } ], "display_name": "Visitor1", - "id": "1028369219400401946", + "id": "8226953755203215571", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -293,13 +293,13 @@ public: "bases": [ { "access": "public", - "id": "1668671110672744395", + "id": "13349368885381955166", "is_virtual": false, "name": "clanguml::t00021::Visitor" } ], "display_name": "Visitor2", - "id": "1710373315476287130", + "id": "13682986523810297046", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -389,13 +389,13 @@ public: "bases": [ { "access": "public", - "id": "1668671110672744395", + "id": "13349368885381955166", "is_virtual": false, "name": "clanguml::t00021::Visitor" } ], "display_name": "Visitor3", - "id": "1399026228179178025", + "id": "11192209825433424201", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -484,7 +484,7 @@ public: { "bases": [], "display_name": "Item", - "id": "1491568826758947722", + "id": "11932550614071581777", "is_abstract": true, "is_nested": false, "is_struct": false, @@ -569,13 +569,13 @@ public: "bases": [ { "access": "public", - "id": "1491568826758947722", + "id": "11932550614071581777", "is_virtual": false, "name": "clanguml::t00021::Item" } ], "display_name": "A", - "id": "1494142745564026823", + "id": "11953141964512214591", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -632,13 +632,13 @@ public: "bases": [ { "access": "public", - "id": "1491568826758947722", + "id": "11932550614071581777", "is_virtual": false, "name": "clanguml::t00021::Item" } ], "display_name": "B", - "id": "1452948650450999568", + "id": "11623589203607996547", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -697,98 +697,98 @@ public: "relationships": [ { "access": "public", - "destination": "1494142745564026823", - "source": "1668671110672744395", + "destination": "11953141964512214591", + "source": "13349368885381955166", "type": "dependency" }, { "access": "public", - "destination": "1452948650450999568", - "source": "1668671110672744395", + "destination": "11623589203607996547", + "source": "13349368885381955166", "type": "dependency" }, { "access": "public", - "destination": "1494142745564026823", - "source": "1028369219400401946", + "destination": "11953141964512214591", + "source": "8226953755203215571", "type": "dependency" }, { "access": "public", - "destination": "1452948650450999568", - "source": "1028369219400401946", + "destination": "11623589203607996547", + "source": "8226953755203215571", "type": "dependency" }, { "access": "public", - "destination": "1668671110672744395", - "source": "1028369219400401946", + "destination": "13349368885381955166", + "source": "8226953755203215571", "type": "extension" }, { "access": "public", - "destination": "1494142745564026823", - "source": "1710373315476287130", + "destination": "11953141964512214591", + "source": "13682986523810297046", "type": "dependency" }, { "access": "public", - "destination": "1452948650450999568", - "source": "1710373315476287130", + "destination": "11623589203607996547", + "source": "13682986523810297046", "type": "dependency" }, { "access": "public", - "destination": "1668671110672744395", - "source": "1710373315476287130", + "destination": "13349368885381955166", + "source": "13682986523810297046", "type": "extension" }, { "access": "public", - "destination": "1494142745564026823", - "source": "1399026228179178025", + "destination": "11953141964512214591", + "source": "11192209825433424201", "type": "dependency" }, { "access": "public", - "destination": "1452948650450999568", - "source": "1399026228179178025", + "destination": "11623589203607996547", + "source": "11192209825433424201", "type": "dependency" }, { "access": "public", - "destination": "1668671110672744395", - "source": "1399026228179178025", + "destination": "13349368885381955166", + "source": "11192209825433424201", "type": "extension" }, { "access": "public", - "destination": "1668671110672744395", - "source": "1491568826758947722", + "destination": "13349368885381955166", + "source": "11932550614071581777", "type": "dependency" }, { "access": "public", - "destination": "1668671110672744395", - "source": "1494142745564026823", + "destination": "13349368885381955166", + "source": "11953141964512214591", "type": "dependency" }, { "access": "public", - "destination": "1491568826758947722", - "source": "1494142745564026823", + "destination": "11932550614071581777", + "source": "11953141964512214591", "type": "extension" }, { "access": "public", - "destination": "1668671110672744395", - "source": "1452948650450999568", + "destination": "13349368885381955166", + "source": "11623589203607996547", "type": "dependency" }, { "access": "public", - "destination": "1491568826758947722", - "source": "1452948650450999568", + "destination": "11932550614071581777", + "source": "11623589203607996547", "type": "extension" } ], diff --git a/docs/test_cases/t00021_class.svg b/docs/test_cases/t00021_class.svg index a29e41e2..85decc98 100644 --- a/docs/test_cases/t00021_class.svg +++ b/docs/test_cases/t00021_class.svg @@ -1,6 +1,6 @@ - + @@ -9,186 +9,186 @@ - - + + 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 8c96e277..43d44031 100644 --- a/docs/test_cases/t00021_class_mermaid.svg +++ b/docs/test_cases/t00021_class_mermaid.svg @@ -236,8 +236,8 @@ - - + + @@ -270,8 +270,8 @@ - - + + @@ -299,8 +299,8 @@ - - + + @@ -328,8 +328,8 @@ - - + + @@ -357,8 +357,8 @@ - - + + @@ -386,8 +386,8 @@ - - + + @@ -410,8 +410,8 @@ - - + + diff --git a/docs/test_cases/t00022.md b/docs/test_cases/t00022.md index 1a3b41f6..f3b221e4 100644 --- a/docs/test_cases/t00022.md +++ b/docs/test_cases/t00022.md @@ -60,7 +60,7 @@ protected: { "bases": [], "display_name": "A", - "id": "2012435893382068755", + "id": "16099487147056550046", "is_abstract": true, "is_nested": false, "is_struct": false, @@ -168,13 +168,13 @@ protected: "bases": [ { "access": "public", - "id": "2012435893382068755", + "id": "16099487147056550046", "is_virtual": false, "name": "clanguml::t00022::A" } ], "display_name": "A1", - "id": "2282061426381077447", + "id": "18256491411048619579", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -254,13 +254,13 @@ protected: "bases": [ { "access": "public", - "id": "2012435893382068755", + "id": "16099487147056550046", "is_virtual": false, "name": "clanguml::t00022::A" } ], "display_name": "A2", - "id": "158819862916671538", + "id": "1270558903333372307", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -342,14 +342,14 @@ protected: "relationships": [ { "access": "public", - "destination": "2012435893382068755", - "source": "2282061426381077447", + "destination": "16099487147056550046", + "source": "18256491411048619579", "type": "extension" }, { "access": "public", - "destination": "2012435893382068755", - "source": "158819862916671538", + "destination": "16099487147056550046", + "source": "1270558903333372307", "type": "extension" } ], diff --git a/docs/test_cases/t00022_class.svg b/docs/test_cases/t00022_class.svg index 97138179..8a70b0c1 100644 --- a/docs/test_cases/t00022_class.svg +++ b/docs/test_cases/t00022_class.svg @@ -1,6 +1,6 @@ - + @@ -9,82 +9,82 @@ - - + + 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 f8ed4250..0ca6aa15 100644 --- a/docs/test_cases/t00022_class_mermaid.svg +++ b/docs/test_cases/t00022_class_mermaid.svg @@ -74,8 +74,8 @@ - - + + @@ -108,8 +108,8 @@ - - + + @@ -137,8 +137,8 @@ - - + + diff --git a/docs/test_cases/t00023.md b/docs/test_cases/t00023.md index ff72e480..bfa359d2 100644 --- a/docs/test_cases/t00023.md +++ b/docs/test_cases/t00023.md @@ -69,7 +69,7 @@ private: { "bases": [], "display_name": "Strategy", - "id": "1469857696438841976", + "id": "11758861571510735814", "is_abstract": true, "is_nested": false, "is_struct": false, @@ -149,13 +149,13 @@ private: "bases": [ { "access": "public", - "id": "1469857696438841976", + "id": "11758861571510735814", "is_virtual": false, "name": "clanguml::t00023::Strategy" } ], "display_name": "StrategyA", - "id": "1245533075819635385", + "id": "9964264606557083084", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -207,13 +207,13 @@ private: "bases": [ { "access": "public", - "id": "1469857696438841976", + "id": "11758861571510735814", "is_virtual": false, "name": "clanguml::t00023::Strategy" } ], "display_name": "StrategyB", - "id": "264986406899645", + "id": "2119891255197167", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -265,13 +265,13 @@ private: "bases": [ { "access": "public", - "id": "1469857696438841976", + "id": "11758861571510735814", "is_virtual": false, "name": "clanguml::t00023::Strategy" } ], "display_name": "StrategyC", - "id": "174795176193483089", + "id": "1398361409547864717", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -322,7 +322,7 @@ private: { "bases": [], "display_name": "Context", - "id": "2038594012979479050", + "id": "16308752103835832406", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -422,27 +422,27 @@ private: "relationships": [ { "access": "public", - "destination": "1469857696438841976", - "source": "1245533075819635385", + "destination": "11758861571510735814", + "source": "9964264606557083084", "type": "extension" }, { "access": "public", - "destination": "1469857696438841976", - "source": "264986406899645", + "destination": "11758861571510735814", + "source": "2119891255197167", "type": "extension" }, { "access": "public", - "destination": "1469857696438841976", - "source": "174795176193483089", + "destination": "11758861571510735814", + "source": "1398361409547864717", "type": "extension" }, { "access": "private", - "destination": "1469857696438841976", + "destination": "11758861571510735814", "label": "m_strategy", - "source": "2038594012979479050", + "source": "16308752103835832406", "type": "aggregation" } ], diff --git a/docs/test_cases/t00023_class.svg b/docs/test_cases/t00023_class.svg index 6908bf52..33798d7b 100644 --- a/docs/test_cases/t00023_class.svg +++ b/docs/test_cases/t00023_class.svg @@ -1,6 +1,6 @@ - + @@ -9,111 +9,111 @@ - - + + 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> - + - + - + - + m_strategy diff --git a/docs/test_cases/t00023_class_mermaid.svg b/docs/test_cases/t00023_class_mermaid.svg index b6fb09a5..857dfae4 100644 --- a/docs/test_cases/t00023_class_mermaid.svg +++ b/docs/test_cases/t00023_class_mermaid.svg @@ -96,8 +96,8 @@ - - + + @@ -125,8 +125,8 @@ - - + + @@ -149,8 +149,8 @@ - - + + @@ -173,8 +173,8 @@ - - + + @@ -197,8 +197,8 @@ - - + + diff --git a/docs/test_cases/t00024.md b/docs/test_cases/t00024.md index 7401f2a7..0d3679cb 100644 --- a/docs/test_cases/t00024.md +++ b/docs/test_cases/t00024.md @@ -68,7 +68,7 @@ private: { "bases": [], "display_name": "Target", - "id": "1116408959993110019", + "id": "8931271679944880159", "is_abstract": true, "is_nested": false, "is_struct": false, @@ -176,13 +176,13 @@ private: "bases": [ { "access": "public", - "id": "1116408959993110019", + "id": "8931271679944880159", "is_virtual": false, "name": "clanguml::t00024::Target" } ], "display_name": "Target1", - "id": "669517069151826610", + "id": "5356136553214612884", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -262,13 +262,13 @@ private: "bases": [ { "access": "public", - "id": "1116408959993110019", + "id": "8931271679944880159", "is_virtual": false, "name": "clanguml::t00024::Target" } ], "display_name": "Target2", - "id": "1210513233906695933", + "id": "9684105871253567467", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -348,13 +348,13 @@ private: "bases": [ { "access": "public", - "id": "1116408959993110019", + "id": "8931271679944880159", "is_virtual": false, "name": "clanguml::t00024::Target" } ], "display_name": "Proxy", - "id": "594707401639991215", + "id": "4757659213119929724", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -482,27 +482,27 @@ private: "relationships": [ { "access": "public", - "destination": "1116408959993110019", - "source": "669517069151826610", + "destination": "8931271679944880159", + "source": "5356136553214612884", "type": "extension" }, { "access": "public", - "destination": "1116408959993110019", - "source": "1210513233906695933", + "destination": "8931271679944880159", + "source": "9684105871253567467", "type": "extension" }, { "access": "private", - "destination": "1116408959993110019", + "destination": "8931271679944880159", "label": "m_target", - "source": "594707401639991215", + "source": "4757659213119929724", "type": "association" }, { "access": "public", - "destination": "1116408959993110019", - "source": "594707401639991215", + "destination": "8931271679944880159", + "source": "4757659213119929724", "type": "extension" } ], diff --git a/docs/test_cases/t00024_class.svg b/docs/test_cases/t00024_class.svg index 3c046ccc..206ca0da 100644 --- a/docs/test_cases/t00024_class.svg +++ b/docs/test_cases/t00024_class.svg @@ -1,6 +1,6 @@ - + @@ -9,126 +9,126 @@ - - + + 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> - + - + - + m_target - + diff --git a/docs/test_cases/t00024_class_mermaid.svg b/docs/test_cases/t00024_class_mermaid.svg index 10896380..a2b1f28f 100644 --- a/docs/test_cases/t00024_class_mermaid.svg +++ b/docs/test_cases/t00024_class_mermaid.svg @@ -96,8 +96,8 @@ - - + + @@ -130,8 +130,8 @@ - - + + @@ -159,8 +159,8 @@ - - + + @@ -188,8 +188,8 @@ - - + + diff --git a/docs/test_cases/t00025.md b/docs/test_cases/t00025.md index b254b348..a42a22d7 100644 --- a/docs/test_cases/t00025.md +++ b/docs/test_cases/t00025.md @@ -66,7 +66,7 @@ public: { "bases": [], "display_name": "Target1", - "id": "1573849034571194138", + "id": "12590792276569553107", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -145,7 +145,7 @@ public: { "bases": [], "display_name": "Target2", - "id": "751896409461834669", + "id": "6015171275694677358", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -224,7 +224,7 @@ public: { "bases": [], "display_name": "Proxy", - "id": "1483353300536405088", + "id": "11866826404291240710", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -356,7 +356,7 @@ public: { "bases": [], "display_name": "Proxy", - "id": "1644966842838139424", + "id": "13159734742705115399", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -385,7 +385,7 @@ public: { "bases": [], "display_name": "Proxy", - "id": "1190103100236298763", + "id": "9520824801890390106", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -414,7 +414,7 @@ public: { "bases": [], "display_name": "ProxyHolder", - "id": "1906317303950647748", + "id": "15250538431605181984", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -464,40 +464,40 @@ public: "relationships": [ { "access": "public", - "destination": "1573849034571194138", - "source": "1644966842838139424", + "destination": "12590792276569553107", + "source": "13159734742705115399", "type": "dependency" }, { "access": "public", - "destination": "1483353300536405088", - "source": "1644966842838139424", + "destination": "11866826404291240710", + "source": "13159734742705115399", "type": "instantiation" }, { "access": "public", - "destination": "751896409461834669", - "source": "1190103100236298763", + "destination": "6015171275694677358", + "source": "9520824801890390106", "type": "dependency" }, { "access": "public", - "destination": "1483353300536405088", - "source": "1190103100236298763", + "destination": "11866826404291240710", + "source": "9520824801890390106", "type": "instantiation" }, { "access": "public", - "destination": "1644966842838139424", + "destination": "13159734742705115399", "label": "proxy1", - "source": "1906317303950647748", + "source": "15250538431605181984", "type": "aggregation" }, { "access": "public", - "destination": "1190103100236298763", + "destination": "9520824801890390106", "label": "proxy2", - "source": "1906317303950647748", + "source": "15250538431605181984", "type": "aggregation" } ], diff --git a/docs/test_cases/t00025_class.svg b/docs/test_cases/t00025_class.svg index fca77099..1cb1a797 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,41 +112,41 @@ - - + + ProxyHolder - + - + proxy1 : Proxy<Target1> - + - + proxy2 : Proxy<Target2> - + - + - + - + - + proxy1 - + proxy2 diff --git a/docs/test_cases/t00025_class_mermaid.svg b/docs/test_cases/t00025_class_mermaid.svg index 50c7d8ac..1dddda64 100644 --- a/docs/test_cases/t00025_class_mermaid.svg +++ b/docs/test_cases/t00025_class_mermaid.svg @@ -126,8 +126,8 @@ - - + + @@ -155,8 +155,8 @@ - - + + @@ -184,8 +184,8 @@ - - + + @@ -223,8 +223,8 @@ - - + + @@ -242,8 +242,8 @@ - - + + @@ -261,8 +261,8 @@ - - + + diff --git a/docs/test_cases/t00026.md b/docs/test_cases/t00026.md index 24f55bf0..271718dd 100644 --- a/docs/test_cases/t00026.md +++ b/docs/test_cases/t00026.md @@ -87,7 +87,7 @@ struct StringMemento { { "bases": [], "display_name": "Memento", - "id": "1241204213727905390", + "id": "9929633709823243122", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -191,7 +191,7 @@ struct StringMemento { { "bases": [], "display_name": "Originator", - "id": "1324770803720816727", + "id": "10598166429766533816", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -389,7 +389,7 @@ struct StringMemento { { "bases": [], "display_name": "Caretaker", - "id": "2032715387182792204", + "id": "16261723097462337632", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -502,7 +502,7 @@ struct StringMemento { { "bases": [], "display_name": "Caretaker", - "id": "1708482137721157489", + "id": "13667857101769259918", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -531,7 +531,7 @@ struct StringMemento { { "bases": [], "display_name": "Originator", - "id": "1014247960805363560", + "id": "8113983686442908481", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -560,7 +560,7 @@ struct StringMemento { { "bases": [], "display_name": "StringMemento", - "id": "851750942915129289", + "id": "6814007543321034313", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -610,47 +610,47 @@ struct StringMemento { "relationships": [ { "access": "public", - "destination": "1241204213727905390", - "source": "1324770803720816727", + "destination": "9929633709823243122", + "source": "10598166429766533816", "type": "dependency" }, { "access": "public", - "destination": "1241204213727905390", - "source": "1324770803720816727", + "destination": "9929633709823243122", + "source": "10598166429766533816", "type": "dependency" }, { "access": "private", - "destination": "1241204213727905390", + "destination": "9929633709823243122", "label": "m_mementos", - "source": "2032715387182792204", + "source": "16261723097462337632", "type": "aggregation" }, { "access": "public", - "destination": "2032715387182792204", - "source": "1708482137721157489", + "destination": "16261723097462337632", + "source": "13667857101769259918", "type": "instantiation" }, { "access": "public", - "destination": "1324770803720816727", - "source": "1014247960805363560", + "destination": "10598166429766533816", + "source": "8113983686442908481", "type": "instantiation" }, { "access": "public", - "destination": "1708482137721157489", + "destination": "13667857101769259918", "label": "caretaker", - "source": "851750942915129289", + "source": "6814007543321034313", "type": "aggregation" }, { "access": "public", - "destination": "1014247960805363560", + "destination": "8113983686442908481", "label": "originator", - "source": "851750942915129289", + "source": "6814007543321034313", "type": "aggregation" } ], diff --git a/docs/test_cases/t00026_class.svg b/docs/test_cases/t00026_class.svg index 5a7a120f..4dd5ae3e 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,43 +145,43 @@ - - + + StringMemento - + - + caretaker : Caretaker<std::string> - + - + originator : Originator<std::string> - + - + m_mementos - + - + - + caretaker - + originator diff --git a/docs/test_cases/t00026_class_mermaid.svg b/docs/test_cases/t00026_class_mermaid.svg index d14a0c74..79425194 100644 --- a/docs/test_cases/t00026_class_mermaid.svg +++ b/docs/test_cases/t00026_class_mermaid.svg @@ -126,8 +126,8 @@ - - + + @@ -160,8 +160,8 @@ - - + + @@ -209,8 +209,8 @@ - - + + @@ -243,8 +243,8 @@ - - + + @@ -262,8 +262,8 @@ - - + + @@ -281,8 +281,8 @@ - - + + diff --git a/docs/test_cases/t00027.md b/docs/test_cases/t00027.md index 863942b9..2972ca26 100644 --- a/docs/test_cases/t00027.md +++ b/docs/test_cases/t00027.md @@ -84,7 +84,7 @@ struct Window { { "bases": [], "display_name": "Shape", - "id": "1593092483959332221", + "id": "12744739871674657768", "is_abstract": true, "is_nested": false, "is_struct": false, @@ -163,7 +163,7 @@ struct Window { { "bases": [], "display_name": "Line", - "id": "1568932879061562228", + "id": "12551463032492497828", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -186,19 +186,19 @@ struct Window { "bases": [ { "access": "public", - "id": "1593092483959332221", + "id": "12744739871674657768", "is_virtual": false, "name": "clanguml::t00027::Shape" }, { "access": "public", - "id": "2184609081997324211", + "id": "17476872655978593693", "is_virtual": false, "name": "clanguml::t00027::Line::T" } ], "display_name": "Line...>", - "id": "142374082478337852", + "id": "1138992659826702823", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -256,7 +256,7 @@ struct Window { { "bases": [], "display_name": "Text", - "id": "1833467466291294724", + "id": "14667739730330357797", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -279,19 +279,19 @@ struct Window { "bases": [ { "access": "public", - "id": "1593092483959332221", + "id": "12744739871674657768", "is_virtual": false, "name": "clanguml::t00027::Shape" }, { "access": "public", - "id": "2247508827463056747", + "id": "17980070619704453980", "is_virtual": false, "name": "clanguml::t00027::Text::T" } ], "display_name": "Text...>", - "id": "1114634647721878603", + "id": "8917077181775028830", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -349,7 +349,7 @@ struct Window { { "bases": [], "display_name": "ShapeDecorator", - "id": "2049188825706164566", + "id": "16393510605649316529", "is_abstract": true, "is_nested": false, "is_struct": true, @@ -401,13 +401,13 @@ struct Window { "bases": [ { "access": "public", - "id": "2049188825706164566", + "id": "16393510605649316529", "is_virtual": false, "name": "clanguml::t00027::ShapeDecorator" } ], "display_name": "Color", - "id": "1473536569433029444", + "id": "11788292555464235555", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -466,13 +466,13 @@ struct Window { "bases": [ { "access": "public", - "id": "2049188825706164566", + "id": "16393510605649316529", "is_virtual": false, "name": "clanguml::t00027::ShapeDecorator" } ], "display_name": "Weight", - "id": "2049455532387561338", + "id": "16395644259100490706", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -530,7 +530,7 @@ struct Window { { "bases": [], "display_name": "Line", - "id": "2082936326417164202", + "id": "16663490611337313620", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -565,7 +565,7 @@ struct Window { { "bases": [], "display_name": "Line", - "id": "675132943535054947", + "id": "5401063548280439576", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -594,7 +594,7 @@ struct Window { { "bases": [], "display_name": "Text", - "id": "1678874302644303776", + "id": "13430994421154430212", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -629,7 +629,7 @@ struct Window { { "bases": [], "display_name": "Text", - "id": "1887786688778664182", + "id": "15102293510229313461", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -658,7 +658,7 @@ struct Window { { "bases": [], "display_name": "Window", - "id": "1373544984027721472", + "id": "10988359872221771779", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -732,90 +732,90 @@ struct Window { "relationships": [ { "access": "public", - "destination": "1593092483959332221", - "source": "142374082478337852", + "destination": "12744739871674657768", + "source": "1138992659826702823", "type": "extension" }, { "access": "public", - "destination": "2184609081997324211", - "source": "142374082478337852", + "destination": "17476872655978593693", + "source": "1138992659826702823", "type": "extension" }, { "access": "public", - "destination": "1593092483959332221", - "source": "1114634647721878603", + "destination": "12744739871674657768", + "source": "8917077181775028830", "type": "extension" }, { "access": "public", - "destination": "2247508827463056747", - "source": "1114634647721878603", + "destination": "17980070619704453980", + "source": "8917077181775028830", "type": "extension" }, { "access": "public", - "destination": "2049188825706164566", - "source": "1473536569433029444", + "destination": "16393510605649316529", + "source": "11788292555464235555", "type": "extension" }, { "access": "public", - "destination": "2049188825706164566", - "source": "2049455532387561338", + "destination": "16393510605649316529", + "source": "16395644259100490706", "type": "extension" }, { "access": "public", - "destination": "142374082478337852", - "source": "2082936326417164202", + "destination": "1138992659826702823", + "source": "16663490611337313620", "type": "instantiation" }, { "access": "public", - "destination": "142374082478337852", - "source": "675132943535054947", + "destination": "1138992659826702823", + "source": "5401063548280439576", "type": "instantiation" }, { "access": "public", - "destination": "1114634647721878603", - "source": "1678874302644303776", + "destination": "8917077181775028830", + "source": "13430994421154430212", "type": "instantiation" }, { "access": "public", - "destination": "1114634647721878603", - "source": "1887786688778664182", + "destination": "8917077181775028830", + "source": "15102293510229313461", "type": "instantiation" }, { "access": "public", - "destination": "2082936326417164202", + "destination": "16663490611337313620", "label": "border", - "source": "1373544984027721472", + "source": "10988359872221771779", "type": "aggregation" }, { "access": "public", - "destination": "675132943535054947", + "destination": "5401063548280439576", "label": "divider", - "source": "1373544984027721472", + "source": "10988359872221771779", "type": "aggregation" }, { "access": "public", - "destination": "1678874302644303776", + "destination": "13430994421154430212", "label": "title", - "source": "1373544984027721472", + "source": "10988359872221771779", "type": "aggregation" }, { "access": "public", - "destination": "1887786688778664182", + "destination": "15102293510229313461", "label": "description", - "source": "1373544984027721472", + "source": "10988359872221771779", "type": "aggregation" } ], diff --git a/docs/test_cases/t00027_class.svg b/docs/test_cases/t00027_class.svg index 276a764c..92888f75 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,71 +171,71 @@ - - + + Window - + - + border : Line<Color,Weight> - + - + description : Text<Color> - + - + divider : Line<Color> - + - + title : Text<Color,Weight> - + - + - + - + - + - + - + - + - + border - + divider - + title - + description diff --git a/docs/test_cases/t00027_class_mermaid.svg b/docs/test_cases/t00027_class_mermaid.svg index f89ac967..690afea9 100644 --- a/docs/test_cases/t00027_class_mermaid.svg +++ b/docs/test_cases/t00027_class_mermaid.svg @@ -190,8 +190,8 @@ - - + + @@ -219,8 +219,8 @@ - - + + @@ -238,8 +238,8 @@ - - + + @@ -262,8 +262,8 @@ - - + + @@ -281,8 +281,8 @@ - - + + @@ -305,8 +305,8 @@ - - + + @@ -329,8 +329,8 @@ - - + + @@ -353,8 +353,8 @@ - - + + @@ -377,8 +377,8 @@ - - + + @@ -396,8 +396,8 @@ - - + + @@ -415,8 +415,8 @@ - - + + @@ -434,8 +434,8 @@ - - + + @@ -453,8 +453,8 @@ - - + + diff --git a/docs/test_cases/t00028.md b/docs/test_cases/t00028.md index 19e501ab..35c26ac2 100644 --- a/docs/test_cases/t00028.md +++ b/docs/test_cases/t00028.md @@ -97,7 +97,7 @@ class R { "raw": "/// \\uml{note[top] A class note.}" }, "display_name": "A", - "id": "1519850480962783588", + "id": "12158803847702268707", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -123,7 +123,7 @@ class R { "raw": "/// \\uml{note[] B class note.}" }, "display_name": "B", - "id": "1980597091567213070", + "id": "15844776732537704560", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -149,7 +149,7 @@ class R { "raw": "///\n/// @uml{note:t00028_class[bottom] C class note.}\n/// This is class C." }, "display_name": "C", - "id": "984577258575112753", + "id": "7876618068600902026", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -175,7 +175,7 @@ class R { "raw": "/// \\uml{note\n/// D\n/// class\n/// note.}" }, "display_name": "D", - "id": "1263778658518784070", + "id": "10110229268150272562", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -201,7 +201,7 @@ class R { "raw": "/// \\uml{note E template class note.}" }, "display_name": "E", - "id": "1014136565447389473", + "id": "8113092523579115786", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -247,7 +247,7 @@ class R { "raw": "/// \\uml{note:other_diagram[left] G class note.}" }, "display_name": "G", - "id": "764713728396057122", + "id": "6117709827168456983", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -277,7 +277,7 @@ class R { "three" ], "display_name": "F", - "id": "589227897266388677", + "id": "4713823178131109419", "is_nested": false, "name": "F", "namespace": "clanguml::t00028", @@ -292,7 +292,7 @@ class R { { "bases": [], "display_name": "E", - "id": "1949673179441298667", + "id": "15597385435530389340", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -325,7 +325,7 @@ class R { "raw": "/// \\uml{note[right] R class note.}" }, "display_name": "R", - "id": "1189142882239313116", + "id": "9513143057914504932", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -465,50 +465,50 @@ class R { "relationships": [ { "access": "public", - "destination": "1014136565447389473", - "source": "1949673179441298667", + "destination": "8113092523579115786", + "source": "15597385435530389340", "type": "instantiation" }, { "access": "private", - "destination": "1519850480962783588", + "destination": "12158803847702268707", "label": "aaa", - "source": "1189142882239313116", + "source": "9513143057914504932", "type": "aggregation" }, { "access": "private", - "destination": "1980597091567213070", + "destination": "15844776732537704560", "label": "bbb", - "source": "1189142882239313116", + "source": "9513143057914504932", "type": "association" }, { "access": "private", - "destination": "984577258575112753", + "destination": "7876618068600902026", "label": "ccc", - "source": "1189142882239313116", + "source": "9513143057914504932", "type": "association" }, { "access": "private", - "destination": "1263778658518784070", + "destination": "10110229268150272562", "label": "ddd", - "source": "1189142882239313116", + "source": "9513143057914504932", "type": "aggregation" }, { "access": "private", - "destination": "1949673179441298667", + "destination": "15597385435530389340", "label": "eee", - "source": "1189142882239313116", + "source": "9513143057914504932", "type": "aggregation" }, { "access": "private", - "destination": "764713728396057122", + "destination": "6117709827168456983", "label": "ggg", - "source": "1189142882239313116", + "source": "9513143057914504932", "type": "association" } ], diff --git a/docs/test_cases/t00028_class.svg b/docs/test_cases/t00028_class.svg index 5a3c916d..c015a9ea 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,95 +107,95 @@ - - + + R - + - + R(C & c) : void - + - + aaa : A - + - + bbb : B * - + - + ccc : C & - + - + ddd : std::vector<std::shared_ptr<D>> - + - + eee : E<int> - + - + ggg : G ** - + R class note. - + R contains an instance of A. - + Reference to C. - + - + aaa - + bbb - + ccc - + ddd - + eee - + ggg diff --git a/docs/test_cases/t00028_class_mermaid.svg b/docs/test_cases/t00028_class_mermaid.svg index 1a9aa78c..a9da15c2 100644 --- a/docs/test_cases/t00028_class_mermaid.svg +++ b/docs/test_cases/t00028_class_mermaid.svg @@ -218,8 +218,8 @@ - - + + @@ -237,8 +237,8 @@ - - + + @@ -256,8 +256,8 @@ - - + + @@ -275,8 +275,8 @@ - - + + @@ -294,8 +294,8 @@ - - + + @@ -318,8 +318,8 @@ - - + + @@ -337,8 +337,8 @@ - - + + @@ -371,8 +371,8 @@ - - + + @@ -390,8 +390,8 @@ - - + + diff --git a/docs/test_cases/t00029.md b/docs/test_cases/t00029.md index 2574fbed..ba0b268b 100644 --- a/docs/test_cases/t00029.md +++ b/docs/test_cases/t00029.md @@ -76,7 +76,7 @@ struct R { { "bases": [], "display_name": "A", - "id": "1970994826766369014", + "id": "15767958614130952114", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -98,7 +98,7 @@ struct R { { "bases": [], "display_name": "C", - "id": "543766389270348470", + "id": "4350131114162787762", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -144,7 +144,7 @@ struct R { "raw": "/// @uml{skip:t00029_class}" }, "display_name": "D", - "id": "1496914969429483234", + "id": "11975319755435865873", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -183,7 +183,7 @@ struct R { "three" ], "display_name": "E", - "id": "1936873082456592219", + "id": "15494984659652737759", "is_nested": false, "name": "E", "namespace": "clanguml::t00029", @@ -198,7 +198,7 @@ struct R { { "bases": [], "display_name": "G1", - "id": "1980718063838190763", + "id": "15845744510705526108", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -220,7 +220,7 @@ struct R { { "bases": [], "display_name": "G2", - "id": "2204627213593766591", + "id": "17637017708750132732", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -242,7 +242,7 @@ struct R { { "bases": [], "display_name": "G3", - "id": "767180516665070631", + "id": "6137444133320565051", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -264,7 +264,7 @@ struct R { { "bases": [], "display_name": "G4", - "id": "715074622924270214", + "id": "5720596983394161714", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -286,7 +286,7 @@ struct R { { "bases": [], "display_name": "R", - "id": "348749731659902910", + "id": "2789997853279223281", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -352,16 +352,16 @@ struct R { "relationships": [ { "access": "public", - "destination": "1980718063838190763", + "destination": "15845744510705526108", "label": "g1", - "source": "348749731659902910", + "source": "2789997853279223281", "type": "aggregation" }, { "access": "public", - "destination": "715074622924270214", + "destination": "5720596983394161714", "label": "g4", - "source": "348749731659902910", + "source": "2789997853279223281", "type": "association" } ], diff --git a/docs/test_cases/t00029_class.svg b/docs/test_cases/t00029_class.svg index 117a7778..49cdc2ef 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,72 +60,72 @@ three - - + + G1 - - + + G2 - - + + G3 - - + + G4 - - + + R - + - + g1 : G1 - + - + g3 : G3 & - + - + g4 : std::shared_ptr<G4> - + g1 - + g4 diff --git a/docs/test_cases/t00029_class_mermaid.svg b/docs/test_cases/t00029_class_mermaid.svg index 86fb3938..ad2fa549 100644 --- a/docs/test_cases/t00029_class_mermaid.svg +++ b/docs/test_cases/t00029_class_mermaid.svg @@ -78,8 +78,8 @@ - - + + @@ -97,8 +97,8 @@ - - + + @@ -121,8 +121,8 @@ - - + + @@ -145,8 +145,8 @@ - - + + @@ -179,8 +179,8 @@ - - + + @@ -198,8 +198,8 @@ - - + + @@ -217,8 +217,8 @@ - - + + @@ -236,8 +236,8 @@ - - + + @@ -255,8 +255,8 @@ - - + + diff --git a/docs/test_cases/t00030.md b/docs/test_cases/t00030.md index c05d7c5b..8196394d 100644 --- a/docs/test_cases/t00030.md +++ b/docs/test_cases/t00030.md @@ -64,7 +64,7 @@ struct R { { "bases": [], "display_name": "A", - "id": "64769484767514424", + "id": "518155878140115392", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -86,7 +86,7 @@ struct R { { "bases": [], "display_name": "B", - "id": "156923198106222307", + "id": "1255385584849778459", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -108,7 +108,7 @@ struct R { { "bases": [], "display_name": "C", - "id": "1651557398557662399", + "id": "13212459188461299198", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -130,7 +130,7 @@ struct R { { "bases": [], "display_name": "D", - "id": "1089781072752262158", + "id": "8718248582018097265", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -152,7 +152,7 @@ struct R { { "bases": [], "display_name": "E", - "id": "425964641881054607", + "id": "3407717135048436859", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -174,7 +174,7 @@ struct R { { "bases": [], "display_name": "R", - "id": "263468735940481091", + "id": "2107749887523848735", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -280,43 +280,43 @@ struct R { "relationships": [ { "access": "public", - "destination": "64769484767514424", + "destination": "518155878140115392", "label": "aaa", - "source": "263468735940481091", + "source": "2107749887523848735", "type": "association" }, { "access": "public", - "destination": "156923198106222307", + "destination": "1255385584849778459", "label": "bbb", "multiplicity_destination": "1..*", "multiplicity_source": "0..1", - "source": "263468735940481091", + "source": "2107749887523848735", "type": "composition" }, { "access": "public", - "destination": "1651557398557662399", + "destination": "13212459188461299198", "label": "ccc", "multiplicity_destination": "1..5", "multiplicity_source": "0..1", - "source": "263468735940481091", + "source": "2107749887523848735", "type": "aggregation" }, { "access": "public", - "destination": "1089781072752262158", + "destination": "8718248582018097265", "label": "ddd", "multiplicity_destination": "1", - "source": "263468735940481091", + "source": "2107749887523848735", "type": "association" }, { "access": "public", - "destination": "425964641881054607", + "destination": "3407717135048436859", "label": "eee", "multiplicity_destination": "1", - "source": "263468735940481091", + "source": "2107749887523848735", "type": "aggregation" } ], diff --git a/docs/test_cases/t00030_class.svg b/docs/test_cases/t00030_class.svg index a00419b2..c5f3eacb 100644 --- a/docs/test_cases/t00030_class.svg +++ b/docs/test_cases/t00030_class.svg @@ -1,6 +1,6 @@ - + @@ -9,111 +9,111 @@ - - + + A - - + + B - - + + C - - + + D - - + + E - - + + R - + - + aaa : A - + - + bbb : std::vector<B> - + - + ccc : std::vector<C> - + - + ddd : D - + - + eee : E * - + aaa - + bbb 0..1 1..* - + ccc 0..1 1..5 - + ddd 1 - + eee diff --git a/docs/test_cases/t00030_class_mermaid.svg b/docs/test_cases/t00030_class_mermaid.svg index ca838d29..b6cefea6 100644 --- a/docs/test_cases/t00030_class_mermaid.svg +++ b/docs/test_cases/t00030_class_mermaid.svg @@ -164,8 +164,8 @@ - - + + @@ -183,8 +183,8 @@ - - + + @@ -202,8 +202,8 @@ - - + + @@ -221,8 +221,8 @@ - - + + @@ -240,8 +240,8 @@ - - + + @@ -259,8 +259,8 @@ - - + + diff --git a/docs/test_cases/t00031.md b/docs/test_cases/t00031.md index 2a2e3ea4..b4a72f64 100644 --- a/docs/test_cases/t00031.md +++ b/docs/test_cases/t00031.md @@ -72,7 +72,7 @@ struct R { "raw": "/// @uml{style[#back:lightgreen|yellow;header:blue/red]}" }, "display_name": "A", - "id": "847775539502907247", + "id": "6782204316023257980", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -102,7 +102,7 @@ struct R { "three" ], "display_name": "B", - "id": "1441796358326382179", + "id": "11534370866611057435", "is_nested": false, "name": "B", "namespace": "clanguml::t00031", @@ -121,7 +121,7 @@ struct R { "raw": "/// @uml{style[#pink;line:red;line.bold;text:red]}" }, "display_name": "C", - "id": "116209144733282955", + "id": "929673157866263642", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -163,7 +163,7 @@ struct R { { "bases": [], "display_name": "D", - "id": "2266534344475505157", + "id": "18132274755804041259", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -185,7 +185,7 @@ struct R { { "bases": [], "display_name": "C", - "id": "208700529175860645", + "id": "1669604233406885166", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -214,7 +214,7 @@ struct R { { "bases": [], "display_name": "R", - "id": "484712092364868032", + "id": "3877696738918944260", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -338,42 +338,42 @@ struct R { "relationships": [ { "access": "public", - "destination": "116209144733282955", - "source": "208700529175860645", + "destination": "929673157866263642", + "source": "1669604233406885166", "type": "instantiation" }, { "access": "public", - "destination": "1441796358326382179", - "source": "484712092364868032", + "destination": "11534370866611057435", + "source": "3877696738918944260", "type": "dependency" }, { "access": "public", - "destination": "847775539502907247", + "destination": "6782204316023257980", "label": "aaa", - "source": "484712092364868032", + "source": "3877696738918944260", "type": "association" }, { "access": "public", - "destination": "1441796358326382179", + "destination": "11534370866611057435", "label": "bbb", - "source": "484712092364868032", + "source": "3877696738918944260", "type": "composition" }, { "access": "public", - "destination": "208700529175860645", + "destination": "1669604233406885166", "label": "ccc", - "source": "484712092364868032", + "source": "3877696738918944260", "type": "aggregation" }, { "access": "public", - "destination": "2266534344475505157", + "destination": "18132274755804041259", "label": "ddd", - "source": "484712092364868032", + "source": "3877696738918944260", "type": "association" } ], diff --git a/docs/test_cases/t00031_class.svg b/docs/test_cases/t00031_class.svg index e6d6f34f..7f86d656 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,66 +73,66 @@ - - + + R - + - + add_b(B b) : void - + - + aaa : A * - + - + bbb : std::vector<B> - + - + ccc : C<int> - + - + ddd : D * - + - + - + bbb - + aaa - + ccc - + ddd diff --git a/docs/test_cases/t00031_class_mermaid.svg b/docs/test_cases/t00031_class_mermaid.svg index 8689df28..c682546b 100644 --- a/docs/test_cases/t00031_class_mermaid.svg +++ b/docs/test_cases/t00031_class_mermaid.svg @@ -126,8 +126,8 @@ - - + + @@ -145,8 +145,8 @@ - - + + @@ -179,8 +179,8 @@ - - + + @@ -203,8 +203,8 @@ - - + + @@ -222,8 +222,8 @@ - - + + @@ -241,8 +241,8 @@ - - + + diff --git a/docs/test_cases/t00032.md b/docs/test_cases/t00032.md index 18d5f5e7..222a9fd7 100644 --- a/docs/test_cases/t00032.md +++ b/docs/test_cases/t00032.md @@ -65,7 +65,7 @@ struct R { { "bases": [], "display_name": "Base", - "id": "1619396229227632210", + "id": "12955169833821057686", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -87,7 +87,7 @@ struct R { { "bases": [], "display_name": "TBase", - "id": "543776954602127752", + "id": "4350215636817022017", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -109,7 +109,7 @@ struct R { { "bases": [], "display_name": "A", - "id": "687909853333071234", + "id": "5503278826664569878", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -160,7 +160,7 @@ struct R { { "bases": [], "display_name": "B", - "id": "737235057776029746", + "id": "5897880462208237975", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -211,7 +211,7 @@ struct R { { "bases": [], "display_name": "C", - "id": "1497964256865073382", + "id": "11983714054920587061", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -263,13 +263,13 @@ struct R { "bases": [ { "access": "public", - "id": "1619396229227632210", + "id": "12955169833821057686", "is_virtual": false, "name": "clanguml::t00032::Base" } ], "display_name": "Overload", - "id": "1463422997970691679", + "id": "11707383983765533439", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -324,31 +324,31 @@ struct R { "bases": [ { "access": "public", - "id": "543776954602127752", + "id": "4350215636817022017", "is_virtual": false, "name": "clanguml::t00032::TBase" }, { "access": "public", - "id": "687909853333071234", + "id": "5503278826664569878", "is_virtual": false, "name": "clanguml::t00032::A" }, { "access": "public", - "id": "737235057776029746", + "id": "5897880462208237975", "is_virtual": false, "name": "clanguml::t00032::B" }, { "access": "public", - "id": "1497964256865073382", + "id": "11983714054920587061", "is_virtual": false, "name": "clanguml::t00032::C" } ], "display_name": "Overload", - "id": "1706455047176879286", + "id": "13651640377415034291", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -401,7 +401,7 @@ struct R { { "bases": [], "display_name": "R", - "id": "85539867332573320", + "id": "684318938660586562", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -439,45 +439,45 @@ struct R { "relationships": [ { "access": "public", - "destination": "1619396229227632210", - "source": "1463422997970691679", + "destination": "12955169833821057686", + "source": "11707383983765533439", "type": "extension" }, { "access": "public", - "destination": "1463422997970691679", - "source": "1706455047176879286", + "destination": "11707383983765533439", + "source": "13651640377415034291", "type": "instantiation" }, { "access": "public", - "destination": "543776954602127752", - "source": "1706455047176879286", + "destination": "4350215636817022017", + "source": "13651640377415034291", "type": "extension" }, { "access": "public", - "destination": "687909853333071234", - "source": "1706455047176879286", + "destination": "5503278826664569878", + "source": "13651640377415034291", "type": "extension" }, { "access": "public", - "destination": "737235057776029746", - "source": "1706455047176879286", + "destination": "5897880462208237975", + "source": "13651640377415034291", "type": "extension" }, { "access": "public", - "destination": "1497964256865073382", - "source": "1706455047176879286", + "destination": "11983714054920587061", + "source": "13651640377415034291", "type": "extension" }, { "access": "public", - "destination": "1706455047176879286", + "destination": "13651640377415034291", "label": "overload", - "source": "85539867332573320", + "source": "684318938660586562", "type": "aggregation" } ], diff --git a/docs/test_cases/t00032_class.svg b/docs/test_cases/t00032_class.svg index 68b71dd8..37449229 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,34 +97,34 @@ - - + + R - + - + overload : Overload<TBase,int,A,B,C> - + - + - + - + - + - + - + overload diff --git a/docs/test_cases/t00032_class_mermaid.svg b/docs/test_cases/t00032_class_mermaid.svg index 21b94936..37bb26dd 100644 --- a/docs/test_cases/t00032_class_mermaid.svg +++ b/docs/test_cases/t00032_class_mermaid.svg @@ -128,8 +128,8 @@ - - + + @@ -147,8 +147,8 @@ - - + + @@ -166,8 +166,8 @@ - - + + @@ -190,8 +190,8 @@ - - + + @@ -214,8 +214,8 @@ - - + + @@ -238,8 +238,8 @@ - - + + @@ -262,8 +262,8 @@ - - + + @@ -281,8 +281,8 @@ - - + + diff --git a/docs/test_cases/t00033.md b/docs/test_cases/t00033.md index 979d39b3..857168a2 100644 --- a/docs/test_cases/t00033.md +++ b/docs/test_cases/t00033.md @@ -60,7 +60,7 @@ struct R { { "bases": [], "display_name": "A", - "id": "2036031998980633871", + "id": "16288255991845070974", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -102,7 +102,7 @@ struct R { { "bases": [], "display_name": "B", - "id": "765515233845859023", + "id": "6124121870766872188", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -144,7 +144,7 @@ struct R { { "bases": [], "display_name": "C", - "id": "1436835384265552869", + "id": "11494683074124422953", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -186,7 +186,7 @@ struct R { { "bases": [], "display_name": "D", - "id": "2199581366769423637", + "id": "17596650934155389102", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -221,7 +221,7 @@ struct R { { "bases": [], "display_name": "C", - "id": "1609446044604054241", + "id": "12875568356832433931", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -250,7 +250,7 @@ struct R { { "bases": [], "display_name": "B>>", - "id": "384927316081978893", + "id": "3079418528655831151", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -293,7 +293,7 @@ struct R { { "bases": [], "display_name": "A>>>", - "id": "1747493965420341251", + "id": "13979951723362730013", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -343,7 +343,7 @@ struct R { { "bases": [], "display_name": "R", - "id": "1866392706312766470", + "id": "14931141650502131764", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -381,45 +381,45 @@ struct R { "relationships": [ { "access": "public", - "destination": "2199581366769423637", - "source": "1609446044604054241", + "destination": "17596650934155389102", + "source": "12875568356832433931", "type": "dependency" }, { "access": "public", - "destination": "1436835384265552869", - "source": "1609446044604054241", + "destination": "11494683074124422953", + "source": "12875568356832433931", "type": "instantiation" }, { "access": "public", - "destination": "1609446044604054241", - "source": "384927316081978893", + "destination": "12875568356832433931", + "source": "3079418528655831151", "type": "dependency" }, { "access": "public", - "destination": "765515233845859023", - "source": "384927316081978893", + "destination": "6124121870766872188", + "source": "3079418528655831151", "type": "instantiation" }, { "access": "public", - "destination": "384927316081978893", - "source": "1747493965420341251", + "destination": "3079418528655831151", + "source": "13979951723362730013", "type": "dependency" }, { "access": "public", - "destination": "2036031998980633871", - "source": "1747493965420341251", + "destination": "16288255991845070974", + "source": "13979951723362730013", "type": "instantiation" }, { "access": "public", - "destination": "1747493965420341251", + "destination": "13979951723362730013", "label": "abc", - "source": "1866392706312766470", + "source": "14931141650502131764", "type": "aggregation" } ], diff --git a/docs/test_cases/t00033_class.svg b/docs/test_cases/t00033_class.svg index ac52a16b..36e118a8 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,34 +105,34 @@ - - + + R - + - + abc : A<B<std::unique_ptr<C<D>>>> - + - + - + - + - + - + - + abc diff --git a/docs/test_cases/t00033_class_mermaid.svg b/docs/test_cases/t00033_class_mermaid.svg index 46e1ce0b..c7bae560 100644 --- a/docs/test_cases/t00033_class_mermaid.svg +++ b/docs/test_cases/t00033_class_mermaid.svg @@ -138,8 +138,8 @@ - - + + @@ -162,8 +162,8 @@ - - + + @@ -186,8 +186,8 @@ - - + + @@ -210,8 +210,8 @@ - - + + @@ -234,8 +234,8 @@ - - + + @@ -253,8 +253,8 @@ - - + + @@ -272,8 +272,8 @@ - - + + @@ -291,8 +291,8 @@ - - + + diff --git a/docs/test_cases/t00034.md b/docs/test_cases/t00034.md index 9aa3cd9f..f6086262 100644 --- a/docs/test_cases/t00034.md +++ b/docs/test_cases/t00034.md @@ -83,7 +83,7 @@ struct R { { "bases": [], "display_name": "Void", - "id": "1704456490210873213", + "id": "13635651921686985707", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -172,7 +172,7 @@ struct R { { "bases": [], "display_name": "lift_void", - "id": "867472442996685316", + "id": "6939779543973482532", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -201,7 +201,7 @@ struct R { { "bases": [], "display_name": "lift_void", - "id": "126450862226197239", + "id": "1011606897809577916", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -230,7 +230,7 @@ struct R { { "bases": [], "display_name": "drop_void", - "id": "1578745816100337706", + "id": "12629966528802701651", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -259,7 +259,7 @@ struct R { { "bases": [], "display_name": "drop_void", - "id": "1849836134504075115", + "id": "14798689076032600924", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -288,7 +288,7 @@ struct R { { "bases": [], "display_name": "A", - "id": "1383912907884688827", + "id": "11071303263077510616", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -310,7 +310,7 @@ struct R { { "bases": [], "display_name": "R", - "id": "1713991735741265309", + "id": "13711933885930122474", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -360,27 +360,27 @@ struct R { "relationships": [ { "access": "public", - "destination": "867472442996685316", - "source": "126450862226197239", + "destination": "6939779543973482532", + "source": "1011606897809577916", "type": "instantiation" }, { "access": "public", - "destination": "1704456490210873213", - "source": "1849836134504075115", + "destination": "13635651921686985707", + "source": "14798689076032600924", "type": "dependency" }, { "access": "public", - "destination": "1578745816100337706", - "source": "1849836134504075115", + "destination": "12629966528802701651", + "source": "14798689076032600924", "type": "instantiation" }, { "access": "public", - "destination": "1383912907884688827", + "destination": "11071303263077510616", "label": "la", - "source": "1713991735741265309", + "source": "13711933885930122474", "type": "association" } ], diff --git a/docs/test_cases/t00034_class.svg b/docs/test_cases/t00034_class.svg index e205c80b..7e8f1809 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,47 +71,47 @@ - - + + A - - + + R - + - + la : lift_void_t<A> * - + - + lv : lift_void_t<void> * - + - + - + - + la - + la diff --git a/docs/test_cases/t00034_class_mermaid.svg b/docs/test_cases/t00034_class_mermaid.svg index 2e145bbb..8513e595 100644 --- a/docs/test_cases/t00034_class_mermaid.svg +++ b/docs/test_cases/t00034_class_mermaid.svg @@ -102,8 +102,8 @@ - - + + @@ -131,8 +131,8 @@ - - + + @@ -150,8 +150,8 @@ - - + + @@ -169,8 +169,8 @@ - - + + @@ -188,8 +188,8 @@ - - + + @@ -207,8 +207,8 @@ - - + + @@ -226,8 +226,8 @@ - - + + diff --git a/docs/test_cases/t00035.md b/docs/test_cases/t00035.md index f06c66a0..1ac78d78 100644 --- a/docs/test_cases/t00035.md +++ b/docs/test_cases/t00035.md @@ -50,7 +50,7 @@ struct Right { }; { "bases": [], "display_name": "Top", - "id": "2241062883697294772", + "id": "17928503069578358181", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -72,7 +72,7 @@ struct Right { }; { "bases": [], "display_name": "Left", - "id": "242562856080127946", + "id": "1940502848641023570", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -94,7 +94,7 @@ struct Right { }; { "bases": [], "display_name": "Center", - "id": "1933304541849408421", + "id": "15466436334795267374", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -116,7 +116,7 @@ struct Right { }; { "bases": [], "display_name": "Bottom", - "id": "1646691079607377420", + "id": "13173528636859019363", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -138,7 +138,7 @@ struct Right { }; { "bases": [], "display_name": "Right", - "id": "200121820090372322", + "id": "1600974560722978582", "is_abstract": false, "is_nested": false, "is_struct": true, diff --git a/docs/test_cases/t00035_class.svg b/docs/test_cases/t00035_class.svg index b5706cd9..c71316bd 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 6eb607cc..8936f55a 100644 --- a/docs/test_cases/t00035_class_mermaid.svg +++ b/docs/test_cases/t00035_class_mermaid.svg @@ -52,8 +52,8 @@ - - + + @@ -71,8 +71,8 @@ - - + + @@ -90,8 +90,8 @@ - - + + @@ -109,8 +109,8 @@ - - + + @@ -128,8 +128,8 @@ - - + + diff --git a/docs/test_cases/t00036.md b/docs/test_cases/t00036.md index 2b45b103..aa462026 100644 --- a/docs/test_cases/t00036.md +++ b/docs/test_cases/t00036.md @@ -82,7 +82,7 @@ struct DImpl : public ns2::ns22::D { }; "yellow" ], "display_name": "E", - "id": "2144761953049158478", + "id": "17158095624393267824", "is_nested": false, "name": "E", "namespace": "clanguml::t00036::ns1", @@ -100,7 +100,7 @@ struct DImpl : public ns2::ns22::D { }; { "bases": [], "display_name": "A", - "id": "571573305652194946", + "id": "4572586445217559573", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -145,7 +145,7 @@ struct DImpl : public ns2::ns22::D { }; { "bases": [], "display_name": "B", - "id": "1964031933563607376", + "id": "15712255468508859011", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -184,7 +184,7 @@ struct DImpl : public ns2::ns22::D { }; { "bases": [], "display_name": "A", - "id": "1832710427462319797", + "id": "14661683419698558378", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -227,7 +227,7 @@ struct DImpl : public ns2::ns22::D { }; { "bases": [], "display_name": "C", - "id": "2038956882066165590", + "id": "16311655056529324727", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -260,15 +260,15 @@ struct DImpl : public ns2::ns22::D { }; "relationships": [ { "access": "public", - "destination": "1832710427462319797", + "destination": "14661683419698558378", "label": "a_int", - "source": "1964031933563607376", + "source": "15712255468508859011", "type": "aggregation" }, { "access": "public", - "destination": "571573305652194946", - "source": "1832710427462319797", + "destination": "4572586445217559573", + "source": "14661683419698558378", "type": "instantiation" } ], diff --git a/docs/test_cases/t00036_class.svg b/docs/test_cases/t00036_class.svg index c3b26e24..bfdfd0f3 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,34 +61,34 @@ - - + + B - + - + a_int : A<int> - - + + C - + a_int - + diff --git a/docs/test_cases/t00036_class_mermaid.svg b/docs/test_cases/t00036_class_mermaid.svg index fcd10e64..21e563fe 100644 --- a/docs/test_cases/t00036_class_mermaid.svg +++ b/docs/test_cases/t00036_class_mermaid.svg @@ -78,8 +78,8 @@ - - + + @@ -107,8 +107,8 @@ - - + + @@ -131,8 +131,8 @@ - - + + @@ -155,8 +155,8 @@ - - + + @@ -174,8 +174,8 @@ - - + + diff --git a/docs/test_cases/t00037.md b/docs/test_cases/t00037.md index d4cd87d9..713d5be7 100644 --- a/docs/test_cases/t00037.md +++ b/docs/test_cases/t00037.md @@ -37,7 +37,11 @@ public: struct { int len; int flags; - } __attribute__((packed)) bars[LENGTH]; + } +#ifndef _MSC_VER + __attribute__((packed)) +#endif + bars[LENGTH]; private: struct { @@ -76,7 +80,7 @@ struct A { { "bases": [], "display_name": "S", - "id": "1511518893976387509", + "id": "12092151151811100076", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -123,7 +127,7 @@ struct A { { "bases": [], "display_name": "ST", - "id": "11203041379038775", + "id": "89624331032310202", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -147,9 +151,9 @@ struct A { "is_static": false, "name": "bars", "source_location": { - "column": 31, + "column": 5, "file": "t00037.cc", - "line": 23, + "line": 27, "translation_unit": "t00037.cc" }, "type": "ST::(bars)[10]" @@ -161,7 +165,7 @@ struct A { "source_location": { "column": 7, "file": "t00037.cc", - "line": 29, + "line": 33, "translation_unit": "t00037.cc" }, "type": "ST::(units)" @@ -173,7 +177,7 @@ struct A { "source_location": { "column": 7, "file": "t00037.cc", - "line": 31, + "line": 35, "translation_unit": "t00037.cc" }, "type": "S[4][3][2]" @@ -194,7 +198,7 @@ struct A { { "bases": [], "display_name": "ST::(dimensions)", - "id": "1980820317972901050", + "id": "15846562543783208401", "is_abstract": false, "is_nested": true, "is_struct": true, @@ -265,7 +269,7 @@ struct A { { "bases": [], "display_name": "ST::(bars)", - "id": "877081436157650289", + "id": "7016651489261202313", "is_abstract": false, "is_nested": true, "is_struct": true, @@ -312,7 +316,7 @@ struct A { { "bases": [], "display_name": "ST::(units)", - "id": "1811145508890403377", + "id": "14489164071123227020", "is_abstract": false, "is_nested": true, "is_struct": true, @@ -326,7 +330,7 @@ struct A { "source_location": { "column": 16, "file": "t00037.cc", - "line": 27, + "line": 31, "translation_unit": "t00037.cc" }, "type": "double" @@ -338,7 +342,7 @@ struct A { "source_location": { "column": 16, "file": "t00037.cc", - "line": 28, + "line": 32, "translation_unit": "t00037.cc" }, "type": "double" @@ -350,7 +354,7 @@ struct A { "source_location": { "column": 5, "file": "t00037.cc", - "line": 26, + "line": 30, "translation_unit": "t00037.cc" }, "template_parameters": [], @@ -359,7 +363,7 @@ struct A { { "bases": [], "display_name": "A", - "id": "1322794181774144954", + "id": "10582353454193159633", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -373,7 +377,7 @@ struct A { "source_location": { "column": 8, "file": "t00037.cc", - "line": 43, + "line": 47, "translation_unit": "t00037.cc" }, "type": "ST" @@ -402,7 +406,7 @@ struct A { "source_location": { "column": 5, "file": "t00037.cc", - "line": 35, + "line": 39, "translation_unit": "t00037.cc" }, "template_parameters": [], @@ -414,7 +418,7 @@ struct A { "source_location": { "column": 8, "file": "t00037.cc", - "line": 34, + "line": 38, "translation_unit": "t00037.cc" }, "template_parameters": [], @@ -426,39 +430,39 @@ struct A { "relationships": [ { "access": "private", - "destination": "1511518893976387509", + "destination": "12092151151811100076", "label": "s", "multiplicity_destination": "24", - "source": "11203041379038775", + "source": "89624331032310202", "type": "aggregation" }, { "access": "public", - "destination": "1980820317972901050", + "destination": "15846562543783208401", "label": "dimensions", - "source": "11203041379038775", + "source": "89624331032310202", "type": "aggregation" }, { "access": "public", - "destination": "877081436157650289", + "destination": "7016651489261202313", "label": "bars", "multiplicity_destination": "10", - "source": "11203041379038775", + "source": "89624331032310202", "type": "aggregation" }, { "access": "private", - "destination": "1811145508890403377", + "destination": "14489164071123227020", "label": "units", - "source": "11203041379038775", + "source": "89624331032310202", "type": "aggregation" }, { "access": "public", - "destination": "11203041379038775", + "destination": "89624331032310202", "label": "st", - "source": "1322794181774144954", + "source": "10582353454193159633", "type": "aggregation" } ], diff --git a/docs/test_cases/t00037_class.svg b/docs/test_cases/t00037_class.svg index bd16e062..df24da2f 100644 --- a/docs/test_cases/t00037_class.svg +++ b/docs/test_cases/t00037_class.svg @@ -1,6 +1,6 @@ - + @@ -9,184 +9,184 @@ - - + + S - + - + x : double - + - + y : double - - + + ST - + - + bars : ST::(bars)[10] - + - + dimensions : ST::(dimensions) - + - + s : S[4][3][2] - + - + units : ST::(units) - - + + ST::(dimensions) - + - + t : double - + - + x : double - + - + y : double - + - + z : double - - + + ST::(bars) - + - + flags : int - + - + len : int - - + + ST::(units) - + - + c : double - + - + h : double - - + + A - + - + A() : void - + - + st : ST - + -s 24 - + dimensions - + bars 10 - + units - + st diff --git a/docs/test_cases/t00037_class_mermaid.svg b/docs/test_cases/t00037_class_mermaid.svg index 492918cd..1ebc0a3f 100644 --- a/docs/test_cases/t00037_class_mermaid.svg +++ b/docs/test_cases/t00037_class_mermaid.svg @@ -130,8 +130,8 @@ - - + + @@ -159,8 +159,8 @@ - - + + @@ -198,8 +198,8 @@ - - + + @@ -237,8 +237,8 @@ - - + + @@ -266,8 +266,8 @@ - - + + @@ -295,8 +295,8 @@ - - + + diff --git a/docs/test_cases/t00038.md b/docs/test_cases/t00038.md index 29bbeb56..cc8c7a5d 100644 --- a/docs/test_cases/t00038.md +++ b/docs/test_cases/t00038.md @@ -85,7 +85,7 @@ struct map", - "id": "1917560728132448300", + "id": "15340485825059586404", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -272,13 +272,13 @@ struct map>", - "id": "1664022047310891203", + "id": "13312176378487129629", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -321,13 +321,13 @@ struct map>", - "id": "307700801045535833", + "id": "2461606408364286670", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -370,13 +370,13 @@ struct map>>", - "id": "548231528417484191", + "id": "4385852227339873533", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -426,13 +426,13 @@ struct map>>>", - "id": "1510200402118706005", + "id": "12081603216949648046", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -497,80 +497,80 @@ 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 @@ -128,31 +128,31 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/docs/test_cases/t00038_class_mermaid.svg b/docs/test_cases/t00038_class_mermaid.svg index 789a1c8a..770001d6 100644 --- a/docs/test_cases/t00038_class_mermaid.svg +++ b/docs/test_cases/t00038_class_mermaid.svg @@ -202,8 +202,8 @@ - - + + @@ -236,8 +236,8 @@ - - + + @@ -255,8 +255,8 @@ - - + + @@ -289,8 +289,8 @@ - - + + @@ -308,8 +308,8 @@ - - + + @@ -327,8 +327,8 @@ - - + + @@ -346,8 +346,8 @@ - - + + @@ -370,8 +370,8 @@ - - + + @@ -389,8 +389,8 @@ - - + + @@ -408,8 +408,8 @@ - - + + @@ -427,8 +427,8 @@ - - + + @@ -446,8 +446,8 @@ - - + + diff --git a/docs/test_cases/t00039.md b/docs/test_cases/t00039.md index 90b976fd..d5bd58b1 100644 --- a/docs/test_cases/t00039.md +++ b/docs/test_cases/t00039.md @@ -96,7 +96,7 @@ template struct FFF : public FF { { "bases": [], "display_name": "C", - "id": "241234977032861936", + "id": "1929879816262895494", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -118,7 +118,7 @@ template struct FFF : public FF { { "bases": [], "display_name": "D", - "id": "1975187139659616784", + "id": "15801497117276934278", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -140,7 +140,7 @@ template struct FFF : public FF { { "bases": [], "display_name": "E", - "id": "1959131184346890363", + "id": "15673049474775122911", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -163,19 +163,19 @@ template struct FFF : public FF { "bases": [ { "access": "public", - "id": "241234977032861936", + "id": "1929879816262895494", "is_virtual": false, "name": "clanguml::t00039::C" }, { "access": "public", - "id": "1975187139659616784", + "id": "15801497117276934278", "is_virtual": false, "name": "clanguml::t00039::D" } ], "display_name": "CD", - "id": "850483622527996929", + "id": "6803868980223975432", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -198,19 +198,19 @@ template struct FFF : public FF { "bases": [ { "access": "public", - "id": "1975187139659616784", + "id": "15801497117276934278", "is_virtual": false, "name": "clanguml::t00039::D" }, { "access": "public", - "id": "1959131184346890363", + "id": "15673049474775122911", "is_virtual": false, "name": "clanguml::t00039::E" } ], "display_name": "DE", - "id": "1316022308303681160", + "id": "10528178466429449283", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -233,25 +233,25 @@ template struct FFF : public FF { "bases": [ { "access": "public", - "id": "241234977032861936", + "id": "1929879816262895494", "is_virtual": false, "name": "clanguml::t00039::C" }, { "access": "public", - "id": "1975187139659616784", + "id": "15801497117276934278", "is_virtual": false, "name": "clanguml::t00039::D" }, { "access": "public", - "id": "1959131184346890363", + "id": "15673049474775122911", "is_virtual": false, "name": "clanguml::t00039::E" } ], "display_name": "CDE", - "id": "1877487144594774465", + "id": "15019897156758195721", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -273,7 +273,7 @@ template struct FFF : public FF { { "bases": [], "display_name": "A", - "id": "1051171525946759825", + "id": "8409372207574078607", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -296,13 +296,13 @@ template struct FFF : public FF { "bases": [ { "access": "public", - "id": "1051171525946759825", + "id": "8409372207574078607", "is_virtual": false, "name": "clanguml::t00039::A" } ], "display_name": "AA", - "id": "1761969273600680013", + "id": "14095754188805440104", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -325,13 +325,13 @@ template struct FFF : public FF { "bases": [ { "access": "public", - "id": "1761969273600680013", + "id": "14095754188805440104", "is_virtual": false, "name": "clanguml::t00039::AA" } ], "display_name": "AAA", - "id": "2158483243842147804", + "id": "17267865950737182436", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -367,13 +367,13 @@ template struct FFF : public FF { "bases": [ { "access": "public", - "id": "2158483243842147804", + "id": "17267865950737182436", "is_virtual": true, "name": "clanguml::t00039::AAA" } ], "display_name": "ns2::AAAA", - "id": "1857294881176816154", + "id": "14858359049414529239", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -395,7 +395,7 @@ template struct FFF : public FF { { "bases": [], "display_name": "ns3::F", - "id": "955785395599769805", + "id": "7646283164798158442", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -438,13 +438,13 @@ template struct FFF : public FF { "bases": [ { "access": "public", - "id": "955785395599769805", + "id": "7646283164798158442", "is_virtual": false, "name": "clanguml::t00039::ns3::F" } ], "display_name": "ns3::FF", - "id": "1321996888067531304", + "id": "10575975104540250434", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -493,13 +493,13 @@ template struct FFF : public FF { "bases": [ { "access": "public", - "id": "955785395599769805", + "id": "7646283164798158442", "is_virtual": false, "name": "clanguml::t00039::ns3::F" } ], "display_name": "ns3::FE", - "id": "2008055732881129924", + "id": "16064445863049039396", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -548,13 +548,13 @@ template struct FFF : public FF { "bases": [ { "access": "public", - "id": "1321996888067531304", + "id": "10575975104540250434", "is_virtual": false, "name": "clanguml::t00039::ns3::FF" } ], "display_name": "ns3::FFF", - "id": "1617455840736919039", + "id": "12939646725895352313", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -611,80 +611,80 @@ template struct FFF : public FF { "relationships": [ { "access": "public", - "destination": "241234977032861936", - "source": "850483622527996929", + "destination": "1929879816262895494", + "source": "6803868980223975432", "type": "extension" }, { "access": "public", - "destination": "1975187139659616784", - "source": "850483622527996929", + "destination": "15801497117276934278", + "source": "6803868980223975432", "type": "extension" }, { "access": "public", - "destination": "1975187139659616784", - "source": "1316022308303681160", + "destination": "15801497117276934278", + "source": "10528178466429449283", "type": "extension" }, { "access": "public", - "destination": "1959131184346890363", - "source": "1316022308303681160", + "destination": "15673049474775122911", + "source": "10528178466429449283", "type": "extension" }, { "access": "public", - "destination": "241234977032861936", - "source": "1877487144594774465", + "destination": "1929879816262895494", + "source": "15019897156758195721", "type": "extension" }, { "access": "public", - "destination": "1975187139659616784", - "source": "1877487144594774465", + "destination": "15801497117276934278", + "source": "15019897156758195721", "type": "extension" }, { "access": "public", - "destination": "1959131184346890363", - "source": "1877487144594774465", + "destination": "15673049474775122911", + "source": "15019897156758195721", "type": "extension" }, { "access": "public", - "destination": "1051171525946759825", - "source": "1761969273600680013", + "destination": "8409372207574078607", + "source": "14095754188805440104", "type": "extension" }, { "access": "public", - "destination": "1761969273600680013", - "source": "2158483243842147804", + "destination": "14095754188805440104", + "source": "17267865950737182436", "type": "extension" }, { "access": "public", - "destination": "2158483243842147804", - "source": "1857294881176816154", + "destination": "17267865950737182436", + "source": "14858359049414529239", "type": "extension" }, { "access": "public", - "destination": "955785395599769805", - "source": "1321996888067531304", + "destination": "7646283164798158442", + "source": "10575975104540250434", "type": "extension" }, { "access": "public", - "destination": "955785395599769805", - "source": "2008055732881129924", + "destination": "7646283164798158442", + "source": "16064445863049039396", "type": "extension" }, { "access": "public", - "destination": "1321996888067531304", - "source": "1617455840736919039", + "destination": "10575975104540250434", + "source": "12939646725895352313", "type": "extension" } ], diff --git a/docs/test_cases/t00039_class.svg b/docs/test_cases/t00039_class.svg index df555fb0..d45f1365 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,38 +157,38 @@ - + - + n : N * - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/docs/test_cases/t00039_class_mermaid.svg b/docs/test_cases/t00039_class_mermaid.svg index 507eb2db..7f433f8f 100644 --- a/docs/test_cases/t00039_class_mermaid.svg +++ b/docs/test_cases/t00039_class_mermaid.svg @@ -184,8 +184,8 @@ - - + + @@ -203,8 +203,8 @@ - - + + @@ -222,8 +222,8 @@ - - + + @@ -241,8 +241,8 @@ - - + + @@ -260,8 +260,8 @@ - - + + @@ -279,8 +279,8 @@ - - + + @@ -298,8 +298,8 @@ - - + + @@ -317,8 +317,8 @@ - - + + @@ -336,8 +336,8 @@ - - + + @@ -360,8 +360,8 @@ - - + + @@ -379,8 +379,8 @@ - - + + @@ -403,8 +403,8 @@ - - + + @@ -427,8 +427,8 @@ - - + + @@ -451,8 +451,8 @@ - - + + diff --git a/docs/test_cases/t00040.md b/docs/test_cases/t00040.md index cbd747ec..f3a08b9a 100644 --- a/docs/test_cases/t00040.md +++ b/docs/test_cases/t00040.md @@ -72,7 +72,7 @@ struct R { { "bases": [], "display_name": "A", - "id": "307580006083737677", + "id": "2460640048669901416", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -149,13 +149,13 @@ struct R { "bases": [ { "access": "public", - "id": "307580006083737677", + "id": "2460640048669901416", "is_virtual": false, "name": "clanguml::t00040::A" } ], "display_name": "AA", - "id": "534115812779766127", + "id": "4272926502238129020", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -178,13 +178,13 @@ struct R { "bases": [ { "access": "public", - "id": "534115812779766127", + "id": "4272926502238129020", "is_virtual": false, "name": "clanguml::t00040::AA" } ], "display_name": "AAA", - "id": "745371908432158369", + "id": "5962975267457266952", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -260,7 +260,7 @@ struct R { { "bases": [], "display_name": "R", - "id": "1539035020975101539", + "id": "12312280167800812318", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -319,14 +319,14 @@ struct R { "relationships": [ { "access": "public", - "destination": "307580006083737677", - "source": "534115812779766127", + "destination": "2460640048669901416", + "source": "4272926502238129020", "type": "extension" }, { "access": "public", - "destination": "534115812779766127", - "source": "745371908432158369", + "destination": "4272926502238129020", + "source": "5962975267457266952", "type": "extension" } ], diff --git a/docs/test_cases/t00040_class.svg b/docs/test_cases/t00040_class.svg index 25aae138..6efb9b4f 100644 --- a/docs/test_cases/t00040_class.svg +++ b/docs/test_cases/t00040_class.svg @@ -1,6 +1,6 @@ - + @@ -9,76 +9,76 @@ - - + + 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 bbfd4fb5..9862873d 100644 --- a/docs/test_cases/t00040_class_mermaid.svg +++ b/docs/test_cases/t00040_class_mermaid.svg @@ -74,8 +74,8 @@ - - + + @@ -103,8 +103,8 @@ - - + + @@ -122,8 +122,8 @@ - - + + @@ -151,8 +151,8 @@ - - + + diff --git a/docs/test_cases/t00041.md b/docs/test_cases/t00041.md index a8bf2103..97223ae2 100644 --- a/docs/test_cases/t00041.md +++ b/docs/test_cases/t00041.md @@ -100,7 +100,7 @@ struct T { { "bases": [], "display_name": "R", - "id": "775317088453163919", + "id": "6202536707625311352", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -122,7 +122,7 @@ struct T { { "bases": [], "display_name": "D", - "id": "1798851434286108347", + "id": "14390811474288866776", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -157,7 +157,7 @@ struct T { { "bases": [], "display_name": "E", - "id": "2158730167547707264", + "id": "17269841340381658116", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -179,7 +179,7 @@ struct T { { "bases": [], "display_name": "F", - "id": "430600213408545846", + "id": "3444801707268366769", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -202,13 +202,13 @@ struct T { "bases": [ { "access": "public", - "id": "775317088453163919", + "id": "6202536707625311352", "is_virtual": false, "name": "clanguml::t00041::R" } ], "display_name": "RR", - "id": "175608867682236642", + "id": "1404870941457893137", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -317,7 +317,7 @@ struct T { "Three" ], "display_name": "RR::K", - "id": "2190267615539639714", + "id": "17522140924317117712", "is_nested": true, "name": "RR::K", "namespace": "clanguml::t00041", @@ -333,13 +333,13 @@ struct T { "bases": [ { "access": "public", - "id": "175608867682236642", + "id": "1404870941457893137", "is_virtual": false, "name": "clanguml::t00041::RR" } ], "display_name": "RRR", - "id": "819254010294444715", + "id": "6554032082355557724", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -361,7 +361,7 @@ struct T { { "bases": [], "display_name": "ns1::N", - "id": "220253364661036147", + "id": "1762026917288289183", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -384,13 +384,13 @@ struct T { "bases": [ { "access": "public", - "id": "220253364661036147", + "id": "1762026917288289183", "is_virtual": false, "name": "clanguml::t00041::ns1::N" } ], "display_name": "ns1::NN", - "id": "618038667214398895", + "id": "4944309337715191167", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -413,13 +413,13 @@ struct T { "bases": [ { "access": "public", - "id": "220253364661036147", + "id": "1762026917288289183", "is_virtual": false, "name": "clanguml::t00041::ns1::N" } ], "display_name": "ns1::NM", - "id": "1206750351408617127", + "id": "9654002811268937016", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -445,7 +445,7 @@ struct T { "Blue" ], "display_name": "Color", - "id": "325166410992809923", + "id": "2601331287942479387", "is_nested": false, "name": "Color", "namespace": "clanguml::t00041", @@ -460,7 +460,7 @@ struct T { { "bases": [], "display_name": "S", - "id": "1264379505183372317", + "id": "10115036041466978539", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -495,7 +495,7 @@ struct T { { "bases": [], "display_name": "T", - "id": "1124381863108145331", + "id": "8995054904865162649", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -533,7 +533,7 @@ struct T { "Right" ], "display_name": "T::Direction", - "id": "666696403594452707", + "id": "5333571228755621659", "is_nested": true, "name": "T::Direction", "namespace": "clanguml::t00041", @@ -551,80 +551,80 @@ struct T { "relationships": [ { "access": "public", - "destination": "175608867682236642", + "destination": "1404870941457893137", "label": "rr", - "source": "1798851434286108347", + "source": "14390811474288866776", "type": "association" }, { "access": "public", - "destination": "2158730167547707264", + "destination": "17269841340381658116", "label": "e", - "source": "175608867682236642", + "source": "1404870941457893137", "type": "association" }, { "access": "public", - "destination": "430600213408545846", + "destination": "3444801707268366769", "label": "f", - "source": "175608867682236642", + "source": "1404870941457893137", "type": "association" }, { "access": "public", - "destination": "2190267615539639714", + "destination": "17522140924317117712", "label": "k", - "source": "175608867682236642", + "source": "1404870941457893137", "type": "aggregation" }, { "access": "public", - "destination": "775317088453163919", - "source": "175608867682236642", + "destination": "6202536707625311352", + "source": "1404870941457893137", "type": "extension" }, { "access": "public", - "destination": "175608867682236642", - "source": "2190267615539639714", + "destination": "1404870941457893137", + "source": "17522140924317117712", "type": "containment" }, { "access": "public", - "destination": "175608867682236642", - "source": "819254010294444715", + "destination": "1404870941457893137", + "source": "6554032082355557724", "type": "extension" }, { "access": "public", - "destination": "220253364661036147", - "source": "618038667214398895", + "destination": "1762026917288289183", + "source": "4944309337715191167", "type": "extension" }, { "access": "public", - "destination": "220253364661036147", - "source": "1206750351408617127", + "destination": "1762026917288289183", + "source": "9654002811268937016", "type": "extension" }, { "access": "public", - "destination": "325166410992809923", + "destination": "2601331287942479387", "label": "c", - "source": "1264379505183372317", + "source": "10115036041466978539", "type": "aggregation" }, { "access": "public", - "destination": "666696403594452707", + "destination": "5333571228755621659", "label": "d", - "source": "1124381863108145331", + "source": "8995054904865162649", "type": "aggregation" }, { "access": "public", - "destination": "1124381863108145331", - "source": "666696403594452707", + "destination": "8995054904865162649", + "source": "5333571228755621659", "type": "containment" } ], diff --git a/docs/test_cases/t00041_class.svg b/docs/test_cases/t00041_class.svg index 3c7af020..31b8fe4c 100644 --- a/docs/test_cases/t00041_class.svg +++ b/docs/test_cases/t00041_class.svg @@ -1,6 +1,6 @@ - + @@ -9,90 +9,90 @@ - - + + R - - + + D - + - + rr : RR * - - + + E - - + + F - - + + RR - + - + foo(H * h) : void - + - + e : E * - + - + f : F * - + - + g : detail::G * - + - + k : K - - + + RR::K @@ -102,40 +102,40 @@ Three - - + + RRR - - + + ns1::N - - + + ns1::NN - - + + ns1::NM - - + + Color @@ -145,38 +145,38 @@ Blue - - + + S - + - + c : Color - - + + T - + - + d : Direction - - + + T::Direction @@ -185,38 +185,38 @@ Right - + rr - + +e - + +f - + +k - + - + - + - + - + - + +c - + +d - + diff --git a/docs/test_cases/t00041_class_mermaid.svg b/docs/test_cases/t00041_class_mermaid.svg index 65eba670..09ceee37 100644 --- a/docs/test_cases/t00041_class_mermaid.svg +++ b/docs/test_cases/t00041_class_mermaid.svg @@ -190,8 +190,8 @@ - - + + @@ -209,8 +209,8 @@ - - + + @@ -233,8 +233,8 @@ - - + + @@ -252,8 +252,8 @@ - - + + @@ -271,8 +271,8 @@ - - + + @@ -315,8 +315,8 @@ - - + + @@ -349,8 +349,8 @@ - - + + @@ -368,8 +368,8 @@ - - + + @@ -387,8 +387,8 @@ - - + + @@ -406,8 +406,8 @@ - - + + @@ -425,8 +425,8 @@ - - + + @@ -459,8 +459,8 @@ - - + + @@ -483,8 +483,8 @@ - - + + @@ -507,8 +507,8 @@ - - + + diff --git a/docs/test_cases/t00042.md b/docs/test_cases/t00042.md index 5165c00c..1e16e698 100644 --- a/docs/test_cases/t00042.md +++ b/docs/test_cases/t00042.md @@ -71,7 +71,7 @@ struct R { { "bases": [], "display_name": "A", - "id": "462160951579835462", + "id": "3697287612638683703", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -113,7 +113,7 @@ struct R { { "bases": [], "display_name": "A", - "id": "1422802342059669545", + "id": "11382418736477356364", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -155,7 +155,7 @@ struct R { { "bases": [], "display_name": "B", - "id": "1414456934388678010", + "id": "11315655475109424087", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -215,7 +215,7 @@ struct R { { "bases": [], "display_name": "A", - "id": "364538479078826988", + "id": "2916307832630615909", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -244,7 +244,7 @@ struct R { { "bases": [], "display_name": "A", - "id": "496773262538580186", + "id": "3974186100308641490", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -273,7 +273,7 @@ struct R { { "bases": [], "display_name": "B", - "id": "1833471931530161359", + "id": "14667775452241290878", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -311,26 +311,26 @@ struct R { "relationships": [ { "access": "public", - "destination": "462160951579835462", - "source": "1422802342059669545", + "destination": "3697287612638683703", + "source": "11382418736477356364", "type": "instantiation" }, { "access": "public", - "destination": "462160951579835462", - "source": "364538479078826988", + "destination": "3697287612638683703", + "source": "2916307832630615909", "type": "instantiation" }, { "access": "public", - "destination": "462160951579835462", - "source": "496773262538580186", + "destination": "3697287612638683703", + "source": "3974186100308641490", "type": "instantiation" }, { "access": "public", - "destination": "1414456934388678010", - "source": "1833471931530161359", + "destination": "11315655475109424087", + "source": "14667775452241290878", "type": "instantiation" } ], diff --git a/docs/test_cases/t00042_class.svg b/docs/test_cases/t00042_class.svg index 9a8a24b9..a5f4a724 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 @@ -97,13 +97,13 @@ - + - + - + - + diff --git a/docs/test_cases/t00042_class_mermaid.svg b/docs/test_cases/t00042_class_mermaid.svg index 84d758ac..5debbc83 100644 --- a/docs/test_cases/t00042_class_mermaid.svg +++ b/docs/test_cases/t00042_class_mermaid.svg @@ -102,8 +102,8 @@ - - + + @@ -126,8 +126,8 @@ - - + + @@ -150,8 +150,8 @@ - - + + @@ -179,8 +179,8 @@ - - + + @@ -198,8 +198,8 @@ - - + + @@ -217,8 +217,8 @@ - - + + diff --git a/docs/test_cases/t00043.md b/docs/test_cases/t00043.md index c5474e96..90544960 100644 --- a/docs/test_cases/t00043.md +++ b/docs/test_cases/t00043.md @@ -15,6 +15,11 @@ diagrams: - clanguml::t00043::dependencies::J relationships: - dependency + exclude: + dependants: + - clanguml::t00043::dependants::EE + dependencies: + - clanguml::t00043::dependencies::II ``` ## Source code File `tests/t00043/t00043.cc` @@ -45,6 +50,14 @@ struct E { void e(D *d) { } }; +struct EE { + void ee(E *e) { } +}; + +struct EEE { + void eee(EE *e) { } +}; + struct F { }; } // namespace dependants @@ -67,8 +80,18 @@ struct I { void i(H *h) { } }; +struct II; +struct III { + void iii(II *i) { } +}; + +struct II { + void ii() { } +}; + struct J { void i(I *i) { } + void ii(II *ii) { } }; } // namespace dependencies @@ -90,7 +113,7 @@ struct J { { "bases": [], "display_name": "A", - "id": "1454679300998460550", + "id": "11637434407987684404", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -112,7 +135,7 @@ struct J { { "bases": [], "display_name": "B", - "id": "1972977265990430931", + "id": "15783818127923447452", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -168,7 +191,7 @@ struct J { { "bases": [], "display_name": "BB", - "id": "1906291555025945295", + "id": "15250332440207562361", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -224,7 +247,7 @@ struct J { { "bases": [], "display_name": "C", - "id": "823759225351121534", + "id": "6590073802808972273", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -280,7 +303,7 @@ struct J { { "bases": [], "display_name": "D", - "id": "2277976215348279426", + "id": "18223809722786235409", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -369,7 +392,7 @@ struct J { { "bases": [], "display_name": "E", - "id": "1694685540293810116", + "id": "13557484322350480935", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -432,7 +455,7 @@ struct J { { "bases": [], "display_name": "G", - "id": "736400571183204899", + "id": "5891204569465639198", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -445,7 +468,7 @@ struct J { "source_location": { "column": 8, "file": "t00043.cc", - "line": 32, + "line": 40, "translation_unit": "t00043.cc" }, "template_parameters": [], @@ -454,7 +477,7 @@ struct J { { "bases": [], "display_name": "GG", - "id": "1522297681294871411", + "id": "12178381450358971290", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -467,7 +490,7 @@ struct J { "source_location": { "column": 8, "file": "t00043.cc", - "line": 34, + "line": 42, "translation_unit": "t00043.cc" }, "template_parameters": [], @@ -476,7 +499,7 @@ struct J { { "bases": [], "display_name": "H", - "id": "1534191494825314170", + "id": "12273531958602513366", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -511,7 +534,7 @@ struct J { "source_location": { "column": 10, "file": "t00043.cc", - "line": 37, + "line": 45, "translation_unit": "t00043.cc" }, "template_parameters": [], @@ -544,7 +567,7 @@ struct J { "source_location": { "column": 10, "file": "t00043.cc", - "line": 38, + "line": 46, "translation_unit": "t00043.cc" }, "template_parameters": [], @@ -556,7 +579,7 @@ struct J { "source_location": { "column": 8, "file": "t00043.cc", - "line": 36, + "line": 44, "translation_unit": "t00043.cc" }, "template_parameters": [], @@ -565,7 +588,7 @@ struct J { { "bases": [], "display_name": "I", - "id": "97422543769740359", + "id": "779380350157922875", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -600,7 +623,7 @@ struct J { "source_location": { "column": 10, "file": "t00043.cc", - "line": 46, + "line": 54, "translation_unit": "t00043.cc" }, "template_parameters": [], @@ -612,7 +635,7 @@ struct J { "source_location": { "column": 8, "file": "t00043.cc", - "line": 45, + "line": 53, "translation_unit": "t00043.cc" }, "template_parameters": [], @@ -621,7 +644,7 @@ struct J { { "bases": [], "display_name": "J", - "id": "1498530043106438011", + "id": "11988240344851504088", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -656,7 +679,40 @@ struct J { "source_location": { "column": 10, "file": "t00043.cc", - "line": 50, + "line": 67, + "translation_unit": "t00043.cc" + }, + "template_parameters": [], + "type": "void" + }, + { + "access": "public", + "display_name": "ii", + "is_const": false, + "is_consteval": false, + "is_constexpr": false, + "is_constructor": false, + "is_copy_assignment": false, + "is_coroutine": false, + "is_defaulted": false, + "is_deleted": false, + "is_move_assignment": false, + "is_noexcept": false, + "is_operator": false, + "is_pure_virtual": false, + "is_static": false, + "is_virtual": false, + "name": "ii", + "parameters": [ + { + "name": "ii", + "type": "II *" + } + ], + "source_location": { + "column": 10, + "file": "t00043.cc", + "line": 68, "translation_unit": "t00043.cc" }, "template_parameters": [], @@ -668,7 +724,7 @@ struct J { "source_location": { "column": 8, "file": "t00043.cc", - "line": 49, + "line": 66, "translation_unit": "t00043.cc" }, "template_parameters": [], @@ -684,62 +740,68 @@ struct J { "relationships": [ { "access": "public", - "destination": "1454679300998460550", - "source": "1972977265990430931", + "destination": "11637434407987684404", + "source": "15783818127923447452", "type": "dependency" }, { "access": "public", - "destination": "1454679300998460550", - "source": "1906291555025945295", + "destination": "11637434407987684404", + "source": "15250332440207562361", "type": "dependency" }, { "access": "public", - "destination": "1972977265990430931", - "source": "823759225351121534", + "destination": "15783818127923447452", + "source": "6590073802808972273", "type": "dependency" }, { "access": "public", - "destination": "823759225351121534", - "source": "2277976215348279426", + "destination": "6590073802808972273", + "source": "18223809722786235409", "type": "dependency" }, { "access": "public", - "destination": "1906291555025945295", - "source": "2277976215348279426", + "destination": "15250332440207562361", + "source": "18223809722786235409", "type": "dependency" }, { "access": "public", - "destination": "2277976215348279426", - "source": "1694685540293810116", + "destination": "18223809722786235409", + "source": "13557484322350480935", "type": "dependency" }, { "access": "public", - "destination": "736400571183204899", - "source": "1534191494825314170", + "destination": "5891204569465639198", + "source": "12273531958602513366", "type": "dependency" }, { "access": "public", - "destination": "1522297681294871411", - "source": "1534191494825314170", + "destination": "12178381450358971290", + "source": "12273531958602513366", "type": "dependency" }, { "access": "public", - "destination": "1534191494825314170", - "source": "97422543769740359", + "destination": "12273531958602513366", + "source": "779380350157922875", "type": "dependency" }, { "access": "public", - "destination": "97422543769740359", - "source": "1498530043106438011", + "destination": "779380350157922875", + "source": "11988240344851504088", + "type": "dependency" + }, + { + "access": "public", + "destination": "1112226203938309888", + "source": "11988240344851504088", "type": "dependency" } ], diff --git a/docs/test_cases/t00043_class.svg b/docs/test_cases/t00043_class.svg index 2a42287f..9b22d0be 100644 --- a/docs/test_cases/t00043_class.svg +++ b/docs/test_cases/t00043_class.svg @@ -1,6 +1,6 @@ - + - + @@ -9,189 +9,196 @@ - - - dependants - + + + dependants + dependencies - - - - - A - - + + + + + A + + - - - - - B - + + + + + B + - - - + + + - - b(A * a) : void + + b(A * a) : void - - - - - - BB - + + + + + + BB + - - - + + + - - bb(A * a) : void + + bb(A * a) : void - - - - - - C - + + + + + + C + - - - + + + - - c(B * b) : void + + c(B * b) : void - - - - - - D - + + + + + + D + - - - + + + - - d(C * c) : void + + d(C * c) : void - - - + + + - - dd(BB * bb) : void + + dd(BB * bb) : void - - - - - - E - + + + + + + E + - - - + + + - - e(D * d) : void + + e(D * d) : void - - - - - - G - - + + + + + + G + + - - - - - GG - - + + + + + GG + + - - - - - H - + + + + + H + - - - + + + - - h(G * g) : void + + h(G * g) : void - - - + + + - - hh(GG * gg) : void + + hh(GG * gg) : void - - - - - - I - + + + + + + I + - - - + + + - - i(H * h) : void + + i(H * h) : void - - - - - - J - + + + + + + J + - - - + + + - - i(I * i) : void + + i(I * i) : void - - - - - - - - - - - - - - - - - - - - - + + + + + + ii(II * ii) : void + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/test_cases/t00043_class_mermaid.svg b/docs/test_cases/t00043_class_mermaid.svg index a7c50ac8..328ad609 100644 --- a/docs/test_cases/t00043_class_mermaid.svg +++ b/docs/test_cases/t00043_class_mermaid.svg @@ -1,4 +1,4 @@ - + @@ -50,16 +50,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -174,8 +174,8 @@ - - + + @@ -193,8 +193,8 @@ - - + + @@ -217,8 +217,8 @@ - - + + @@ -241,8 +241,8 @@ - - + + @@ -265,8 +265,8 @@ - - + + @@ -294,8 +294,8 @@ - - + + @@ -318,8 +318,8 @@ - - + + @@ -337,8 +337,8 @@ - - + + @@ -356,8 +356,8 @@ - - + + @@ -385,8 +385,8 @@ - - + + @@ -409,27 +409,32 @@ - - - - - + + + + +
- +
dependencies::J
- +
+i(I * i) : void
+ +
+ +ii(II * ii) : void +
+ diff --git a/docs/test_cases/t00044.md b/docs/test_cases/t00044.md index e333946e..67a61757 100644 --- a/docs/test_cases/t00044.md +++ b/docs/test_cases/t00044.md @@ -66,7 +66,7 @@ struct R { { "bases": [], "display_name": "signal_handler", - "id": "1591729735727316875", + "id": "12733837885818535000", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -113,7 +113,7 @@ struct R { { "bases": [], "display_name": "sink>", - "id": "559574389062594251", + "id": "4476595112500754008", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -243,7 +243,7 @@ struct R { { "bases": [], "display_name": "signal_handler", - "id": "103559998624864011", + "id": "828479988998912093", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -290,7 +290,7 @@ struct R { { "bases": [], "display_name": "sink>", - "id": "1718007222067272862", + "id": "13744057776538182902", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -344,7 +344,7 @@ struct R { { "bases": [], "display_name": "R", - "id": "1644484569399365272", + "id": "13155876555194922183", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -379,7 +379,7 @@ struct R { { "bases": [], "display_name": "signal_handler", - "id": "276594465967577895", + "id": "2212755727740623160", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -414,7 +414,7 @@ struct R { { "bases": [], "display_name": "sink", - "id": "1759724482769288325", + "id": "14077795862154306600", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -446,53 +446,53 @@ struct R { "relationships": [ { "access": "public", - "destination": "276594465967577895", - "source": "1591729735727316875", + "destination": "2212755727740623160", + "source": "12733837885818535000", "type": "instantiation" }, { "access": "private", - "destination": "1591729735727316875", + "destination": "12733837885818535000", "label": "signal", - "source": "559574389062594251", + "source": "4476595112500754008", "type": "association" }, { "access": "private", - "destination": "276594465967577895", + "destination": "2212755727740623160", "label": "signal", - "source": "559574389062594251", + "source": "4476595112500754008", "type": "association" }, { "access": "public", - "destination": "1759724482769288325", - "source": "559574389062594251", + "destination": "14077795862154306600", + "source": "4476595112500754008", "type": "instantiation" }, { "access": "public", - "destination": "1591729735727316875", - "source": "103559998624864011", + "destination": "12733837885818535000", + "source": "828479988998912093", "type": "instantiation" }, { "access": "public", - "destination": "103559998624864011", - "source": "1718007222067272862", + "destination": "828479988998912093", + "source": "13744057776538182902", "type": "dependency" }, { "access": "public", - "destination": "559574389062594251", - "source": "1718007222067272862", + "destination": "4476595112500754008", + "source": "13744057776538182902", "type": "instantiation" }, { "access": "public", - "destination": "1718007222067272862", + "destination": "13744057776538182902", "label": "sink1", - "source": "1644484569399365272", + "source": "13155876555194922183", "type": "aggregation" } ], diff --git a/docs/test_cases/t00044_class.svg b/docs/test_cases/t00044_class.svg index 7f11e438..bf3ab465 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 @@ -101,25 +101,25 @@ - + - + signal - + signal - + - + - + - + - + sink1 diff --git a/docs/test_cases/t00044_class_mermaid.svg b/docs/test_cases/t00044_class_mermaid.svg index fdaa39a8..4bcb55a1 100644 --- a/docs/test_cases/t00044_class_mermaid.svg +++ b/docs/test_cases/t00044_class_mermaid.svg @@ -150,8 +150,8 @@ - - + + @@ -169,8 +169,8 @@ - - + + @@ -203,8 +203,8 @@ - - + + @@ -222,8 +222,8 @@ - - + + @@ -241,8 +241,8 @@ - - + + @@ -265,8 +265,8 @@ - - + + @@ -284,8 +284,8 @@ - - + + diff --git a/docs/test_cases/t00045.md b/docs/test_cases/t00045.md index dad35251..c378139c 100644 --- a/docs/test_cases/t00045.md +++ b/docs/test_cases/t00045.md @@ -70,7 +70,7 @@ public: { "bases": [], "display_name": "A", - "id": "864916647665253425", + "id": "6919333181322027406", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -92,7 +92,7 @@ public: { "bases": [], "display_name": "AA", - "id": "386872828559902182", + "id": "3094982628479217459", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -114,7 +114,7 @@ public: { "bases": [], "display_name": "AAA", - "id": "54164402597771463", + "id": "433315220782171707", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -136,7 +136,7 @@ public: { "bases": [], "display_name": "AAAA", - "id": "375905626569465019", + "id": "3007245012555720156", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -178,7 +178,7 @@ public: { "bases": [], "display_name": "ns1::A", - "id": "619642232943663499", + "id": "4957137863549307995", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -200,7 +200,7 @@ public: { "bases": [], "display_name": "ns1::ns2::A", - "id": "2207007194029669343", + "id": "17656057552237354746", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -223,13 +223,13 @@ public: "bases": [ { "access": "public", - "id": "2207007194029669343", + "id": "17656057552237354746", "is_virtual": false, "name": "ns1::ns2::A" } ], "display_name": "ns1::ns2::B", - "id": "204051985124373077", + "id": "1632415880994984623", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -252,13 +252,13 @@ public: "bases": [ { "access": "public", - "id": "619642232943663499", + "id": "4957137863549307995", "is_virtual": false, "name": "ns1::A" } ], "display_name": "ns1::ns2::C", - "id": "1837009554564742531", + "id": "14696076436517940251", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -281,13 +281,13 @@ public: "bases": [ { "access": "public", - "id": "2207007194029669343", + "id": "17656057552237354746", "is_virtual": false, "name": "ns1::ns2::A" } ], "display_name": "ns1::ns2::D", - "id": "2029929560931799980", + "id": "16239436487454399847", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -310,13 +310,13 @@ public: "bases": [ { "access": "public", - "id": "864916647665253425", + "id": "6919333181322027406", "is_virtual": false, "name": "A" } ], "display_name": "ns1::ns2::E", - "id": "2305358535757579772", + "id": "18442868286060638176", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -338,7 +338,7 @@ public: { "bases": [], "display_name": "ns1::ns2::AAA", - "id": "1731264248793686366", + "id": "13850113990349490933", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -360,7 +360,7 @@ public: { "bases": [], "display_name": "ns1::ns2::R", - "id": "974430595320588991", + "id": "7795444762564711929", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -468,67 +468,67 @@ public: "relationships": [ { "access": "public", - "destination": "2207007194029669343", - "source": "204051985124373077", + "destination": "17656057552237354746", + "source": "1632415880994984623", "type": "extension" }, { "access": "public", - "destination": "619642232943663499", - "source": "1837009554564742531", + "destination": "4957137863549307995", + "source": "14696076436517940251", "type": "extension" }, { "access": "public", - "destination": "2207007194029669343", - "source": "2029929560931799980", + "destination": "17656057552237354746", + "source": "16239436487454399847", "type": "extension" }, { "access": "public", - "destination": "864916647665253425", - "source": "2305358535757579772", + "destination": "6919333181322027406", + "source": "18442868286060638176", "type": "extension" }, { "access": "public", - "destination": "386872828559902182", - "source": "974430595320588991", + "destination": "3094982628479217459", + "source": "7795444762564711929", "type": "dependency" }, { "access": "public", - "destination": "2207007194029669343", + "destination": "17656057552237354746", "label": "a", - "source": "974430595320588991", + "source": "7795444762564711929", "type": "association" }, { "access": "public", - "destination": "619642232943663499", + "destination": "4957137863549307995", "label": "ns1_a", - "source": "974430595320588991", + "source": "7795444762564711929", "type": "association" }, { "access": "public", - "destination": "2207007194029669343", + "destination": "17656057552237354746", "label": "ns1_ns2_a", - "source": "974430595320588991", + "source": "7795444762564711929", "type": "association" }, { "access": "public", - "destination": "864916647665253425", + "destination": "6919333181322027406", "label": "root_a", - "source": "974430595320588991", + "source": "7795444762564711929", "type": "association" }, { "access": "public", - "destination": "54164402597771463", + "destination": "433315220782171707", "label": "<>", - "source": "974430595320588991", + "source": "7795444762564711929", "type": "friendship" } ] diff --git a/docs/test_cases/t00045_class.svg b/docs/test_cases/t00045_class.svg index a842758b..ded1bbbe 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,138 +43,138 @@ - + - + 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 * - + - + - + - + - + - + +a - + ns1_ns2_a - + ns1_a - + root_a - + «friend» diff --git a/docs/test_cases/t00045_class_mermaid.svg b/docs/test_cases/t00045_class_mermaid.svg index ac6b61b4..0d9fff36 100644 --- a/docs/test_cases/t00045_class_mermaid.svg +++ b/docs/test_cases/t00045_class_mermaid.svg @@ -166,8 +166,8 @@ - - + + @@ -185,8 +185,8 @@ - - + + @@ -204,8 +204,8 @@ - - + + @@ -223,8 +223,8 @@ - - + + @@ -247,8 +247,8 @@ - - + + @@ -266,8 +266,8 @@ - - + + @@ -285,8 +285,8 @@ - - + + @@ -304,8 +304,8 @@ - - + + @@ -323,8 +323,8 @@ - - + + @@ -342,8 +342,8 @@ - - + + @@ -361,8 +361,8 @@ - - + + @@ -380,8 +380,8 @@ - - + + diff --git a/docs/test_cases/t00046.md b/docs/test_cases/t00046.md index afd585dd..2a9304be 100644 --- a/docs/test_cases/t00046.md +++ b/docs/test_cases/t00046.md @@ -63,7 +63,7 @@ public: { "bases": [], "display_name": "A", - "id": "864916647665253425", + "id": "6919333181322027406", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -85,7 +85,7 @@ public: { "bases": [], "display_name": "AA", - "id": "386872828559902182", + "id": "3094982628479217459", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -110,7 +110,7 @@ public: { "bases": [], "display_name": "A", - "id": "619642232943663499", + "id": "4957137863549307995", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -135,7 +135,7 @@ public: { "bases": [], "display_name": "A", - "id": "2207007194029669343", + "id": "17656057552237354746", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -158,13 +158,13 @@ public: "bases": [ { "access": "public", - "id": "2207007194029669343", + "id": "17656057552237354746", "is_virtual": false, "name": "ns1::ns2::A" } ], "display_name": "B", - "id": "204051985124373077", + "id": "1632415880994984623", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -187,13 +187,13 @@ public: "bases": [ { "access": "public", - "id": "619642232943663499", + "id": "4957137863549307995", "is_virtual": false, "name": "ns1::A" } ], "display_name": "C", - "id": "1837009554564742531", + "id": "14696076436517940251", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -216,13 +216,13 @@ public: "bases": [ { "access": "public", - "id": "2207007194029669343", + "id": "17656057552237354746", "is_virtual": false, "name": "ns1::ns2::A" } ], "display_name": "D", - "id": "2029929560931799980", + "id": "16239436487454399847", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -245,13 +245,13 @@ public: "bases": [ { "access": "public", - "id": "864916647665253425", + "id": "6919333181322027406", "is_virtual": false, "name": "A" } ], "display_name": "E", - "id": "2305358535757579772", + "id": "18442868286060638176", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -273,7 +273,7 @@ public: { "bases": [], "display_name": "R", - "id": "974430595320588991", + "id": "7795444762564711929", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -401,60 +401,60 @@ public: "relationships": [ { "access": "public", - "destination": "2207007194029669343", - "source": "204051985124373077", + "destination": "17656057552237354746", + "source": "1632415880994984623", "type": "extension" }, { "access": "public", - "destination": "619642232943663499", - "source": "1837009554564742531", + "destination": "4957137863549307995", + "source": "14696076436517940251", "type": "extension" }, { "access": "public", - "destination": "2207007194029669343", - "source": "2029929560931799980", + "destination": "17656057552237354746", + "source": "16239436487454399847", "type": "extension" }, { "access": "public", - "destination": "864916647665253425", - "source": "2305358535757579772", + "destination": "6919333181322027406", + "source": "18442868286060638176", "type": "extension" }, { "access": "public", - "destination": "386872828559902182", - "source": "974430595320588991", + "destination": "3094982628479217459", + "source": "7795444762564711929", "type": "dependency" }, { "access": "public", - "destination": "2207007194029669343", + "destination": "17656057552237354746", "label": "a", - "source": "974430595320588991", + "source": "7795444762564711929", "type": "association" }, { "access": "public", - "destination": "619642232943663499", + "destination": "4957137863549307995", "label": "ns1_a", - "source": "974430595320588991", + "source": "7795444762564711929", "type": "association" }, { "access": "public", - "destination": "2207007194029669343", + "destination": "17656057552237354746", "label": "ns1_ns2_a", - "source": "974430595320588991", + "source": "7795444762564711929", "type": "association" }, { "access": "public", - "destination": "864916647665253425", + "destination": "6919333181322027406", "label": "root_a", - "source": "974430595320588991", + "source": "7795444762564711929", "type": "association" } ] diff --git a/docs/test_cases/t00046_class.svg b/docs/test_cases/t00046_class.svg index 016cbacd..e6116dc7 100644 --- a/docs/test_cases/t00046_class.svg +++ b/docs/test_cases/t00046_class.svg @@ -1,6 +1,6 @@ - + @@ -9,148 +9,148 @@ - + 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 - + - + - + - + - + - + +a - + ns1_ns2_a - + ns1_a - + root_a diff --git a/docs/test_cases/t00046_class_mermaid.svg b/docs/test_cases/t00046_class_mermaid.svg index ee8103c3..f2510116 100644 --- a/docs/test_cases/t00046_class_mermaid.svg +++ b/docs/test_cases/t00046_class_mermaid.svg @@ -154,8 +154,8 @@ - - + + @@ -173,8 +173,8 @@ - - + + @@ -192,8 +192,8 @@ - - + + @@ -211,8 +211,8 @@ - - + + @@ -230,8 +230,8 @@ - - + + @@ -249,8 +249,8 @@ - - + + @@ -268,8 +268,8 @@ - - + + @@ -287,8 +287,8 @@ - - + + @@ -306,8 +306,8 @@ - - + + diff --git a/docs/test_cases/t00047.md b/docs/test_cases/t00047.md index 34ba8b01..109f7ca1 100644 --- a/docs/test_cases/t00047.md +++ b/docs/test_cases/t00047.md @@ -56,7 +56,7 @@ using conditional = typename conditional_t::type; { "bases": [], "display_name": "conditional_t", - "id": "47394280824625133", + "id": "379154246597001066", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -85,7 +85,7 @@ using conditional = typename conditional_t::type; { "bases": [], "display_name": "conditional_t", - "id": "599782159389775809", + "id": "4798257275118206478", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -126,7 +126,7 @@ using conditional = typename conditional_t::type; { "bases": [], "display_name": "conditional_t", - "id": "824938194184364511", + "id": "6599505553474916091", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -167,7 +167,7 @@ using conditional = typename conditional_t::type; { "bases": [], "display_name": "conditional_t", - "id": "1673692992642087414", + "id": "13389543941136699317", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -199,20 +199,20 @@ using conditional = typename conditional_t::type; "relationships": [ { "access": "public", - "destination": "1673692992642087414", - "source": "47394280824625133", + "destination": "13389543941136699317", + "source": "379154246597001066", "type": "instantiation" }, { "access": "public", - "destination": "1673692992642087414", - "source": "599782159389775809", + "destination": "13389543941136699317", + "source": "4798257275118206478", "type": "instantiation" }, { "access": "public", - "destination": "1673692992642087414", - "source": "824938194184364511", + "destination": "13389543941136699317", + "source": "6599505553474916091", "type": "instantiation" } ], diff --git a/docs/test_cases/t00047_class.svg b/docs/test_cases/t00047_class.svg index f8a899a1..99702490 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 @@ -49,11 +49,11 @@ - + - + - + diff --git a/docs/test_cases/t00047_class_mermaid.svg b/docs/test_cases/t00047_class_mermaid.svg index 79dfcb7c..a3862ab3 100644 --- a/docs/test_cases/t00047_class_mermaid.svg +++ b/docs/test_cases/t00047_class_mermaid.svg @@ -90,8 +90,8 @@ - - + + @@ -109,8 +109,8 @@ - - + + @@ -128,8 +128,8 @@ - - + + @@ -147,8 +147,8 @@ - - + + diff --git a/docs/test_cases/t00048.md b/docs/test_cases/t00048.md index dda45eb2..36cb6ff1 100644 --- a/docs/test_cases/t00048.md +++ b/docs/test_cases/t00048.md @@ -129,7 +129,7 @@ template struct BaseTemplate { { "bases": [], "display_name": "Base", - "id": "10200626899013233", + "id": "81605015192105870", "is_abstract": true, "is_nested": false, "is_struct": true, @@ -193,7 +193,7 @@ template struct BaseTemplate { { "bases": [], "display_name": "BaseTemplate", - "id": "630197772543569536", + "id": "5041582180348556290", "is_abstract": true, "is_nested": false, "is_struct": true, @@ -265,13 +265,13 @@ template struct BaseTemplate { "bases": [ { "access": "public", - "id": "10200626899013233", + "id": "81605015192105870", "is_virtual": false, "name": "clanguml::t00048::Base" } ], "display_name": "B", - "id": "59336049758992190", + "id": "474688398071937524", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -336,13 +336,13 @@ template struct BaseTemplate { "bases": [ { "access": "public", - "id": "630197772543569536", + "id": "5041582180348556290", "is_virtual": false, "name": "clanguml::t00048::BaseTemplate" } ], "display_name": "BTemplate", - "id": "1635850649347735305", + "id": "13086805194781882442", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -414,13 +414,13 @@ template struct BaseTemplate { "bases": [ { "access": "public", - "id": "10200626899013233", + "id": "81605015192105870", "is_virtual": false, "name": "clanguml::t00048::Base" } ], "display_name": "A", - "id": "199333691834211223", + "id": "1594669534673689790", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -485,13 +485,13 @@ template struct BaseTemplate { "bases": [ { "access": "public", - "id": "630197772543569536", + "id": "5041582180348556290", "is_virtual": false, "name": "clanguml::t00048::BaseTemplate" } ], "display_name": "ATemplate", - "id": "1025697108404463905", + "id": "8205576867235711242", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -565,26 +565,26 @@ template struct BaseTemplate { "relationships": [ { "access": "public", - "destination": "10200626899013233", - "source": "59336049758992190", + "destination": "81605015192105870", + "source": "474688398071937524", "type": "extension" }, { "access": "public", - "destination": "630197772543569536", - "source": "1635850649347735305", + "destination": "5041582180348556290", + "source": "13086805194781882442", "type": "extension" }, { "access": "public", - "destination": "10200626899013233", - "source": "199333691834211223", + "destination": "81605015192105870", + "source": "1594669534673689790", "type": "extension" }, { "access": "public", - "destination": "630197772543569536", - "source": "1025697108404463905", + "destination": "5041582180348556290", + "source": "8205576867235711242", "type": "extension" } ], diff --git a/docs/test_cases/t00048_class.svg b/docs/test_cases/t00048_class.svg index 247a658a..447bbc60 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,28 +132,28 @@ T - + - + foo() : void - + - + a : T - + - + - + - + diff --git a/docs/test_cases/t00048_class_mermaid.svg b/docs/test_cases/t00048_class_mermaid.svg index 35a48231..075c9c1b 100644 --- a/docs/test_cases/t00048_class_mermaid.svg +++ b/docs/test_cases/t00048_class_mermaid.svg @@ -94,8 +94,8 @@ - - + + @@ -123,8 +123,8 @@ - - + + @@ -152,8 +152,8 @@ - - + + @@ -181,8 +181,8 @@ - - + + @@ -210,8 +210,8 @@ - - + + @@ -239,8 +239,8 @@ - - + + diff --git a/docs/test_cases/t00049.md b/docs/test_cases/t00049.md index 8ea813bf..1b3d7344 100644 --- a/docs/test_cases/t00049.md +++ b/docs/test_cases/t00049.md @@ -56,7 +56,7 @@ struct R { { "bases": [], "display_name": "A", - "id": "372971769516871577", + "id": "2983774156134972621", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -127,7 +127,7 @@ struct R { { "bases": [], "display_name": "A", - "id": "654829353386288443", + "id": "5238634827090307546", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -156,7 +156,7 @@ struct R { { "bases": [], "display_name": "A", - "id": "973058255816844469", + "id": "7784466046534755756", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -185,7 +185,7 @@ struct R { { "bases": [], "display_name": "A", - "id": "562074851310302010", + "id": "4496598810482416085", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -214,7 +214,7 @@ struct R { { "bases": [], "display_name": "R", - "id": "2288024073053091226", + "id": "18304192584424729815", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -338,47 +338,47 @@ struct R { "relationships": [ { "access": "public", - "destination": "372971769516871577", - "source": "654829353386288443", + "destination": "2983774156134972621", + "source": "5238634827090307546", "type": "instantiation" }, { "access": "public", - "destination": "372971769516871577", - "source": "973058255816844469", + "destination": "2983774156134972621", + "source": "7784466046534755756", "type": "instantiation" }, { "access": "public", - "destination": "372971769516871577", - "source": "562074851310302010", + "destination": "2983774156134972621", + "source": "4496598810482416085", "type": "instantiation" }, { "access": "public", - "destination": "372971769516871577", - "source": "2288024073053091226", + "destination": "2983774156134972621", + "source": "18304192584424729815", "type": "dependency" }, { "access": "public", - "destination": "973058255816844469", + "destination": "7784466046534755756", "label": "a_string", - "source": "2288024073053091226", + "source": "18304192584424729815", "type": "aggregation" }, { "access": "public", - "destination": "562074851310302010", + "destination": "4496598810482416085", "label": "a_vector_string", - "source": "2288024073053091226", + "source": "18304192584424729815", "type": "aggregation" }, { "access": "public", - "destination": "654829353386288443", + "destination": "5238634827090307546", "label": "a_int_map", - "source": "2288024073053091226", + "source": "18304192584424729815", "type": "aggregation" } ], diff --git a/docs/test_cases/t00049_class.svg b/docs/test_cases/t00049_class.svg index 441ce862..9548e301 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,66 +63,66 @@ - - + + R - + - + get_int_map() : A<intmap> - + - + set_int_map(A<intmap> && int_map) : void - + - + a_int_map : A<intmap> - + - + a_string : A<thestring> - + - + a_vector_string : A<string_vector> - + - + - + - + - + a_string - + a_vector_string - + a_int_map diff --git a/docs/test_cases/t00049_class_mermaid.svg b/docs/test_cases/t00049_class_mermaid.svg index 299f7bab..7607007d 100644 --- a/docs/test_cases/t00049_class_mermaid.svg +++ b/docs/test_cases/t00049_class_mermaid.svg @@ -138,8 +138,8 @@ - - + + @@ -167,8 +167,8 @@ - - + + @@ -186,8 +186,8 @@ - - + + @@ -205,8 +205,8 @@ - - + + @@ -224,8 +224,8 @@ - - + + diff --git a/docs/test_cases/t00050.md b/docs/test_cases/t00050.md index 91d088ba..705c9e40 100644 --- a/docs/test_cases/t00050.md +++ b/docs/test_cases/t00050.md @@ -190,6 +190,11 @@ enum class E { E1, E2, E3 }; template class F { T t[N]; V v; + + /// \brief Set value of v + /// + /// \param v_ New value for v + V set_value(V v_) const { return v = v_; } }; /// This is a short description of class G. @@ -224,7 +229,7 @@ class NoComment { }; "text": "\n Lorem ipsum dolor sit\n" }, "display_name": "A", - "id": "1885563213397742674", + "id": "15084505707181941399", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -264,7 +269,7 @@ class NoComment { }; ] }, "display_name": "B", - "id": "500262098409836244", + "id": "4002096787278689954", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -300,7 +305,7 @@ class NoComment { }; "text": "\n \n\n Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis\n vehicula class ultricies mollis dictumst, aenean non a in donec nulla.\n Phasellus ante pellentesque erat cum risus consequat imperdiet aliquam,\n integer placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora\n tellus ligula porttitor metus.\n\n Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,\n euismod libero facilisi aptent elementum felis blandit cursus gravida sociis\n erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est\n ad. Massa curae fringilla porttitor quam sollicitudin iaculis aptent leo\n ligula euismod dictumst, orci penatibus mauris eros etiam praesent erat\n volutpat posuere hac. Metus fringilla nec ullamcorper odio aliquam lacinia\n conubia mauris tempor, etiam ultricies proin quisque lectus sociis id\n tristique, integer phasellus taciti pretium adipiscing tortor sagittis\n ligula.\n\n Mollis pretium lorem primis senectus habitasse lectus scelerisque\n donec, ultricies tortor suspendisse adipiscing fusce morbi volutpat\n pellentesque, consectetur mi risus molestie curae malesuada cum. Dignissim\n lacus convallis massa mauris enim ad mattis magnis senectus montes, mollis\n taciti phasellus accumsan bibendum semper blandit suspendisse faucibus nibh\n est, metus lobortis morbi cras magna vivamus per risus fermentum. Dapibus\n imperdiet praesent magnis ridiculus congue gravida curabitur dictum\n sagittis, enim et magna sit inceptos sodales parturient pharetra mollis,\n aenean vel nostra tellus commodo pretium sapien sociosqu.\n" }, "display_name": "C", - "id": "1663081653671078922", + "id": "13304653229368631380", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -334,7 +339,7 @@ class NoComment { }; ] }, "display_name": "utils::D", - "id": "1492514566602019299", + "id": "11940116532816154397", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -368,7 +373,7 @@ class NoComment { }; "E3" ], "display_name": "E", - "id": "2027344031570117998", + "id": "16218752252560943986", "is_nested": false, "name": "E", "namespace": "clanguml::t00050", @@ -396,21 +401,21 @@ class NoComment { }; "text": "\n \n\n This class is just for testing tparam parsing, it serves no other\n purpose.\n\n \n", "tparam": [ { - "description": " Type of array elements.\n \n", + "description": "Type of array elements.", "name": "T" }, { - "description": " Type of regular element.\n \n", + "description": "Type of regular element.", "name": "V" }, { - "description": " Size of T array.\n", + "description": "Size of T array.", "name": "N" } ] }, "display_name": "F", - "id": "793698410848959592", + "id": "6349587286791676739", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -442,7 +447,59 @@ class NoComment { }; "type": "V" } ], - "methods": [], + "methods": [ + { + "access": "private", + "comment": { + "brief": [ + " Set value of v\n" + ], + "formatted": "\\brief Set value of v\n\n\\param v_ New value for v", + "paragraph": [ + " \n", + " \n" + ], + "param": [ + { + "description": "New value for v", + "name": "v_" + } + ], + "raw": "/// \\brief Set value of v\n ///\n /// \\param v_ New value for v", + "text": "\n \n\n \n" + }, + "display_name": "set_value", + "is_const": true, + "is_consteval": false, + "is_constexpr": false, + "is_constructor": false, + "is_copy_assignment": false, + "is_coroutine": false, + "is_defaulted": false, + "is_deleted": false, + "is_move_assignment": false, + "is_noexcept": false, + "is_operator": false, + "is_pure_virtual": false, + "is_static": false, + "is_virtual": false, + "name": "set_value", + "parameters": [ + { + "name": "v_", + "type": "V" + } + ], + "source_location": { + "column": 7, + "file": "t00050.cc", + "line": 88, + "translation_unit": "t00050.cc" + }, + "template_parameters": [], + "type": "V" + } + ], "name": "F", "namespace": "clanguml::t00050", "source_location": { @@ -487,7 +544,7 @@ class NoComment { }; "text": "\n This is a short description of class G.\n\n This is an intermediate description of class G.\n\n This is a long description of class G.\n" }, "display_name": "G", - "id": "449485154531299941", + "id": "3595881236250399534", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -500,7 +557,7 @@ class NoComment { }; "source_location": { "column": 7, "file": "t00050.cc", - "line": 91, + "line": 96, "translation_unit": "t00050.cc" }, "template_parameters": [], @@ -509,7 +566,7 @@ class NoComment { }; { "bases": [], "display_name": "NoComment", - "id": "1832693799357996932", + "id": "14661550394863975460", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -522,7 +579,7 @@ class NoComment { }; "source_location": { "column": 7, "file": "t00050.cc", - "line": 93, + "line": 98, "translation_unit": "t00050.cc" }, "template_parameters": [], diff --git a/docs/test_cases/t00050_class.svg b/docs/test_cases/t00050_class.svg index fc12688c..fcc39b62 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,53 +52,60 @@ E3 - - - - - F - - T,V,int N - - + + + + + F + + T,V,int N + - - - + + + - - t : T[] + + set_value(V v_) const : V - - - + + + + - - v : V + + t : T[] - - + + + + + + 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 +132,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 +188,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 6b078a4c..ed5c1a4e 100644 --- a/docs/test_cases/t00050_class_mermaid.svg +++ b/docs/test_cases/t00050_class_mermaid.svg @@ -1,4 +1,4 @@ - + @@ -50,18 +50,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -184,8 +184,8 @@ - - + + @@ -203,8 +203,8 @@ - - + + @@ -222,8 +222,8 @@ - - + + @@ -241,8 +241,8 @@ - - + + @@ -260,8 +260,8 @@ - - + + @@ -294,37 +294,42 @@ - - - - - + + + + +
- +
F<T,V,int N>
- +
-t : T[]
- +
-v : V
+ +
+ -set_value(V v_) : [const] V +
+ - - + + @@ -342,8 +347,8 @@ - - + + diff --git a/docs/test_cases/t00051.md b/docs/test_cases/t00051.md index 517e4ad2..5fb0c23e 100644 --- a/docs/test_cases/t00051.md +++ b/docs/test_cases/t00051.md @@ -92,13 +92,13 @@ A::custom_thread2 A::start_thread2() "bases": [ { "access": "private", - "id": "1911564114172366679", + "id": "15292512913378933439", "is_virtual": false, "name": "std::thread" } ], "display_name": "B", - "id": "486675674447050206", + "id": "3893405395576401653", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -254,13 +254,13 @@ A::custom_thread2 A::start_thread2() "bases": [ { "access": "private", - "id": "1911564114172366679", + "id": "15292512913378933439", "is_virtual": false, "name": "std::thread" } ], "display_name": "B<(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)>", - "id": "1969502737237579476", + "id": "15756021897900635813", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -414,7 +414,7 @@ A::custom_thread2 A::start_thread2() { "bases": [], "display_name": "A", - "id": "1064663612772326174", + "id": "8517308902178609395", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -550,13 +550,13 @@ A::custom_thread2 A::start_thread2() "bases": [ { "access": "private", - "id": "1911564114172366679", + "id": "15292512913378933439", "is_virtual": false, "name": "std::thread" } ], "display_name": "A::custom_thread1", - "id": "267762118222214764", + "id": "2142096945777718118", "is_abstract": false, "is_nested": true, "is_struct": false, @@ -624,13 +624,13 @@ A::custom_thread2 A::start_thread2() "bases": [ { "access": "private", - "id": "1911564114172366679", + "id": "15292512913378933439", "is_virtual": false, "name": "std::thread" } ], "display_name": "A::custom_thread2", - "id": "728501319748477470", + "id": "5828010557987819764", "is_abstract": false, "is_nested": true, "is_struct": false, @@ -689,50 +689,50 @@ A::custom_thread2 A::start_thread2() "relationships": [ { "access": "private", - "destination": "1911564114172366679", - "source": "486675674447050206", + "destination": "15292512913378933439", + "source": "3893405395576401653", "type": "extension" }, { "access": "public", - "destination": "486675674447050206", - "source": "1969502737237579476", + "destination": "3893405395576401653", + "source": "15756021897900635813", "type": "instantiation" }, { "access": "private", - "destination": "1911564114172366679", - "source": "1969502737237579476", + "destination": "15292512913378933439", + "source": "15756021897900635813", "type": "extension" }, { "access": "public", - "destination": "1969502737237579476", - "source": "1064663612772326174", + "destination": "15756021897900635813", + "source": "8517308902178609395", "type": "dependency" }, { "access": "public", - "destination": "1064663612772326174", - "source": "267762118222214764", + "destination": "8517308902178609395", + "source": "2142096945777718118", "type": "containment" }, { "access": "private", - "destination": "1911564114172366679", - "source": "267762118222214764", + "destination": "15292512913378933439", + "source": "2142096945777718118", "type": "extension" }, { "access": "public", - "destination": "1064663612772326174", - "source": "728501319748477470", + "destination": "8517308902178609395", + "source": "5828010557987819764", "type": "containment" }, { "access": "private", - "destination": "1911564114172366679", - "source": "728501319748477470", + "destination": "15292512913378933439", + "source": "5828010557987819764", "type": "extension" } ], diff --git a/docs/test_cases/t00051_class.svg b/docs/test_cases/t00051_class.svg index 83a6ab65..6101aa15 100644 --- a/docs/test_cases/t00051_class.svg +++ b/docs/test_cases/t00051_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + B @@ -18,45 +18,45 @@ F,FF=F - + - + B(F && f, FF && ff) : void - + - + f() : void - + - + ff() : void - + - + f_ : F - + - + ff_ : FF - - + + B @@ -64,81 +64,81 @@ (lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27) - + - + B((lambda at t00051.cc:43:18) && f, (lambda at t00051.cc:43:27) && ff) : void - + - + f() : void - + - + ff() : void - + - + f_ : (lambda at t00051.cc:43:18) - + - + ff_ : (lambda at t00051.cc:43:27) - - + + A - + - + get_function() : (lambda at t00051.cc:48:16) - + - + start_thread1() : custom_thread1 - + - + start_thread2() : custom_thread2 - + - + start_thread3() : B<(lambda at t00051.cc:43:18),(lambda at t00051.cc:43:27)> - - + + A::custom_thread1 @@ -147,30 +147,30 @@ custom_thread1<Function,Args...>(Function && f, Args &&... args) : void - - + + A::custom_thread2 - + - + thread((lambda at t00051.cc:59:27) &&) : void - + - + - + - + diff --git a/docs/test_cases/t00051_class_mermaid.svg b/docs/test_cases/t00051_class_mermaid.svg index b4ac0126..a4445d87 100644 --- a/docs/test_cases/t00051_class_mermaid.svg +++ b/docs/test_cases/t00051_class_mermaid.svg @@ -102,8 +102,8 @@ - - + + @@ -146,8 +146,8 @@ - - + + @@ -190,8 +190,8 @@ - - + + @@ -229,8 +229,8 @@ - - + + @@ -253,8 +253,8 @@ - - + + diff --git a/docs/test_cases/t00052.md b/docs/test_cases/t00052.md index 9531cbd7..8e116d65 100644 --- a/docs/test_cases/t00052.md +++ b/docs/test_cases/t00052.md @@ -62,7 +62,7 @@ struct R { { "bases": [], "display_name": "A", - "id": "2200853067459698271", + "id": "17606824539677586172", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -163,7 +163,7 @@ struct R { { "bases": [], "display_name": "B", - "id": "1737293776724790064", + "id": "13898350213798320518", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -264,7 +264,7 @@ struct R { { "bases": [], "display_name": "C", - "id": "687756639884832524", + "id": "5502053119078660195", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -328,7 +328,7 @@ struct R { { "bases": [], "display_name": "B", - "id": "1043027222809675776", + "id": "8344217782477406209", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -357,7 +357,7 @@ struct R { { "bases": [], "display_name": "C", - "id": "492968837554438176", + "id": "3943750700435505414", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -386,7 +386,7 @@ struct R { { "bases": [], "display_name": "R", - "id": "1157978668683299226", + "id": "9263829349466393810", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -448,35 +448,35 @@ struct R { "relationships": [ { "access": "public", - "destination": "1737293776724790064", - "source": "1043027222809675776", + "destination": "13898350213798320518", + "source": "8344217782477406209", "type": "instantiation" }, { "access": "public", - "destination": "687756639884832524", - "source": "492968837554438176", + "destination": "5502053119078660195", + "source": "3943750700435505414", "type": "instantiation" }, { "access": "public", - "destination": "2200853067459698271", + "destination": "17606824539677586172", "label": "a", - "source": "1157978668683299226", + "source": "9263829349466393810", "type": "aggregation" }, { "access": "public", - "destination": "1043027222809675776", + "destination": "8344217782477406209", "label": "b", - "source": "1157978668683299226", + "source": "9263829349466393810", "type": "aggregation" }, { "access": "public", - "destination": "492968837554438176", + "destination": "3943750700435505414", "label": "c", - "source": "1157978668683299226", + "source": "9263829349466393810", "type": "aggregation" } ], diff --git a/docs/test_cases/t00052_class.svg b/docs/test_cases/t00052_class.svg index 6e201130..31e0097f 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,46 +72,46 @@ - - + + R - + - + a : A - + - + b : B<int> - + - + c : C<int> - + - + - + +a - + +b - + +c diff --git a/docs/test_cases/t00052_class_mermaid.svg b/docs/test_cases/t00052_class_mermaid.svg index 9c5ec74d..a871451e 100644 --- a/docs/test_cases/t00052_class_mermaid.svg +++ b/docs/test_cases/t00052_class_mermaid.svg @@ -114,8 +114,8 @@ - - + + @@ -143,8 +143,8 @@ - - + + @@ -172,8 +172,8 @@ - - + + @@ -196,8 +196,8 @@ - - + + @@ -215,8 +215,8 @@ - - + + @@ -234,8 +234,8 @@ - - + + diff --git a/docs/test_cases/t00053.md b/docs/test_cases/t00053.md index 60c9735b..14e93f61 100644 --- a/docs/test_cases/t00053.md +++ b/docs/test_cases/t00053.md @@ -59,7 +59,7 @@ enum class j { jjj }; { "bases": [], "display_name": "a", - "id": "347629837292519144", + "id": "2781038698340153159", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -81,7 +81,7 @@ enum class j { jjj }; { "bases": [], "display_name": "b", - "id": "1376344645244260547", + "id": "11010757161954084380", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -103,7 +103,7 @@ enum class j { jjj }; { "bases": [], "display_name": "c", - "id": "504463801094568803", + "id": "4035710408756550430", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -125,7 +125,7 @@ enum class j { jjj }; { "bases": [], "display_name": "d", - "id": "1264455164862224089", + "id": "10115641318897792718", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -147,7 +147,7 @@ enum class j { jjj }; { "bases": [], "display_name": "e", - "id": "907921963776939609", + "id": "7263375710215516879", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -169,7 +169,7 @@ enum class j { jjj }; { "bases": [], "display_name": "f", - "id": "1421289128664274084", + "id": "11370313029314192677", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -191,7 +191,7 @@ enum class j { jjj }; { "bases": [], "display_name": "g", - "id": "200227126708762001", + "id": "1601817013670096009", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -213,7 +213,7 @@ enum class j { jjj }; { "bases": [], "display_name": "A", - "id": "322642841130459425", + "id": "2581142729043675406", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -235,7 +235,7 @@ enum class j { jjj }; { "bases": [], "display_name": "B", - "id": "876623970071162908", + "id": "7012991760569303265", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -257,7 +257,7 @@ enum class j { jjj }; { "bases": [], "display_name": "C", - "id": "1248473990784124468", + "id": "9987791926272995751", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -279,7 +279,7 @@ enum class j { jjj }; { "bases": [], "display_name": "D", - "id": "470228045297785394", + "id": "3761824362382283158", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -301,7 +301,7 @@ enum class j { jjj }; { "bases": [], "display_name": "E", - "id": "1038384764221361257", + "id": "8307078113770890060", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -323,7 +323,7 @@ enum class j { jjj }; { "bases": [], "display_name": "F", - "id": "530253748811039667", + "id": "4242029990488317339", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -345,7 +345,7 @@ enum class j { jjj }; { "bases": [], "display_name": "G", - "id": "1031614323468823578", + "id": "8252914587750588627", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -369,7 +369,7 @@ enum class j { jjj }; "hhh" ], "display_name": "h", - "id": "190978367074032185", + "id": "1527826936592257484", "is_nested": false, "name": "h", "namespace": "clanguml::t00053", @@ -386,7 +386,7 @@ enum class j { jjj }; "iii" ], "display_name": "i", - "id": "1473214620883985930", + "id": "11785716967071887447", "is_nested": false, "name": "i", "namespace": "clanguml::t00053", @@ -403,7 +403,7 @@ enum class j { jjj }; "jjj" ], "display_name": "j", - "id": "965083605473661435", + "id": "7720668843789291480", "is_nested": false, "name": "j", "namespace": "clanguml::t00053", diff --git a/docs/test_cases/t00053_class.svg b/docs/test_cases/t00053_class.svg index c37b383f..4ece6b67 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 711569e9..7a5c0e07 100644 --- a/docs/test_cases/t00053_class_mermaid.svg +++ b/docs/test_cases/t00053_class_mermaid.svg @@ -52,8 +52,8 @@ - - + + @@ -71,8 +71,8 @@ - - + + @@ -90,8 +90,8 @@ - - + + @@ -109,8 +109,8 @@ - - + + @@ -128,8 +128,8 @@ - - + + @@ -147,8 +147,8 @@ - - + + @@ -166,8 +166,8 @@ - - + + @@ -190,8 +190,8 @@ - - + + @@ -209,8 +209,8 @@ - - + + @@ -228,8 +228,8 @@ - - + + @@ -247,8 +247,8 @@ - - + + @@ -266,8 +266,8 @@ - - + + @@ -285,8 +285,8 @@ - - + + @@ -304,8 +304,8 @@ - - + + @@ -323,8 +323,8 @@ - - + + @@ -342,8 +342,8 @@ - - + + @@ -366,8 +366,8 @@ - - + + diff --git a/docs/test_cases/t00054.md b/docs/test_cases/t00054.md index c4ed53bf..c79edc21 100644 --- a/docs/test_cases/t00054.md +++ b/docs/test_cases/t00054.md @@ -73,7 +73,7 @@ enum class j { jjj }; { "bases": [], "display_name": "a", - "id": "1158868779503074564", + "id": "9270950236024596515", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -95,7 +95,7 @@ enum class j { jjj }; { "bases": [], "display_name": "b", - "id": "252416999805673718", + "id": "2019335998445389750", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -120,7 +120,7 @@ enum class j { jjj }; { "bases": [], "display_name": "c", - "id": "1168031834662719964", + "id": "9344254677301759712", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -142,7 +142,7 @@ enum class j { jjj }; { "bases": [], "display_name": "d", - "id": "1569559620782547158", + "id": "12556476966260377269", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -164,7 +164,7 @@ enum class j { jjj }; { "bases": [], "display_name": "e", - "id": "2037550833462858827", + "id": "16300406667702870622", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -190,7 +190,7 @@ enum class j { jjj }; { "bases": [], "display_name": "f", - "id": "2123626454198320938", + "id": "16989011633586567505", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -212,7 +212,7 @@ enum class j { jjj }; { "bases": [], "display_name": "g", - "id": "595494794840378320", + "id": "4763958358723026560", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -234,7 +234,7 @@ enum class j { jjj }; { "bases": [], "display_name": "A", - "id": "917656824503504804", + "id": "7341254596028038438", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -256,7 +256,7 @@ enum class j { jjj }; { "bases": [], "display_name": "B", - "id": "1235773045370563004", + "id": "9886184362964504036", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -281,7 +281,7 @@ enum class j { jjj }; { "bases": [], "display_name": "C", - "id": "540054955081677892", + "id": "4320439640653423141", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -306,7 +306,7 @@ enum class j { jjj }; { "bases": [], "display_name": "D", - "id": "1266390196945323478", + "id": "10131121575562587828", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -328,7 +328,7 @@ enum class j { jjj }; { "bases": [], "display_name": "E", - "id": "134928214982255105", + "id": "1079425719858040844", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -354,7 +354,7 @@ enum class j { jjj }; { "bases": [], "display_name": "F", - "id": "446694692150903211", + "id": "3573557537207225693", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -380,7 +380,7 @@ enum class j { jjj }; { "bases": [], "display_name": "G", - "id": "1365815261671395853", + "id": "10926522093371166825", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -407,7 +407,7 @@ enum class j { jjj }; "hhh" ], "display_name": "h", - "id": "1592677999268391183", + "id": "12741423994147129467", "is_nested": false, "name": "h", "namespace": "clanguml::t00054::detail4", @@ -424,7 +424,7 @@ enum class j { jjj }; "iii" ], "display_name": "i", - "id": "441521323390223397", + "id": "3532170587121787176", "is_nested": false, "name": "i", "namespace": "clanguml::t00054::detail4", @@ -441,7 +441,7 @@ enum class j { jjj }; "jjj" ], "display_name": "j", - "id": "499334434426587347", + "id": "3994675475412698780", "is_nested": false, "name": "j", "namespace": "clanguml::t00054::detail4", diff --git a/docs/test_cases/t00054_class.svg b/docs/test_cases/t00054_class.svg index 6ca3cc43..476e467e 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 e66a74c5..4bb4de34 100644 --- a/docs/test_cases/t00054_class_mermaid.svg +++ b/docs/test_cases/t00054_class_mermaid.svg @@ -52,8 +52,8 @@ - - + + @@ -71,8 +71,8 @@ - - + + @@ -90,8 +90,8 @@ - - + + @@ -109,8 +109,8 @@ - - + + @@ -128,8 +128,8 @@ - - + + @@ -147,8 +147,8 @@ - - + + @@ -166,8 +166,8 @@ - - + + @@ -185,8 +185,8 @@ - - + + @@ -204,8 +204,8 @@ - - + + @@ -223,8 +223,8 @@ - - + + @@ -242,8 +242,8 @@ - - + + @@ -261,8 +261,8 @@ - - + + @@ -280,8 +280,8 @@ - - + + @@ -304,8 +304,8 @@ - - + + @@ -328,8 +328,8 @@ - - + + @@ -352,8 +352,8 @@ - - + + @@ -371,8 +371,8 @@ - - + + diff --git a/docs/test_cases/t00055.md b/docs/test_cases/t00055.md index 057a08ff..10e3dbea 100644 --- a/docs/test_cases/t00055.md +++ b/docs/test_cases/t00055.md @@ -46,7 +46,7 @@ struct J { }; { "bases": [], "display_name": "A", - "id": "1697191682863715554", + "id": "13577533462909724435", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -68,7 +68,7 @@ struct J { }; { "bases": [], "display_name": "B", - "id": "188599859894721517", + "id": "1508798879157772141", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -90,7 +90,7 @@ struct J { }; { "bases": [], "display_name": "C", - "id": "625177137967392996", + "id": "5001417103739143969", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -112,7 +112,7 @@ struct J { }; { "bases": [], "display_name": "D", - "id": "1046415640323289221", + "id": "8371325122586313773", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -134,7 +134,7 @@ struct J { }; { "bases": [], "display_name": "E", - "id": "702117239243796422", + "id": "5616937913950371376", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -156,7 +156,7 @@ struct J { }; { "bases": [], "display_name": "F", - "id": "1511375015718046137", + "id": "12091000125744369101", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -178,7 +178,7 @@ struct J { }; { "bases": [], "display_name": "G", - "id": "651600874645139639", + "id": "5212806997161117118", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -200,7 +200,7 @@ struct J { }; { "bases": [], "display_name": "H", - "id": "374142601071476038", + "id": "2993140808571808311", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -222,7 +222,7 @@ struct J { }; { "bases": [], "display_name": "I", - "id": "295372236079742697", + "id": "2362977888637941582", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -244,7 +244,7 @@ struct J { }; { "bases": [], "display_name": "J", - "id": "769231292718551090", + "id": "6153850341748408722", "is_abstract": false, "is_nested": false, "is_struct": true, diff --git a/docs/test_cases/t00055_class.svg b/docs/test_cases/t00055_class.svg index 84925e0b..61020633 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 0219e6a1..797a3f56 100644 --- a/docs/test_cases/t00055_class_mermaid.svg +++ b/docs/test_cases/t00055_class_mermaid.svg @@ -52,8 +52,8 @@ - - + + @@ -71,8 +71,8 @@ - - + + @@ -90,8 +90,8 @@ - - + + @@ -109,8 +109,8 @@ - - + + @@ -128,8 +128,8 @@ - - + + @@ -147,8 +147,8 @@ - - + + @@ -166,8 +166,8 @@ - - + + @@ -185,8 +185,8 @@ - - + + @@ -204,8 +204,8 @@ - - + + @@ -223,8 +223,8 @@ - - + + diff --git a/docs/test_cases/t00056.md b/docs/test_cases/t00056.md index 0e3dc24e..0db5738b 100644 --- a/docs/test_cases/t00056.md +++ b/docs/test_cases/t00056.md @@ -120,7 +120,7 @@ struct F { "elements": [ { "display_name": "greater_than_simple", - "id": "902541696362244204", + "id": "7220333570897953632", "name": "greater_than_simple", "namespace": "clanguml::t00056", "parameters": [], @@ -135,7 +135,7 @@ struct F { }, { "display_name": "greater_than_with_requires", - "id": "1830716585637735576", + "id": "14645732685101884614", "name": "greater_than_with_requires", "namespace": "clanguml::t00056", "parameters": [ @@ -161,7 +161,7 @@ struct F { }, { "display_name": "max_four_bytes", - "id": "385255522691733325", + "id": "3082044181533866602", "name": "max_four_bytes", "namespace": "clanguml::t00056", "parameters": [], @@ -176,7 +176,7 @@ struct F { }, { "display_name": "iterable", - "id": "392540961352249242", + "id": "3140327690817993937", "name": "iterable", "namespace": "clanguml::t00056", "parameters": [ @@ -199,7 +199,7 @@ struct F { }, { "display_name": "has_value_type", - "id": "1850394311226276678", + "id": "14803154489810213430", "name": "has_value_type", "namespace": "clanguml::t00056", "parameters": [], @@ -216,7 +216,7 @@ struct F { }, { "display_name": "convertible_to_string", - "id": "137304962071054497", + "id": "1098439696568435981", "name": "convertible_to_string", "namespace": "clanguml::t00056", "parameters": [ @@ -240,7 +240,7 @@ struct F { }, { "display_name": "iterable_with_value_type", - "id": "1043398062146751019", + "id": "8347184497174008159", "name": "iterable_with_value_type", "namespace": "clanguml::t00056", "parameters": [], @@ -255,7 +255,7 @@ struct F { }, { "display_name": "iterable_or_small_value_type", - "id": "866345615551223718", + "id": "6930764924409789751", "name": "iterable_or_small_value_type", "namespace": "clanguml::t00056", "parameters": [], @@ -271,7 +271,7 @@ struct F { { "bases": [], "display_name": "A", - "id": "1418333499545421661", + "id": "11346667996363373290", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -313,7 +313,7 @@ struct F { { "bases": [], "display_name": "B", - "id": "1814355496814977880", + "id": "14514843974519823043", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -355,7 +355,7 @@ struct F { { "bases": [], "display_name": "C", - "id": "1512618198241549089", + "id": "12100945585932392719", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -397,7 +397,7 @@ struct F { { "bases": [], "display_name": "D", - "id": "1635109601630198093", + "id": "13080876813041584751", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -450,7 +450,7 @@ struct F { { "bases": [], "display_name": "E", - "id": "1429225801945621089", + "id": "11433806415564968716", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -528,7 +528,7 @@ struct F { { "bases": [], "display_name": "F", - "id": "856301122972546034", + "id": "6850408983780368279", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -608,87 +608,87 @@ struct F { "package_type": "namespace", "relationships": [ { - "destination": "385255522691733325", + "destination": "3082044181533866602", "label": "T", - "source": "137304962071054497", + "source": "1098439696568435981", "type": "constraint" }, { - "destination": "392540961352249242", + "destination": "3140327690817993937", "label": "T", - "source": "1043398062146751019", + "source": "8347184497174008159", "type": "constraint" }, { - "destination": "1850394311226276678", + "destination": "14803154489810213430", "label": "T", - "source": "1043398062146751019", + "source": "8347184497174008159", "type": "constraint" }, { - "destination": "1043398062146751019", + "destination": "8347184497174008159", "label": "T", - "source": "866345615551223718", + "source": "6930764924409789751", "type": "constraint" }, { - "destination": "385255522691733325", + "destination": "3082044181533866602", "label": "T", - "source": "866345615551223718", + "source": "6930764924409789751", "type": "constraint" }, { - "destination": "385255522691733325", + "destination": "3082044181533866602", "label": "T", - "source": "1418333499545421661", + "source": "11346667996363373290", "type": "constraint" }, { - "destination": "866345615551223718", + "destination": "6930764924409789751", "label": "T", - "source": "1814355496814977880", + "source": "14514843974519823043", "type": "constraint" }, { - "destination": "137304962071054497", + "destination": "1098439696568435981", "label": "T", - "source": "1512618198241549089", + "source": "12100945585932392719", "type": "constraint" }, { - "destination": "392540961352249242", + "destination": "3140327690817993937", "label": "T1", - "source": "1635109601630198093", + "source": "13080876813041584751", "type": "constraint" }, { - "destination": "392540961352249242", + "destination": "3140327690817993937", "label": "T3", - "source": "1635109601630198093", + "source": "13080876813041584751", "type": "constraint" }, { - "destination": "385255522691733325", + "destination": "3082044181533866602", "label": "T2", - "source": "1635109601630198093", + "source": "13080876813041584751", "type": "constraint" }, { - "destination": "385255522691733325", + "destination": "3082044181533866602", "label": "T5", - "source": "1635109601630198093", + "source": "13080876813041584751", "type": "constraint" }, { - "destination": "1830716585637735576", + "destination": "14645732685101884614", "label": "T1,T3", - "source": "1429225801945621089", + "source": "11433806415564968716", "type": "constraint" }, { - "destination": "902541696362244204", + "destination": "7220333570897953632", "label": "T1,T3", - "source": "856301122972546034", + "source": "6850408983780368279", "type": "constraint" } ], diff --git a/docs/test_cases/t00056_class.svg b/docs/test_cases/t00056_class.svg index eff26280..3f5846f0 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,67 +210,67 @@ - + - + f1 : T1 - + - + f2 : T2 - + - + f3 : T3 - + T - + T - + T - + T - + T - + T - + T - + T - + T1 - + T3 - + T2 - + T5 - + T1,T3 - + T1,T3 diff --git a/docs/test_cases/t00056_class_mermaid.svg b/docs/test_cases/t00056_class_mermaid.svg index 11ae044b..c8a835ff 100644 --- a/docs/test_cases/t00056_class_mermaid.svg +++ b/docs/test_cases/t00056_class_mermaid.svg @@ -222,8 +222,8 @@ - - + + @@ -241,8 +241,8 @@ - - + + @@ -270,8 +270,8 @@ - - + + @@ -289,8 +289,8 @@ - - + + @@ -323,8 +323,8 @@ - - + + @@ -352,8 +352,8 @@ - - + + @@ -391,8 +391,8 @@ - - + + @@ -410,8 +410,8 @@ - - + + @@ -429,8 +429,8 @@ - - + + @@ -453,8 +453,8 @@ - - + + @@ -477,8 +477,8 @@ - - + + @@ -501,8 +501,8 @@ - - + + @@ -520,8 +520,8 @@ - - + + @@ -554,8 +554,8 @@ - - + + diff --git a/docs/test_cases/t00057.md b/docs/test_cases/t00057.md index 44a59972..1e72be4d 100644 --- a/docs/test_cases/t00057.md +++ b/docs/test_cases/t00057.md @@ -83,7 +83,7 @@ struct t00057_F; { "bases": [], "display_name": "t00057_A", - "id": "940295970488928395", + "id": "7522367763911427167", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -118,7 +118,7 @@ struct t00057_F; { "bases": [], "display_name": "t00057_B", - "id": "1030391494410415852", + "id": "8243131955283326817", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -153,7 +153,7 @@ struct t00057_F; { "bases": [], "display_name": "t00057_C", - "id": "388213894542327772", + "id": "3105711156338622177", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -188,7 +188,7 @@ struct t00057_F; { "bases": [], "display_name": "t00057_D", - "id": "784667124248020371", + "id": "6277336993984162970", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -235,7 +235,7 @@ struct t00057_F; { "bases": [], "display_name": "t00057_E", - "id": "682873132844345324", + "id": "5462985062754762593", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -294,7 +294,7 @@ struct t00057_F; { "bases": [], "display_name": "t00057_E::(coordinates)", - "id": "161676142413826748", + "id": "1293409139310613986", "is_abstract": false, "is_nested": true, "is_struct": true, @@ -341,7 +341,7 @@ struct t00057_F; { "bases": [], "display_name": "t00057_E::(height)", - "id": "2265335931722752750", + "id": "18122687453782022004", "is_abstract": false, "is_nested": true, "is_struct": false, @@ -388,7 +388,7 @@ struct t00057_F; { "bases": [], "display_name": "t00057_G", - "id": "1592909736406415155", + "id": "12743277891251321247", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -423,7 +423,7 @@ struct t00057_F; { "bases": [], "display_name": "t00057_R", - "id": "370583978606928327", + "id": "2964671828855426619", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -530,7 +530,7 @@ struct t00057_F; { "bases": [], "display_name": "t00057_F", - "id": "85797106299568719", + "id": "686376850396549754", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -568,65 +568,65 @@ struct t00057_F; "relationships": [ { "access": "public", - "destination": "161676142413826748", + "destination": "1293409139310613986", "label": "coordinates", - "source": "682873132844345324", + "source": "5462985062754762593", "type": "aggregation" }, { "access": "public", - "destination": "2265335931722752750", + "destination": "18122687453782022004", "label": "height", - "source": "682873132844345324", + "source": "5462985062754762593", "type": "aggregation" }, { "access": "public", - "destination": "940295970488928395", + "destination": "7522367763911427167", "label": "a", - "source": "370583978606928327", + "source": "2964671828855426619", "type": "aggregation" }, { "access": "public", - "destination": "1030391494410415852", + "destination": "8243131955283326817", "label": "b", - "source": "370583978606928327", + "source": "2964671828855426619", "type": "aggregation" }, { "access": "public", - "destination": "388213894542327772", + "destination": "3105711156338622177", "label": "c", - "source": "370583978606928327", + "source": "2964671828855426619", "type": "association" }, { "access": "public", - "destination": "784667124248020371", + "destination": "6277336993984162970", "label": "d", - "source": "370583978606928327", + "source": "2964671828855426619", "type": "aggregation" }, { "access": "public", - "destination": "682873132844345324", + "destination": "5462985062754762593", "label": "e", - "source": "370583978606928327", + "source": "2964671828855426619", "type": "association" }, { "access": "public", - "destination": "85797106299568719", + "destination": "686376850396549754", "label": "f", - "source": "370583978606928327", + "source": "2964671828855426619", "type": "association" }, { "access": "public", - "destination": "1592909736406415155", + "destination": "12743277891251321247", "label": "g", - "source": "370583978606928327", + "source": "2964671828855426619", "type": "association" } ] diff --git a/docs/test_cases/t00057_class.svg b/docs/test_cases/t00057_class.svg index c99ed20d..dc9c520a 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::(coordinates) - + - + e : int - + - + height : t00057_E::(height) - - + + t00057_E::(coordinates) - + - + x : int - + - + y : int - - + + «union» @@ -137,134 +137,134 @@ - + - + t : double - + - + z : int - - + + t00057_G - + - + g1 : int - - + + t00057_R - + - + a : struct t00057_A - + - + b : t00057_B - + - + c : struct t00057_C * - + - + d : union t00057_D - + - + e : struct t00057_E * - + - + f : struct t00057_F * - + - + g : struct t00057_G * - - + + t00057_F - + - + f1 : int - + coordinates - + height - + +a - + +b - + +c - + +d - + +e - + +f - + +g diff --git a/docs/test_cases/t00057_class_mermaid.svg b/docs/test_cases/t00057_class_mermaid.svg index d36fd863..9eaec861 100644 --- a/docs/test_cases/t00057_class_mermaid.svg +++ b/docs/test_cases/t00057_class_mermaid.svg @@ -162,8 +162,8 @@ - - + + @@ -186,8 +186,8 @@ - - + + @@ -210,8 +210,8 @@ - - + + @@ -234,8 +234,8 @@ - - + + @@ -263,8 +263,8 @@ - - + + @@ -297,8 +297,8 @@ - - + + @@ -326,8 +326,8 @@ - - + + @@ -355,8 +355,8 @@ - - + + @@ -379,8 +379,8 @@ - - + + @@ -433,8 +433,8 @@ - - + + diff --git a/docs/test_cases/t00058.md b/docs/test_cases/t00058.md index 849c68a7..2b811f3a 100644 --- a/docs/test_cases/t00058.md +++ b/docs/test_cases/t00058.md @@ -77,7 +77,7 @@ struct R { { "bases": [], "display_name": "first_type", - "id": "39461943261269692", + "id": "315695546090157538", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -111,7 +111,7 @@ struct R { }, { "display_name": "same_as_first_type", - "id": "1725820236573641307", + "id": "13806561892589130461", "name": "same_as_first_type", "namespace": "clanguml::t00058", "parameters": [], @@ -127,7 +127,7 @@ struct R { { "bases": [], "display_name": "A", - "id": "798619347004821702", + "id": "6388954776038573618", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -175,7 +175,7 @@ struct R { { "bases": [], "display_name": "B", - "id": "420594889696591405", + "id": "3364759117572731240", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -241,7 +241,7 @@ struct R { { "bases": [], "display_name": "A", - "id": "1724002183455178980", + "id": "13792017467641431843", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -288,7 +288,7 @@ struct R { { "bases": [], "display_name": "A", - "id": "1372381231906520278", + "id": "10979049855252162226", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -323,7 +323,7 @@ struct R { { "bases": [], "display_name": "B>", - "id": "290383080560130133", + "id": "2323064644481041066", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -389,7 +389,7 @@ struct R { { "bases": [], "display_name": "R", - "id": "1015108159699260009", + "id": "8120865277594080075", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -438,53 +438,53 @@ struct R { "package_type": "namespace", "relationships": [ { - "destination": "1725820236573641307", + "destination": "13806561892589130461", "label": "T,Args...", - "source": "798619347004821702", + "source": "6388954776038573618", "type": "constraint" }, { - "destination": "1725820236573641307", + "destination": "13806561892589130461", "label": "T,Args...", - "source": "420594889696591405", + "source": "3364759117572731240", "type": "constraint" }, { "access": "public", - "destination": "798619347004821702", - "source": "1724002183455178980", + "destination": "6388954776038573618", + "source": "13792017467641431843", "type": "instantiation" }, { "access": "public", - "destination": "798619347004821702", - "source": "1372381231906520278", + "destination": "6388954776038573618", + "source": "10979049855252162226", "type": "instantiation" }, { "access": "public", - "destination": "1372381231906520278", - "source": "290383080560130133", + "destination": "10979049855252162226", + "source": "2323064644481041066", "type": "dependency" }, { "access": "public", - "destination": "420594889696591405", - "source": "290383080560130133", + "destination": "3364759117572731240", + "source": "2323064644481041066", "type": "instantiation" }, { "access": "public", - "destination": "1724002183455178980", + "destination": "13792017467641431843", "label": "aa", - "source": "1015108159699260009", + "source": "8120865277594080075", "type": "aggregation" }, { "access": "public", - "destination": "290383080560130133", + "destination": "2323064644481041066", "label": "bb", - "source": "1015108159699260009", + "source": "8120865277594080075", "type": "aggregation" } ], diff --git a/docs/test_cases/t00058_class.svg b/docs/test_cases/t00058_class.svg index 02f50570..eb740207 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,51 +101,51 @@ - - + + R - + - + aa : A<int,int,double,std::string> - + - + bb : B<int,std::string,int,double,A<int,int>> - + T,Args... - + T,Args... - + - + - + - + - + aa - + bb - + diff --git a/docs/test_cases/t00058_class_mermaid.svg b/docs/test_cases/t00058_class_mermaid.svg index de7a37c4..553659c3 100644 --- a/docs/test_cases/t00058_class_mermaid.svg +++ b/docs/test_cases/t00058_class_mermaid.svg @@ -160,8 +160,8 @@ - - + + @@ -179,8 +179,8 @@ - - + + @@ -198,8 +198,8 @@ - - + + @@ -222,8 +222,8 @@ - - + + @@ -251,8 +251,8 @@ - - + + @@ -270,8 +270,8 @@ - - + + @@ -289,8 +289,8 @@ - - + + @@ -308,8 +308,8 @@ - - + + diff --git a/docs/test_cases/t00059.md b/docs/test_cases/t00059.md index 31948576..155b21c9 100644 --- a/docs/test_cases/t00059.md +++ b/docs/test_cases/t00059.md @@ -89,7 +89,7 @@ struct R { "elements": [ { "display_name": "fruit_c", - "id": "1926201868069460340", + "id": "15409614944555682724", "name": "fruit_c", "namespace": "clanguml::t00059", "parameters": [ @@ -112,7 +112,7 @@ struct R { }, { "display_name": "apple_c", - "id": "1932582371736186409", + "id": "15460658973889491278", "name": "apple_c", "namespace": "clanguml::t00059", "parameters": [ @@ -134,7 +134,7 @@ struct R { }, { "display_name": "orange_c", - "id": "1483904441065806133", + "id": "11871235528526449070", "name": "orange_c", "namespace": "clanguml::t00059", "parameters": [ @@ -157,7 +157,7 @@ struct R { { "bases": [], "display_name": "gala_apple", - "id": "399997161214328320", + "id": "3199977289714626562", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -236,7 +236,7 @@ struct R { { "bases": [], "display_name": "empire_apple", - "id": "660406972347773654", + "id": "5283255778782189239", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -315,7 +315,7 @@ struct R { { "bases": [], "display_name": "lima_orange", - "id": "1649295452510454080", + "id": "13194363620083632640", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -394,7 +394,7 @@ struct R { { "bases": [], "display_name": "valencia_orange", - "id": "802727760415733923", + "id": "6421822083325871384", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -473,7 +473,7 @@ struct R { { "bases": [], "display_name": "fruit_factory", - "id": "2301786483822933456", + "id": "18414291870583467652", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -565,7 +565,7 @@ struct R { { "bases": [], "display_name": "fruit_factory", - "id": "551278102444647278", + "id": "4410224819557178230", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -600,7 +600,7 @@ struct R { { "bases": [], "display_name": "fruit_factory", - "id": "536390279563541226", + "id": "4291122236508329812", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -635,7 +635,7 @@ struct R { { "bases": [], "display_name": "R", - "id": "1128300671453354325", + "id": "9026405371626834603", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -684,77 +684,77 @@ struct R { "package_type": "namespace", "relationships": [ { - "destination": "1926201868069460340", + "destination": "15409614944555682724", "label": "T", - "source": "1932582371736186409", + "source": "15460658973889491278", "type": "constraint" }, { - "destination": "1926201868069460340", + "destination": "15409614944555682724", "label": "T", - "source": "1483904441065806133", + "source": "11871235528526449070", "type": "constraint" }, { - "destination": "1932582371736186409", + "destination": "15460658973889491278", "label": "TA", - "source": "2301786483822933456", + "source": "18414291870583467652", "type": "constraint" }, { - "destination": "1483904441065806133", + "destination": "11871235528526449070", "label": "TO", - "source": "2301786483822933456", + "source": "18414291870583467652", "type": "constraint" }, { "access": "public", - "destination": "399997161214328320", - "source": "551278102444647278", + "destination": "3199977289714626562", + "source": "4410224819557178230", "type": "dependency" }, { "access": "public", - "destination": "802727760415733923", - "source": "551278102444647278", + "destination": "6421822083325871384", + "source": "4410224819557178230", "type": "dependency" }, { "access": "public", - "destination": "2301786483822933456", - "source": "551278102444647278", + "destination": "18414291870583467652", + "source": "4410224819557178230", "type": "instantiation" }, { "access": "public", - "destination": "660406972347773654", - "source": "536390279563541226", + "destination": "5283255778782189239", + "source": "4291122236508329812", "type": "dependency" }, { "access": "public", - "destination": "1649295452510454080", - "source": "536390279563541226", + "destination": "13194363620083632640", + "source": "4291122236508329812", "type": "dependency" }, { "access": "public", - "destination": "2301786483822933456", - "source": "536390279563541226", + "destination": "18414291870583467652", + "source": "4291122236508329812", "type": "instantiation" }, { "access": "public", - "destination": "551278102444647278", + "destination": "4410224819557178230", "label": "factory_1", - "source": "1128300671453354325", + "source": "9026405371626834603", "type": "aggregation" }, { "access": "public", - "destination": "536390279563541226", + "destination": "4291122236508329812", "label": "factory_2", - "source": "1128300671453354325", + "source": "9026405371626834603", "type": "aggregation" } ], diff --git a/docs/test_cases/t00059_class.svg b/docs/test_cases/t00059_class.svg index a5070e7e..911ce123 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,56 +181,56 @@ - - + + R - + - + factory_1 : fruit_factory_1 - + - + factory_2 : fruit_factory_2 - + T - + T - + TA - + TO - + - + - + - + - + - + - + factory_1 - + factory_2 diff --git a/docs/test_cases/t00059_class_mermaid.svg b/docs/test_cases/t00059_class_mermaid.svg index 4db791d0..ac40425e 100644 --- a/docs/test_cases/t00059_class_mermaid.svg +++ b/docs/test_cases/t00059_class_mermaid.svg @@ -198,8 +198,8 @@ - - + + @@ -232,8 +232,8 @@ - - + + @@ -261,8 +261,8 @@ - - + + @@ -290,8 +290,8 @@ - - + + @@ -319,8 +319,8 @@ - - + + @@ -348,8 +348,8 @@ - - + + @@ -377,8 +377,8 @@ - - + + @@ -406,8 +406,8 @@ - - + + @@ -435,8 +435,8 @@ - - + + @@ -454,8 +454,8 @@ - - + + @@ -473,8 +473,8 @@ - - + + diff --git a/docs/test_cases/t00060.md b/docs/test_cases/t00060.md index 58fc9faf..df2e18ee 100644 --- a/docs/test_cases/t00060.md +++ b/docs/test_cases/t00060.md @@ -50,7 +50,7 @@ template struct H : public G { { "bases": [], "display_name": "A", - "id": "1373615549846303472", + "id": "10988924398770427782", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -73,13 +73,13 @@ template struct H : public G { "bases": [ { "access": "public", - "id": "1373615549846303472", + "id": "10988924398770427782", "is_virtual": false, "name": "clanguml::t00060::A" } ], "display_name": "B", - "id": "479650368930934571", + "id": "3837202951447476570", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -102,13 +102,13 @@ template struct H : public G { "bases": [ { "access": "public", - "id": "1373615549846303472", + "id": "10988924398770427782", "is_virtual": false, "name": "clanguml::t00060::A" } ], "display_name": "C", - "id": "1827660844127264787", + "id": "14621286753018118303", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -131,19 +131,19 @@ template struct H : public G { "bases": [ { "access": "public", - "id": "479650368930934571", + "id": "3837202951447476570", "is_virtual": false, "name": "clanguml::t00060::B" }, { "access": "public", - "id": "1827660844127264787", + "id": "14621286753018118303", "is_virtual": false, "name": "clanguml::t00060::C" } ], "display_name": "D", - "id": "1629687372290281981", + "id": "13037498978322255855", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -165,7 +165,7 @@ template struct H : public G { { "bases": [], "display_name": "G", - "id": "1877304825033069517", + "id": "15018438600264556141", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -208,13 +208,13 @@ template struct H : public G { "bases": [ { "access": "public", - "id": "1877304825033069517", + "id": "15018438600264556141", "is_virtual": false, "name": "clanguml::t00060::G" } ], "display_name": "H", - "id": "1881610349123495638", + "id": "15052882792987965106", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -277,39 +277,39 @@ template struct H : public G { "relationships": [ { "access": "public", - "destination": "1373615549846303472", - "source": "479650368930934571", + "destination": "10988924398770427782", + "source": "3837202951447476570", "type": "extension" }, { "access": "public", - "destination": "1373615549846303472", - "source": "1827660844127264787", + "destination": "10988924398770427782", + "source": "14621286753018118303", "type": "extension" }, { "access": "public", - "destination": "479650368930934571", - "source": "1629687372290281981", + "destination": "3837202951447476570", + "source": "13037498978322255855", "type": "extension" }, { "access": "public", - "destination": "1827660844127264787", - "source": "1629687372290281981", + "destination": "14621286753018118303", + "source": "13037498978322255855", "type": "extension" }, { "access": "public", - "destination": "1877304825033069517", + "destination": "15018438600264556141", "label": "h", - "source": "1881610349123495638", + "source": "15052882792987965106", "type": "aggregation" }, { "access": "public", - "destination": "1877304825033069517", - "source": "1881610349123495638", + "destination": "15018438600264556141", + "source": "15052882792987965106", "type": "extension" } ], diff --git a/docs/test_cases/t00060_class.svg b/docs/test_cases/t00060_class.svg index 607e823e..24aac731 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,32 +68,32 @@ - + - + h : G<T> - + - + hh : P - + - + - + - + - + +h - + diff --git a/docs/test_cases/t00060_class_mermaid.svg b/docs/test_cases/t00060_class_mermaid.svg index dc07b832..4571ba02 100644 --- a/docs/test_cases/t00060_class_mermaid.svg +++ b/docs/test_cases/t00060_class_mermaid.svg @@ -116,8 +116,8 @@ - - + + @@ -135,8 +135,8 @@ - - + + @@ -154,8 +154,8 @@ - - + + @@ -173,8 +173,8 @@ - - + + @@ -192,8 +192,8 @@ - - + + @@ -216,8 +216,8 @@ - - + + diff --git a/docs/test_cases/t00061.md b/docs/test_cases/t00061.md index 98a321e0..bc1b9876 100644 --- a/docs/test_cases/t00061.md +++ b/docs/test_cases/t00061.md @@ -56,7 +56,7 @@ struct B { }; { "bases": [], "display_name": "A", - "id": "1010204727957329423", + "id": "8081637823658635385", "is_abstract": false, "is_nested": false, "is_struct": true, diff --git a/docs/test_cases/t00061_class.svg b/docs/test_cases/t00061_class.svg index 51af5d44..c8860e3b 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 3b67d36a..cab83b46 100644 --- a/docs/test_cases/t00061_class_mermaid.svg +++ b/docs/test_cases/t00061_class_mermaid.svg @@ -52,8 +52,8 @@ - - + + diff --git a/docs/test_cases/t00062.md b/docs/test_cases/t00062.md index e32f2647..d803212a 100644 --- a/docs/test_cases/t00062.md +++ b/docs/test_cases/t00062.md @@ -131,7 +131,7 @@ struct A> { { "bases": [], "display_name": "A", - "id": "1046827200300090710", + "id": "8374617602400725687", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -173,7 +173,7 @@ struct A> { { "bases": [], "display_name": "A &>", - "id": "1099548178945911245", + "id": "8796385431567289962", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -228,7 +228,7 @@ struct A> { { "bases": [], "display_name": "A> &>", - "id": "1239388209995793547", + "id": "9915105679966348381", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -283,7 +283,7 @@ struct A> { { "bases": [], "display_name": "A", - "id": "45701897814162098", + "id": "365615182513296790", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -325,7 +325,7 @@ struct A> { { "bases": [], "display_name": "A", - "id": "1379193770802992785", + "id": "11033550166423942282", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -367,7 +367,7 @@ struct A> { { "bases": [], "display_name": "A", - "id": "1407865337446777280", + "id": "11262922699574218242", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -409,7 +409,7 @@ struct A> { { "bases": [], "display_name": "A", - "id": "1034483227649400416", + "id": "8275865821195203329", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -451,7 +451,7 @@ struct A> { { "bases": [], "display_name": "A", - "id": "352457857519671117", + "id": "2819662860157368941", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -493,7 +493,7 @@ struct A> { { "bases": [], "display_name": "A", - "id": "314708288320430272", + "id": "2517666306563442180", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -559,7 +559,7 @@ struct A> { { "bases": [], "display_name": "A", - "id": "827753335392390402", + "id": "6622026683139123216", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -625,7 +625,7 @@ struct A> { { "bases": [], "display_name": "A", - "id": "395583480407686249", + "id": "3164667843261489999", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -697,7 +697,7 @@ struct A> { { "bases": [], "display_name": "A", - "id": "476497055497873078", + "id": "3811976443982984629", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -757,7 +757,7 @@ struct A> { { "bases": [], "display_name": "A", - "id": "1619634759668095904", + "id": "12957078077344767239", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -829,7 +829,7 @@ struct A> { { "bases": [], "display_name": "A", - "id": "1357746808315142717", + "id": "10861974466521141736", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -901,7 +901,7 @@ struct A> { { "bases": [], "display_name": "A", - "id": "544335779197078982", + "id": "4354686233576631860", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -985,7 +985,7 @@ struct A> { { "bases": [], "display_name": "A", - "id": "602066980416477930", + "id": "4816535843331823446", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -1039,7 +1039,7 @@ struct A> { { "bases": [], "display_name": "A", - "id": "1318419672443856415", + "id": "10547357379550851326", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -1093,7 +1093,7 @@ struct A> { { "bases": [], "display_name": "A", - "id": "599593856979463652", + "id": "4796750855835709219", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -1171,7 +1171,7 @@ struct A> { { "bases": [], "display_name": "A", - "id": "15395295268000991", + "id": "123162362144007934", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -1225,7 +1225,7 @@ struct A> { { "bases": [], "display_name": "A>", - "id": "1603321863498552207", + "id": "12826574907988417656", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -1274,7 +1274,7 @@ struct A> { { "bases": [], "display_name": "A>", - "id": "232518961342221670", + "id": "1860151690737773362", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -1341,7 +1341,7 @@ struct A> { { "bases": [], "display_name": "A", - "id": "121103565834936476", + "id": "968828526679491811", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -1373,128 +1373,128 @@ struct A> { "relationships": [ { "access": "public", - "destination": "121103565834936476", - "source": "1046827200300090710", + "destination": "968828526679491811", + "source": "8374617602400725687", "type": "instantiation" }, { "access": "public", - "destination": "1046827200300090710", - "source": "1099548178945911245", + "destination": "8374617602400725687", + "source": "8796385431567289962", "type": "instantiation" }, { "access": "public", - "destination": "1099548178945911245", - "source": "1239388209995793547", + "destination": "8796385431567289962", + "source": "9915105679966348381", "type": "instantiation" }, { "access": "public", - "destination": "121103565834936476", - "source": "45701897814162098", + "destination": "968828526679491811", + "source": "365615182513296790", "type": "instantiation" }, { "access": "public", - "destination": "45701897814162098", - "source": "1379193770802992785", + "destination": "365615182513296790", + "source": "11033550166423942282", "type": "instantiation" }, { "access": "public", - "destination": "121103565834936476", - "source": "1407865337446777280", + "destination": "968828526679491811", + "source": "11262922699574218242", "type": "instantiation" }, { "access": "public", - "destination": "121103565834936476", - "source": "1034483227649400416", + "destination": "968828526679491811", + "source": "8275865821195203329", "type": "instantiation" }, { "access": "public", - "destination": "121103565834936476", - "source": "352457857519671117", + "destination": "968828526679491811", + "source": "2819662860157368941", "type": "instantiation" }, { "access": "public", - "destination": "121103565834936476", - "source": "314708288320430272", + "destination": "968828526679491811", + "source": "2517666306563442180", "type": "instantiation" }, { "access": "public", - "destination": "1034483227649400416", - "source": "827753335392390402", + "destination": "8275865821195203329", + "source": "6622026683139123216", "type": "instantiation" }, { "access": "public", - "destination": "121103565834936476", - "source": "395583480407686249", + "destination": "968828526679491811", + "source": "3164667843261489999", "type": "instantiation" }, { "access": "public", - "destination": "395583480407686249", - "source": "476497055497873078", + "destination": "3164667843261489999", + "source": "3811976443982984629", "type": "instantiation" }, { "access": "public", - "destination": "1034483227649400416", - "source": "1619634759668095904", + "destination": "8275865821195203329", + "source": "12957078077344767239", "type": "instantiation" }, { "access": "public", - "destination": "1619634759668095904", - "source": "1357746808315142717", + "destination": "12957078077344767239", + "source": "10861974466521141736", "type": "instantiation" }, { "access": "public", - "destination": "121103565834936476", - "source": "544335779197078982", + "destination": "968828526679491811", + "source": "4354686233576631860", "type": "instantiation" }, { "access": "public", - "destination": "121103565834936476", - "source": "602066980416477930", + "destination": "968828526679491811", + "source": "4816535843331823446", "type": "instantiation" }, { "access": "public", - "destination": "602066980416477930", - "source": "1318419672443856415", + "destination": "4816535843331823446", + "source": "10547357379550851326", "type": "instantiation" }, { "access": "public", - "destination": "121103565834936476", - "source": "599593856979463652", + "destination": "968828526679491811", + "source": "4796750855835709219", "type": "instantiation" }, { "access": "public", - "destination": "121103565834936476", - "source": "15395295268000991", + "destination": "968828526679491811", + "source": "123162362144007934", "type": "instantiation" }, { "access": "public", - "destination": "121103565834936476", - "source": "1603321863498552207", + "destination": "968828526679491811", + "source": "12826574907988417656", "type": "instantiation" }, { "access": "public", - "destination": "121103565834936476", - "source": "232518961342221670", + "destination": "968828526679491811", + "source": "1860151690737773362", "type": "instantiation" } ], diff --git a/docs/test_cases/t00062_class.svg b/docs/test_cases/t00062_class.svg index fa20ec15..c54f8ceb 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[] - - + + A @@ -326,15 +326,15 @@ - + - + n : std::vector<char> - - + + A @@ -343,15 +343,15 @@ - + - + klm : char[][][] - - + + 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 @@ -418,47 +418,47 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/docs/test_cases/t00062_class_mermaid.svg b/docs/test_cases/t00062_class_mermaid.svg index 12a6b85e..2793c475 100644 --- a/docs/test_cases/t00062_class_mermaid.svg +++ b/docs/test_cases/t00062_class_mermaid.svg @@ -306,8 +306,8 @@ - - + + @@ -330,8 +330,8 @@ - - + + @@ -354,8 +354,8 @@ - - + + @@ -373,8 +373,8 @@ - - + + @@ -397,8 +397,8 @@ - - + + @@ -421,8 +421,8 @@ - - + + @@ -445,8 +445,8 @@ - - + + @@ -469,8 +469,8 @@ - - + + @@ -493,8 +493,8 @@ - - + + @@ -522,8 +522,8 @@ - - + + @@ -551,8 +551,8 @@ - - + + @@ -580,8 +580,8 @@ - - + + @@ -604,8 +604,8 @@ - - + + @@ -633,8 +633,8 @@ - - + + @@ -662,8 +662,8 @@ - - + + @@ -691,8 +691,8 @@ - - + + @@ -715,8 +715,8 @@ - - + + @@ -739,8 +739,8 @@ - - + + @@ -763,8 +763,8 @@ - - + + @@ -787,8 +787,8 @@ - - + + @@ -811,8 +811,8 @@ - - + + @@ -840,8 +840,8 @@ - - + + diff --git a/docs/test_cases/t00063.md b/docs/test_cases/t00063.md index df61e8f6..4a51cb49 100644 --- a/docs/test_cases/t00063.md +++ b/docs/test_cases/t00063.md @@ -39,7 +39,7 @@ enum class C { c1, c2, c3 }; { "bases": [], "display_name": "A", - "id": "1518171774798799557", + "id": "12145374198390396463", "is_abstract": false, "is_nested": false, "is_struct": false, diff --git a/docs/test_cases/t00063_class.svg b/docs/test_cases/t00063_class.svg index 10c7ca58..b1ff291a 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 6df240af..c7576915 100644 --- a/docs/test_cases/t00063_class_mermaid.svg +++ b/docs/test_cases/t00063_class_mermaid.svg @@ -52,8 +52,8 @@ - - + + diff --git a/docs/test_cases/t00064.md b/docs/test_cases/t00064.md index d49652ba..47895def 100644 --- a/docs/test_cases/t00064.md +++ b/docs/test_cases/t00064.md @@ -91,7 +91,7 @@ public: { "bases": [], "display_name": "type_list", - "id": "2055044356505752139", + "id": "16440354852046017112", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -120,7 +120,7 @@ public: { "bases": [], "display_name": "type_list", - "id": "1536403088019105838", + "id": "12291224704152846709", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -167,7 +167,7 @@ public: { "bases": [], "display_name": "type_list", - "id": "1613293628874851145", + "id": "12906349030998809160", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -202,7 +202,7 @@ public: { "bases": [], "display_name": "type_list", - "id": "96201031647373215", + "id": "769608253178985720", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -237,7 +237,7 @@ public: { "bases": [], "display_name": "head>", - "id": "1342666740698875376", + "id": "10741333925591003015", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -279,7 +279,7 @@ public: { "bases": [], "display_name": "type_list", - "id": "74655005329778311", + "id": "597240042638226493", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -308,7 +308,7 @@ public: { "bases": [], "display_name": "type_list", - "id": "1877705309010128195", + "id": "15021642472081025560", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -337,7 +337,7 @@ public: { "bases": [], "display_name": "type_list", - "id": "1737554639587928188", + "id": "13900437116703425510", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -366,7 +366,7 @@ public: { "bases": [], "display_name": "type_group_pair,type_list>", - "id": "1313421318785708660", + "id": "10507370550285669286", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -428,7 +428,7 @@ public: { "bases": [], "display_name": "optional_ref", - "id": "2110316024454672764", + "id": "16882528195637382119", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -457,7 +457,7 @@ public: { "bases": [], "display_name": "optional_ref,type_list>::value_type>", - "id": "476531044436856932", + "id": "3812248355494855459", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -486,7 +486,7 @@ public: { "bases": [], "display_name": "type_group_pair_it,type_list>", - "id": "1024383802991748694", + "id": "8195070423933989553", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -641,7 +641,7 @@ public: { "bases": [], "display_name": "A", - "id": "586286676481245707", + "id": "4690293411849965663", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -663,7 +663,7 @@ public: { "bases": [], "display_name": "B", - "id": "1353306307770366167", + "id": "10826450462162929338", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -685,7 +685,7 @@ public: { "bases": [], "display_name": "C", - "id": "598044391549147725", + "id": "4784355132393181800", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -707,7 +707,7 @@ public: { "bases": [], "display_name": "type_list", - "id": "425551452299939770", + "id": "3404411618399518160", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -748,7 +748,7 @@ public: { "bases": [], "display_name": "type_list", - "id": "179850898515269194", + "id": "1438807188122153557", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -783,7 +783,7 @@ public: { "bases": [], "display_name": "type_list", - "id": "1070380438303872295", + "id": "8563043506430978365", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -824,7 +824,7 @@ public: { "bases": [], "display_name": "type_group_pair,type_list>", - "id": "1854055939974723413", + "id": "14832447519797787306", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -891,7 +891,7 @@ public: { "bases": [], "display_name": "R", - "id": "2161425587790795236", + "id": "17291404702326361893", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -938,7 +938,7 @@ public: { "bases": [], "display_name": "type_group_pair", - "id": "271990753639572557", + "id": "2175926029116580461", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -973,7 +973,7 @@ public: { "bases": [], "display_name": "type_group_pair_it", - "id": "1057906395469156958", + "id": "8463251163753255664", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -1014,7 +1014,7 @@ public: { "bases": [], "display_name": "head", - "id": "1317314479884183399", + "id": "10538515839073467198", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -1046,178 +1046,178 @@ public: "relationships": [ { "access": "public", - "destination": "2055044356505752139", - "source": "1536403088019105838", + "destination": "16440354852046017112", + "source": "12291224704152846709", "type": "instantiation" }, { "access": "public", - "destination": "2055044356505752139", - "source": "1613293628874851145", + "destination": "16440354852046017112", + "source": "12906349030998809160", "type": "instantiation" }, { "access": "public", - "destination": "2055044356505752139", - "source": "96201031647373215", + "destination": "16440354852046017112", + "source": "769608253178985720", "type": "instantiation" }, { "access": "public", - "destination": "96201031647373215", - "source": "1342666740698875376", + "destination": "769608253178985720", + "source": "10741333925591003015", "type": "dependency" }, { "access": "public", - "destination": "1317314479884183399", - "source": "1342666740698875376", + "destination": "10538515839073467198", + "source": "10741333925591003015", "type": "instantiation" }, { "access": "public", - "destination": "2055044356505752139", - "source": "74655005329778311", + "destination": "16440354852046017112", + "source": "597240042638226493", "type": "instantiation" }, { "access": "public", - "destination": "2055044356505752139", - "source": "1877705309010128195", + "destination": "16440354852046017112", + "source": "15021642472081025560", "type": "instantiation" }, { "access": "public", - "destination": "2055044356505752139", - "source": "1737554639587928188", + "destination": "16440354852046017112", + "source": "13900437116703425510", "type": "instantiation" }, { "access": "public", - "destination": "1877705309010128195", - "source": "1313421318785708660", + "destination": "15021642472081025560", + "source": "10507370550285669286", "type": "dependency" }, { "access": "public", - "destination": "1737554639587928188", - "source": "1313421318785708660", + "destination": "13900437116703425510", + "source": "10507370550285669286", "type": "dependency" }, { "access": "public", - "destination": "271990753639572557", - "source": "1313421318785708660", + "destination": "2175926029116580461", + "source": "10507370550285669286", "type": "instantiation" }, { "access": "public", - "destination": "2110316024454672764", - "source": "476531044436856932", + "destination": "16882528195637382119", + "source": "3812248355494855459", "type": "instantiation" }, { "access": "public", - "destination": "1877705309010128195", - "source": "1024383802991748694", + "destination": "15021642472081025560", + "source": "8195070423933989553", "type": "dependency" }, { "access": "public", - "destination": "1737554639587928188", - "source": "1024383802991748694", + "destination": "13900437116703425510", + "source": "8195070423933989553", "type": "dependency" }, { "access": "public", - "destination": "476531044436856932", - "source": "1024383802991748694", + "destination": "3812248355494855459", + "source": "8195070423933989553", "type": "dependency" }, { "access": "public", - "destination": "2110316024454672764", - "source": "1024383802991748694", + "destination": "16882528195637382119", + "source": "8195070423933989553", "type": "dependency" }, { "access": "public", - "destination": "1057906395469156958", - "source": "1024383802991748694", + "destination": "8463251163753255664", + "source": "8195070423933989553", "type": "instantiation" }, { "access": "public", - "destination": "586286676481245707", - "source": "425551452299939770", + "destination": "4690293411849965663", + "source": "3404411618399518160", "type": "dependency" }, { "access": "public", - "destination": "2055044356505752139", - "source": "425551452299939770", + "destination": "16440354852046017112", + "source": "3404411618399518160", "type": "instantiation" }, { "access": "public", - "destination": "2055044356505752139", - "source": "179850898515269194", + "destination": "16440354852046017112", + "source": "1438807188122153557", "type": "instantiation" }, { "access": "public", - "destination": "586286676481245707", - "source": "1070380438303872295", + "destination": "4690293411849965663", + "source": "8563043506430978365", "type": "dependency" }, { "access": "public", - "destination": "1353306307770366167", - "source": "1070380438303872295", + "destination": "10826450462162929338", + "source": "8563043506430978365", "type": "dependency" }, { "access": "public", - "destination": "598044391549147725", - "source": "1070380438303872295", + "destination": "4784355132393181800", + "source": "8563043506430978365", "type": "dependency" }, { "access": "public", - "destination": "2055044356505752139", - "source": "1070380438303872295", + "destination": "16440354852046017112", + "source": "8563043506430978365", "type": "instantiation" }, { "access": "public", - "destination": "179850898515269194", - "source": "1854055939974723413", + "destination": "1438807188122153557", + "source": "14832447519797787306", "type": "dependency" }, { "access": "public", - "destination": "1070380438303872295", - "source": "1854055939974723413", + "destination": "8563043506430978365", + "source": "14832447519797787306", "type": "dependency" }, { "access": "public", - "destination": "1313421318785708660", - "source": "1854055939974723413", + "destination": "10507370550285669286", + "source": "14832447519797787306", "type": "instantiation" }, { "access": "public", - "destination": "425551452299939770", + "destination": "3404411618399518160", "label": "aboolint", - "source": "2161425587790795236", + "source": "17291404702326361893", "type": "aggregation" }, { "access": "public", - "destination": "1854055939974723413", + "destination": "14832447519797787306", "label": "abc", - "source": "2161425587790795236", + "source": "17291404702326361893", "type": "aggregation" } ], diff --git a/docs/test_cases/t00064_class.svg b/docs/test_cases/t00064_class.svg index 597b2a73..e9a7feca 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 @@ -273,65 +273,65 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + aboolint - + abc diff --git a/docs/test_cases/t00064_class_mermaid.svg b/docs/test_cases/t00064_class_mermaid.svg index 9c0376c8..77569c7b 100644 --- a/docs/test_cases/t00064_class_mermaid.svg +++ b/docs/test_cases/t00064_class_mermaid.svg @@ -402,8 +402,8 @@ - - + + @@ -421,8 +421,8 @@ - - + + @@ -440,8 +440,8 @@ - - + + @@ -459,8 +459,8 @@ - - + + @@ -478,8 +478,8 @@ - - + + @@ -497,8 +497,8 @@ - - + + @@ -516,8 +516,8 @@ - - + + @@ -535,8 +535,8 @@ - - + + @@ -554,8 +554,8 @@ - - + + @@ -578,8 +578,8 @@ - - + + @@ -597,8 +597,8 @@ - - + + @@ -616,8 +616,8 @@ - - + + @@ -650,8 +650,8 @@ - - + + @@ -669,8 +669,8 @@ - - + + @@ -688,8 +688,8 @@ - - + + @@ -707,8 +707,8 @@ - - + + @@ -726,8 +726,8 @@ - - + + @@ -745,8 +745,8 @@ - - + + @@ -764,8 +764,8 @@ - - + + @@ -783,8 +783,8 @@ - - + + @@ -812,8 +812,8 @@ - - + + @@ -831,8 +831,8 @@ - - + + @@ -850,8 +850,8 @@ - - + + diff --git a/docs/test_cases/t00065.md b/docs/test_cases/t00065.md index 141c7de0..13c27956 100644 --- a/docs/test_cases/t00065.md +++ b/docs/test_cases/t00065.md @@ -121,7 +121,7 @@ struct AImpl { }; { "bases": [], "display_name": "AImpl", - "id": "674757414308736755", + "id": "5398059314469894043", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -151,7 +151,7 @@ struct AImpl { }; "c" ], "display_name": "ABC", - "id": "2145362985538918973", + "id": "17162903884311351787", "is_nested": false, "name": "ABC", "namespace": "clanguml::t00065", @@ -170,7 +170,7 @@ struct AImpl { }; "z" ], "display_name": "XYZ", - "id": "1435940218810141944", + "id": "11487521750481135557", "is_nested": false, "name": "XYZ", "namespace": "clanguml::t00065", @@ -185,7 +185,7 @@ struct AImpl { }; { "bases": [], "display_name": "A", - "id": "1178194542408300737", + "id": "9425556339266405903", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -253,7 +253,7 @@ struct AImpl { }; "elements": [ { "display_name": "bconcept", - "id": "1325475407133721370", + "id": "10603803257069770961", "name": "bconcept", "namespace": "clanguml::t00065", "parameters": [ @@ -281,7 +281,7 @@ struct AImpl { }; { "bases": [], "display_name": "B", - "id": "1651810571114530033", + "id": "13214484568916240266", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -360,7 +360,7 @@ struct AImpl { }; { "bases": [], "display_name": "C", - "id": "1157378014768957235", + "id": "9259024118151657882", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -402,7 +402,7 @@ struct AImpl { }; { "bases": [], "display_name": "C", - "id": "580575003920044707", + "id": "4644600031360357658", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -431,7 +431,7 @@ struct AImpl { }; { "bases": [], "display_name": "D", - "id": "1719752929087851944", + "id": "13758023432702815554", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -485,7 +485,7 @@ struct AImpl { }; { "bases": [], "display_name": "C", - "id": "1373403346245688670", + "id": "10987226769965509366", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -514,7 +514,7 @@ struct AImpl { }; { "bases": [], "display_name": "D", - "id": "2024276012622729482", + "id": "16194208100981835856", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -547,7 +547,7 @@ struct AImpl { }; { "bases": [], "display_name": "R", - "id": "1082111961413727438", + "id": "8656895691309819509", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -609,87 +609,87 @@ struct AImpl { }; "relationships": [ { "access": "public", - "destination": "2145362985538918973", + "destination": "17162903884311351787", "label": "abc", - "source": "1178194542408300737", + "source": "9425556339266405903", "type": "aggregation" }, { "access": "public", - "destination": "1435940218810141944", + "destination": "11487521750481135557", "label": "xyz", - "source": "1178194542408300737", + "source": "9425556339266405903", "type": "aggregation" }, { "access": "public", - "destination": "674757414308736755", + "destination": "5398059314469894043", "label": "pimpl", - "source": "1178194542408300737", + "source": "9425556339266405903", "type": "association" }, { "access": "public", - "destination": "1157378014768957235", - "source": "580575003920044707", + "destination": "9259024118151657882", + "source": "4644600031360357658", "type": "instantiation" }, { - "destination": "1325475407133721370", + "destination": "10603803257069770961", "label": "T", - "source": "1719752929087851944", + "source": "13758023432702815554", "type": "constraint" }, { "access": "public", - "destination": "580575003920044707", + "destination": "4644600031360357658", "label": "c", - "source": "1719752929087851944", + "source": "13758023432702815554", "type": "aggregation" }, { "access": "public", - "destination": "1651810571114530033", - "source": "1373403346245688670", + "destination": "13214484568916240266", + "source": "10987226769965509366", "type": "dependency" }, { "access": "public", - "destination": "1157378014768957235", - "source": "1373403346245688670", + "destination": "9259024118151657882", + "source": "10987226769965509366", "type": "instantiation" }, { "access": "public", - "destination": "1651810571114530033", - "source": "2024276012622729482", + "destination": "13214484568916240266", + "source": "16194208100981835856", "type": "dependency" }, { "access": "public", - "destination": "1719752929087851944", - "source": "2024276012622729482", + "destination": "13758023432702815554", + "source": "16194208100981835856", "type": "instantiation" }, { "access": "public", - "destination": "1178194542408300737", + "destination": "9425556339266405903", "label": "a", - "source": "1082111961413727438", + "source": "8656895691309819509", "type": "association" }, { "access": "public", - "destination": "1373403346245688670", + "destination": "10987226769965509366", "label": "c", - "source": "1082111961413727438", + "source": "8656895691309819509", "type": "aggregation" }, { "access": "public", - "destination": "2024276012622729482", + "destination": "16194208100981835856", "label": "d", - "source": "1082111961413727438", + "source": "8656895691309819509", "type": "aggregation" } ], diff --git a/docs/test_cases/t00065_class.svg b/docs/test_cases/t00065_class.svg index b4b7be7a..cfbbff08 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» @@ -188,70 +188,70 @@ T{} t.b() - - + + R - + - + a : A * - + - + c : C<B> - + - + d : D<B> - + abc - + xyz - + pimpl - + - + T - + +c - + - + - + - + - + +a - + +c - + +d diff --git a/docs/test_cases/t00065_class_mermaid.svg b/docs/test_cases/t00065_class_mermaid.svg index fc0d618b..19c11d0c 100644 --- a/docs/test_cases/t00065_class_mermaid.svg +++ b/docs/test_cases/t00065_class_mermaid.svg @@ -210,8 +210,8 @@ - - + + @@ -229,8 +229,8 @@ - - + + @@ -263,8 +263,8 @@ - - + + @@ -297,8 +297,8 @@ - - + + @@ -331,8 +331,8 @@ - - + + @@ -365,8 +365,8 @@ - - + + @@ -394,8 +394,8 @@ - - + + @@ -418,8 +418,8 @@ - - + + @@ -437,8 +437,8 @@ - - + + @@ -466,8 +466,8 @@ - - + + @@ -485,8 +485,8 @@ - - + + @@ -504,8 +504,8 @@ - - + + diff --git a/docs/test_cases/t00066.md b/docs/test_cases/t00066.md index cf124f52..7e5d19dc 100644 --- a/docs/test_cases/t00066.md +++ b/docs/test_cases/t00066.md @@ -98,7 +98,7 @@ int A::static_int = 1; { "bases": [], "display_name": "A", - "id": "1899957281758233935", + "id": "15199658254065871481", "is_abstract": false, "is_nested": false, "is_struct": false, diff --git a/docs/test_cases/t00066_class.svg b/docs/test_cases/t00066_class.svg index 62861b3c..1101d3a7 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 4ba160a3..2b302671 100644 --- a/docs/test_cases/t00066_class_mermaid.svg +++ b/docs/test_cases/t00066_class_mermaid.svg @@ -52,8 +52,8 @@ - - + + diff --git a/docs/test_cases/t00067.md b/docs/test_cases/t00067.md index 43f43fc0..fb3917bf 100644 --- a/docs/test_cases/t00067.md +++ b/docs/test_cases/t00067.md @@ -101,7 +101,7 @@ int A::static_int = 1; { "bases": [], "display_name": "A", - "id": "541140581420098839", + "id": "4329124651360790719", "is_abstract": false, "is_nested": false, "is_struct": false, diff --git a/docs/test_cases/t00067_class.svg b/docs/test_cases/t00067_class.svg index a0c0a6f1..1399f175 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 6864c129..d61452a5 100644 --- a/docs/test_cases/t00067_class_mermaid.svg +++ b/docs/test_cases/t00067_class_mermaid.svg @@ -52,8 +52,8 @@ - - + + diff --git a/docs/test_cases/t00068.md b/docs/test_cases/t00068.md index f4939ccb..acc56f1d 100644 --- a/docs/test_cases/t00068.md +++ b/docs/test_cases/t00068.md @@ -95,13 +95,13 @@ struct RR { "bases": [ { "access": "public", - "id": "577981285610429577", + "id": "4623850284883436621", "is_virtual": false, "name": "clanguml::t00068::AA" } ], "display_name": "AAA", - "id": "1484819281509619918", + "id": "11878554252076959348", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -151,22 +151,22 @@ struct RR { "relationships": [ { "access": "public", - "destination": "1427649116338755656", + "destination": "11421192930710045248", "label": "bb", - "source": "1484819281509619918", + "source": "11878554252076959348", "type": "association" }, { "access": "public", - "destination": "1888428536574868284", + "destination": "15107428292598946277", "label": "akind", - "source": "1484819281509619918", + "source": "11878554252076959348", "type": "aggregation" }, { "access": "public", - "destination": "577981285610429577", - "source": "1484819281509619918", + "destination": "4623850284883436621", + "source": "11878554252076959348", "type": "extension" } ], @@ -181,7 +181,7 @@ struct RR { { "bases": [], "display_name": "BB", - "id": "1427649116338755656", + "id": "11421192930710045248", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -220,7 +220,7 @@ struct RR { "ThreeA" ], "display_name": "AKind", - "id": "1888428536574868284", + "id": "15107428292598946277", "is_nested": false, "name": "AKind", "namespace": "clanguml::t00068", @@ -236,13 +236,13 @@ struct RR { "bases": [ { "access": "public", - "id": "1297439817144700057", + "id": "10379518537157600457", "is_virtual": false, "name": "clanguml::t00068::A" } ], "display_name": "AA", - "id": "577981285610429577", + "id": "4623850284883436621", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -265,13 +265,13 @@ struct RR { "bases": [ { "access": "public", - "id": "577981285610429577", + "id": "4623850284883436621", "is_virtual": false, "name": "clanguml::t00068::AA" } ], "display_name": "AAA", - "id": "1484819281509619918", + "id": "11878554252076959348", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -318,7 +318,7 @@ struct RR { { "bases": [], "display_name": "R", - "id": "999621481464424961", + "id": "7996971851715399690", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -356,42 +356,42 @@ struct RR { "relationships": [ { "access": "public", - "destination": "359183874441719256", + "destination": "2873470995533754050", "label": "b", - "source": "1427649116338755656", + "source": "11421192930710045248", "type": "aggregation" }, { "access": "public", - "destination": "1297439817144700057", - "source": "577981285610429577", + "destination": "10379518537157600457", + "source": "4623850284883436621", "type": "extension" }, { "access": "public", - "destination": "1427649116338755656", + "destination": "11421192930710045248", "label": "bb", - "source": "1484819281509619918", + "source": "11878554252076959348", "type": "association" }, { "access": "public", - "destination": "1888428536574868284", + "destination": "15107428292598946277", "label": "akind", - "source": "1484819281509619918", + "source": "11878554252076959348", "type": "aggregation" }, { "access": "public", - "destination": "577981285610429577", - "source": "1484819281509619918", + "destination": "4623850284883436621", + "source": "11878554252076959348", "type": "extension" }, { "access": "public", - "destination": "1484819281509619918", + "destination": "11878554252076959348", "label": "aaa", - "source": "999621481464424961", + "source": "7996971851715399690", "type": "association" } ], @@ -406,7 +406,7 @@ struct RR { { "bases": [], "display_name": "B", - "id": "359183874441719256", + "id": "2873470995533754050", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -428,7 +428,7 @@ struct RR { { "bases": [], "display_name": "BB", - "id": "1427649116338755656", + "id": "11421192930710045248", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -467,7 +467,7 @@ struct RR { "ThreeA" ], "display_name": "AKind", - "id": "1888428536574868284", + "id": "15107428292598946277", "is_nested": false, "name": "AKind", "namespace": "clanguml::t00068", @@ -482,7 +482,7 @@ struct RR { { "bases": [], "display_name": "A", - "id": "1297439817144700057", + "id": "10379518537157600457", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -505,13 +505,13 @@ struct RR { "bases": [ { "access": "public", - "id": "1297439817144700057", + "id": "10379518537157600457", "is_virtual": false, "name": "clanguml::t00068::A" } ], "display_name": "AA", - "id": "577981285610429577", + "id": "4623850284883436621", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -534,13 +534,13 @@ struct RR { "bases": [ { "access": "public", - "id": "577981285610429577", + "id": "4623850284883436621", "is_virtual": false, "name": "clanguml::t00068::AA" } ], "display_name": "AAA", - "id": "1484819281509619918", + "id": "11878554252076959348", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -587,7 +587,7 @@ struct RR { { "bases": [], "display_name": "R", - "id": "999621481464424961", + "id": "7996971851715399690", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -622,7 +622,7 @@ struct RR { { "bases": [], "display_name": "RR", - "id": "1168375787542426694", + "id": "9347006300339413552", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -660,49 +660,49 @@ struct RR { "relationships": [ { "access": "public", - "destination": "359183874441719256", + "destination": "2873470995533754050", "label": "b", - "source": "1427649116338755656", + "source": "11421192930710045248", "type": "aggregation" }, { "access": "public", - "destination": "1297439817144700057", - "source": "577981285610429577", + "destination": "10379518537157600457", + "source": "4623850284883436621", "type": "extension" }, { "access": "public", - "destination": "1427649116338755656", + "destination": "11421192930710045248", "label": "bb", - "source": "1484819281509619918", + "source": "11878554252076959348", "type": "association" }, { "access": "public", - "destination": "1888428536574868284", + "destination": "15107428292598946277", "label": "akind", - "source": "1484819281509619918", + "source": "11878554252076959348", "type": "aggregation" }, { "access": "public", - "destination": "577981285610429577", - "source": "1484819281509619918", + "destination": "4623850284883436621", + "source": "11878554252076959348", "type": "extension" }, { "access": "public", - "destination": "1484819281509619918", + "destination": "11878554252076959348", "label": "aaa", - "source": "999621481464424961", + "source": "7996971851715399690", "type": "association" }, { "access": "public", - "destination": "999621481464424961", + "destination": "7996971851715399690", "label": "r", - "source": "1168375787542426694", + "source": "9347006300339413552", "type": "association" } ], diff --git a/docs/test_cases/t00068_r0_class.svg b/docs/test_cases/t00068_r0_class.svg index fd90ea5c..c6bc443e 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 6df43caa..c9500a8a 100644 --- a/docs/test_cases/t00068_r0_class_mermaid.svg +++ b/docs/test_cases/t00068_r0_class_mermaid.svg @@ -53,8 +53,8 @@ - - + + diff --git a/docs/test_cases/t00068_r1_class.svg b/docs/test_cases/t00068_r1_class.svg index b830f38c..add5c196 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,62 +36,62 @@ ThreeA - - + + AA - - + + AAA - + - + akind : AKind - + - + bb : BB * - - + + R - + - + aaa : AAA * - + bb - + akind - + - + aaa diff --git a/docs/test_cases/t00068_r1_class_mermaid.svg b/docs/test_cases/t00068_r1_class_mermaid.svg index 21cbbbde..56af4bdc 100644 --- a/docs/test_cases/t00068_r1_class_mermaid.svg +++ b/docs/test_cases/t00068_r1_class_mermaid.svg @@ -101,8 +101,8 @@ - - + + @@ -125,8 +125,8 @@ - - + + @@ -159,8 +159,8 @@ - - + + @@ -178,8 +178,8 @@ - - + + @@ -207,8 +207,8 @@ - - + + diff --git a/docs/test_cases/t00068_r2_class.svg b/docs/test_cases/t00068_r2_class.svg index 5734fdd4..52ef792d 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,94 +44,94 @@ ThreeA - - + + A - - + + AA - - + + AAA - + - + akind : AKind - + - + bb : BB * - - + + R - + - + aaa : AAA * - - + + RR - + - + r : std::shared_ptr<R> - + +b - + - + bb - + akind - + - + aaa - + +r diff --git a/docs/test_cases/t00068_r2_class_mermaid.svg b/docs/test_cases/t00068_r2_class_mermaid.svg index 13d51b91..c7060217 100644 --- a/docs/test_cases/t00068_r2_class_mermaid.svg +++ b/docs/test_cases/t00068_r2_class_mermaid.svg @@ -135,8 +135,8 @@ - - + + @@ -154,8 +154,8 @@ - - + + @@ -178,8 +178,8 @@ - - + + @@ -212,8 +212,8 @@ - - + + @@ -231,8 +231,8 @@ - - + + @@ -250,8 +250,8 @@ - - + + @@ -279,8 +279,8 @@ - - + + @@ -303,8 +303,8 @@ - - + + diff --git a/docs/test_cases/t00069.md b/docs/test_cases/t00069.md index 2c9f739f..6c2b6a6a 100644 --- a/docs/test_cases/t00069.md +++ b/docs/test_cases/t00069.md @@ -91,7 +91,7 @@ private: { "bases": [], "display_name": "generator", - "id": "2142496233889685657", + "id": "17139969871117485261", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -207,7 +207,7 @@ private: { "bases": [], "display_name": "generator::promise_type", - "id": "721812727497968117", + "id": "5774501819983744937", "is_abstract": false, "is_nested": true, "is_struct": true, @@ -429,7 +429,7 @@ private: { "bases": [], "display_name": "generator", - "id": "1604358347140526608", + "id": "12834866777124212868", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -458,7 +458,7 @@ private: { "bases": [], "display_name": "A", - "id": "2160142503252767290", + "id": "17281140026022138322", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -553,26 +553,26 @@ private: "relationships": [ { "access": "public", - "destination": "2142496233889685657", - "source": "721812727497968117", + "destination": "17139969871117485261", + "source": "5774501819983744937", "type": "containment" }, { "access": "public", - "destination": "2142496233889685657", - "source": "1604358347140526608", + "destination": "17139969871117485261", + "source": "12834866777124212868", "type": "instantiation" }, { "access": "public", - "destination": "1604358347140526608", - "source": "2160142503252767290", + "destination": "12834866777124212868", + "source": "17281140026022138322", "type": "dependency" }, { "access": "public", - "destination": "2142496233889685657", - "source": "2160142503252767290", + "destination": "17139969871117485261", + "source": "17281140026022138322", "type": "dependency" } ], diff --git a/docs/test_cases/t00069_class.svg b/docs/test_cases/t00069_class.svg index 1cf24386..8c0e1d78 100644 --- a/docs/test_cases/t00069_class.svg +++ b/docs/test_cases/t00069_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + generator @@ -18,96 +18,96 @@ T - + - + generator(handle_type h) : void - + - + ~generator() : void - + - + full_ : bool - + - + h_ : handle_type - - + + generator::promise_type - + - + final_suspend() noexcept : std::suspend_always - + - + get_return_object() : generator<T> - + - + initial_suspend() : std::suspend_always - + - + return_void() : void - + - + unhandled_exception() : void yield_value<std::convertible_to From>(From && from) : std::suspend_always - + - + exception_ : std::exception_ptr - + - + value_ : T - - + + generator @@ -116,44 +116,44 @@ - - + + A - + - + iota() [coroutine] : generator<unsigned long> - + - + seed() [coroutine] : generator<unsigned long> - + - + counter_ : unsigned long - + - + - + - + diff --git a/docs/test_cases/t00069_class_mermaid.svg b/docs/test_cases/t00069_class_mermaid.svg index 77463c40..6bf0cf2f 100644 --- a/docs/test_cases/t00069_class_mermaid.svg +++ b/docs/test_cases/t00069_class_mermaid.svg @@ -102,8 +102,8 @@ - - + + @@ -141,8 +141,8 @@ - - + + @@ -200,8 +200,8 @@ - - + + @@ -219,8 +219,8 @@ - - + + diff --git a/docs/test_cases/t00070.md b/docs/test_cases/t00070.md index ffc7cc62..03ffdef9 100644 --- a/docs/test_cases/t00070.md +++ b/docs/test_cases/t00070.md @@ -94,7 +94,7 @@ class BBBB { }; { "bases": [], "display_name": "B", - "id": "1364261599035905834", + "id": "10914092792287246676", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -120,7 +120,7 @@ class BBBB { }; { "bases": [], "display_name": "BB", - "id": "1485755083045282660", + "id": "11886040664362261287", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -169,7 +169,7 @@ class BBBB { }; "bbb2" ], "display_name": "BBB", - "id": "1734694076622541097", + "id": "13877552612980328783", "is_nested": false, "module": { "is_private": false, @@ -188,7 +188,7 @@ class BBBB { }; { "bases": [], "display_name": "A", - "id": "668221430913861424", + "id": "5345771447310891397", "is_abstract": false, "is_nested": false, "is_struct": false, diff --git a/docs/test_cases/t00070_class.svg b/docs/test_cases/t00070_class.svg index f1c6b8aa..edee946d 100644 --- a/docs/test_cases/t00070_class.svg +++ b/docs/test_cases/t00070_class.svg @@ -1,6 +1,6 @@ - + @@ -9,16 +9,16 @@ - - + + B - - + + BB @@ -27,15 +27,15 @@ - + - + t : T - - + + BBB @@ -44,26 +44,26 @@ bbb2 - - + + A - + - + get() : int - + - + a : int diff --git a/docs/test_cases/t00070_class_mermaid.svg b/docs/test_cases/t00070_class_mermaid.svg index e3c7798c..180ecd87 100644 --- a/docs/test_cases/t00070_class_mermaid.svg +++ b/docs/test_cases/t00070_class_mermaid.svg @@ -52,8 +52,8 @@ - - + + @@ -71,8 +71,8 @@ - - + + @@ -95,8 +95,8 @@ - - + + @@ -124,8 +124,8 @@ - - + + diff --git a/docs/test_cases/t00071.md b/docs/test_cases/t00071.md index e7cedd2a..ad73f071 100644 --- a/docs/test_cases/t00071.md +++ b/docs/test_cases/t00071.md @@ -113,7 +113,7 @@ class D { }; { "bases": [], "display_name": "B", - "id": "1319862510251967999", + "id": "10558900082015743999", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -139,7 +139,7 @@ class D { }; { "bases": [], "display_name": "BB", - "id": "569632796637866961", + "id": "4557062373102935688", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -188,7 +188,7 @@ class D { }; "bbb2" ], "display_name": "BBB", - "id": "1625078061541942293", + "id": "13000624492335538351", "is_nested": false, "module": { "is_private": false, @@ -210,7 +210,7 @@ class D { }; { "bases": [], "display_name": "D", - "id": "1168777064323042894", + "id": "9350216514584343155", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -243,7 +243,7 @@ class D { }; { "bases": [], "display_name": "E", - "id": "1302694761523535504", + "id": "10421558092188284034", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -280,7 +280,7 @@ class D { }; { "bases": [], "display_name": "C", - "id": "1697463991772603674", + "id": "13579711934180829394", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -306,7 +306,7 @@ class D { }; { "bases": [], "display_name": "CC", - "id": "1911193033649971391", + "id": "15289544269199771130", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -355,7 +355,7 @@ class D { }; "ccc2" ], "display_name": "CCC", - "id": "931278702894205804", + "id": "7450229623153646433", "is_nested": false, "module": { "is_private": false, @@ -378,7 +378,7 @@ class D { }; { "bases": [], "display_name": "A", - "id": "2210005074053139118", + "id": "17680040592425112949", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -450,7 +450,7 @@ class D { }; { "bases": [], "display_name": "R", - "id": "1629943620359873327", + "id": "13039548962878986617", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -512,23 +512,23 @@ class D { }; "relationships": [ { "access": "private", - "destination": "2210005074053139118", + "destination": "17680040592425112949", "label": "a", - "source": "1629943620359873327", + "source": "13039548962878986617", "type": "association" }, { "access": "private", - "destination": "1319862510251967999", + "destination": "10558900082015743999", "label": "b", - "source": "1629943620359873327", + "source": "13039548962878986617", "type": "association" }, { "access": "private", - "destination": "1697463991772603674", + "destination": "13579711934180829394", "label": "c", - "source": "1629943620359873327", + "source": "13039548962878986617", "type": "association" } ], diff --git a/docs/test_cases/t00071_class.svg b/docs/test_cases/t00071_class.svg index ed641597..59d8b249 100644 --- a/docs/test_cases/t00071_class.svg +++ b/docs/test_cases/t00071_class.svg @@ -1,6 +1,6 @@ - + @@ -9,53 +9,53 @@ - + app - + lib1 - + mod1 - + mod2 - + lib2 - - + + A - + - + get() : int - + - + a : int - - + + B - - + + BB @@ -64,15 +64,15 @@ - + - + t : T - - + + BBB @@ -81,32 +81,32 @@ bbb2 - - + + D - - + + E - - + + C - - + + CC @@ -115,15 +115,15 @@ - + - + t : T - - + + CCC @@ -132,42 +132,42 @@ ccc2 - - + + R - + - + a : A * - + - + b : B * - + - + c : C * - + -a - + -b - + -c diff --git a/docs/test_cases/t00071_class_mermaid.svg b/docs/test_cases/t00071_class_mermaid.svg index fd5237ba..017dd5b1 100644 --- a/docs/test_cases/t00071_class_mermaid.svg +++ b/docs/test_cases/t00071_class_mermaid.svg @@ -90,8 +90,8 @@ - - + + @@ -109,8 +109,8 @@ - - + + @@ -133,8 +133,8 @@ - - + + @@ -162,8 +162,8 @@ - - + + @@ -181,8 +181,8 @@ - - + + @@ -200,8 +200,8 @@ - - + + @@ -219,8 +219,8 @@ - - + + @@ -243,8 +243,8 @@ - - + + @@ -272,8 +272,8 @@ - - + + @@ -301,8 +301,8 @@ - - + + diff --git a/docs/test_cases/t00072.md b/docs/test_cases/t00072.md index 662c3002..730d2307 100644 --- a/docs/test_cases/t00072.md +++ b/docs/test_cases/t00072.md @@ -106,7 +106,7 @@ class D { }; { "bases": [], "display_name": "B", - "id": "1450150421445257774", + "id": "11601203371562062198", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -132,7 +132,7 @@ class D { }; { "bases": [], "display_name": "BB", - "id": "744925471008373109", + "id": "5959403768066984874", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -181,7 +181,7 @@ class D { }; "bbb2" ], "display_name": "BBB", - "id": "610293402618118513", + "id": "4882347220944948110", "is_nested": false, "module": { "is_private": false, @@ -203,7 +203,7 @@ class D { }; { "bases": [], "display_name": "D", - "id": "516204432765266678", + "id": "4129635462122133424", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -236,7 +236,7 @@ class D { }; { "bases": [], "display_name": "E", - "id": "347204883768272660", + "id": "2777639070146181284", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -273,7 +273,7 @@ class D { }; { "bases": [], "display_name": "C", - "id": "1144612141363797057", + "id": "9156897130910376461", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -299,7 +299,7 @@ class D { }; { "bases": [], "display_name": "CC", - "id": "1472938318775327089", + "id": "11783506550202616713", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -348,7 +348,7 @@ class D { }; "ccc2" ], "display_name": "CCC", - "id": "448885573685763285", + "id": "3591084589486106282", "is_nested": false, "module": { "is_private": false, @@ -371,7 +371,7 @@ class D { }; { "bases": [], "display_name": "A", - "id": "1552096180171121044", + "id": "12416769441368968359", "is_abstract": false, "is_nested": false, "is_struct": false, diff --git a/docs/test_cases/t00072_class.svg b/docs/test_cases/t00072_class.svg index 7b04614d..c6fbc177 100644 --- a/docs/test_cases/t00072_class.svg +++ b/docs/test_cases/t00072_class.svg @@ -1,6 +1,6 @@ - + @@ -9,53 +9,53 @@ - + app - + :lib1 - + mod1 - + mod2 - + :lib2 - - + + A - + - + get() : int - + - + a : int - - + + B - - + + BB @@ -64,15 +64,15 @@ - + - + t : T - - + + BBB @@ -81,32 +81,32 @@ bbb2 - - + + D - - + + E - - + + C - - + + CC @@ -115,15 +115,15 @@ - + - + t : T - - + + CCC diff --git a/docs/test_cases/t00072_class_mermaid.svg b/docs/test_cases/t00072_class_mermaid.svg index 5ebcf9ab..0cbe91fa 100644 --- a/docs/test_cases/t00072_class_mermaid.svg +++ b/docs/test_cases/t00072_class_mermaid.svg @@ -52,8 +52,8 @@ - - + + @@ -71,8 +71,8 @@ - - + + @@ -95,8 +95,8 @@ - - + + @@ -124,8 +124,8 @@ - - + + @@ -143,8 +143,8 @@ - - + + @@ -162,8 +162,8 @@ - - + + @@ -181,8 +181,8 @@ - - + + @@ -205,8 +205,8 @@ - - + + @@ -234,8 +234,8 @@ - - + + diff --git a/docs/test_cases/t00073.md b/docs/test_cases/t00073.md index acca766c..b038a4aa 100644 --- a/docs/test_cases/t00073.md +++ b/docs/test_cases/t00073.md @@ -51,7 +51,7 @@ struct R { { "bases": [], "display_name": "A", - "id": "1747277620916743482", + "id": "13978220967333947858", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -73,7 +73,7 @@ struct R { { "bases": [], "display_name": "AHandler", - "id": "1553077875896883107", + "id": "12424623007175064860", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -162,7 +162,7 @@ struct R { { "bases": [], "display_name": "B", - "id": "2289864660191173413", + "id": "18318917281529387309", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -184,7 +184,7 @@ struct R { { "bases": [], "display_name": "BHandler", - "id": "1150176578121877194", + "id": "9201412624975017558", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -273,7 +273,7 @@ struct R { { "bases": [], "display_name": "Overload", - "id": "128238421290776639", + "id": "1025907370326213117", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -303,19 +303,19 @@ struct R { "bases": [ { "access": "public", - "id": "1553077875896883107", + "id": "12424623007175064860", "is_virtual": false, "name": "clanguml::t00073::AHandler" }, { "access": "public", - "id": "1150176578121877194", + "id": "9201412624975017558", "is_virtual": false, "name": "clanguml::t00073::BHandler" } ], "display_name": "Overload", - "id": "1942698483892029961", + "id": "15541587871136239694", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -350,7 +350,7 @@ struct R { { "bases": [], "display_name": "R", - "id": "441440190371151626", + "id": "3531521522969213013", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -388,39 +388,39 @@ struct R { "relationships": [ { "access": "public", - "destination": "1747277620916743482", - "source": "1553077875896883107", + "destination": "13978220967333947858", + "source": "12424623007175064860", "type": "dependency" }, { "access": "public", - "destination": "2289864660191173413", - "source": "1150176578121877194", + "destination": "18318917281529387309", + "source": "9201412624975017558", "type": "dependency" }, { "access": "public", - "destination": "128238421290776639", - "source": "1942698483892029961", + "destination": "1025907370326213117", + "source": "15541587871136239694", "type": "instantiation" }, { "access": "public", - "destination": "1553077875896883107", - "source": "1942698483892029961", + "destination": "12424623007175064860", + "source": "15541587871136239694", "type": "extension" }, { "access": "public", - "destination": "1150176578121877194", - "source": "1942698483892029961", + "destination": "9201412624975017558", + "source": "15541587871136239694", "type": "extension" }, { "access": "public", - "destination": "1942698483892029961", + "destination": "15541587871136239694", "label": "dispatch", - "source": "441440190371151626", + "source": "3531521522969213013", "type": "aggregation" } ], diff --git a/docs/test_cases/t00073_class.svg b/docs/test_cases/t00073_class.svg index 639168f1..3c7a6369 100644 --- a/docs/test_cases/t00073_class.svg +++ b/docs/test_cases/t00073_class.svg @@ -1,6 +1,6 @@ - + @@ -9,70 +9,70 @@ - - + + A - - + + AHandler - + - + operator()(A & a) const : void - + - + handle(A & a) const : void - - + + B - - + + BHandler - + - + operator()(B & b) const : void - + - + handle(B & b) const : void - - + + Overload @@ -81,8 +81,8 @@ - - + + Overload @@ -91,32 +91,32 @@ - - + + R - + - + dispatch : Overload<AHandler,BHandler> - + - + - + - + - + - + dispatch diff --git a/docs/test_cases/t00073_class_mermaid.svg b/docs/test_cases/t00073_class_mermaid.svg index 179611f1..08822150 100644 --- a/docs/test_cases/t00073_class_mermaid.svg +++ b/docs/test_cases/t00073_class_mermaid.svg @@ -122,8 +122,8 @@ - - + + @@ -141,8 +141,8 @@ - - + + @@ -170,8 +170,8 @@ - - + + @@ -189,8 +189,8 @@ - - + + @@ -218,8 +218,8 @@ - - + + @@ -237,8 +237,8 @@ - - + + @@ -256,8 +256,8 @@ - - + + diff --git a/docs/test_cases/t00074.md b/docs/test_cases/t00074.md index cdce4645..4e09ff11 100644 --- a/docs/test_cases/t00074.md +++ b/docs/test_cases/t00074.md @@ -43,7 +43,7 @@ concept orange_c = fruit_c && requires(T t) { t.get_bitterness(); }; "elements": [ { "display_name": "fruit_c", - "id": "486119377394642787", + "id": "3888955019157142299", "name": "fruit_c", "namespace": "clanguml::t00074", "parameters": [ @@ -66,7 +66,7 @@ concept orange_c = fruit_c && requires(T t) { t.get_bitterness(); }; }, { "display_name": "apple_c", - "id": "560253541144761762", + "id": "4482028329158094097", "name": "apple_c", "namespace": "clanguml::t00074", "parameters": [ @@ -88,7 +88,7 @@ concept orange_c = fruit_c && requires(T t) { t.get_bitterness(); }; }, { "display_name": "orange_c", - "id": "1059590388833603455", + "id": "8476723110668827646", "name": "orange_c", "namespace": "clanguml::t00074", "parameters": [ @@ -113,15 +113,15 @@ concept orange_c = fruit_c && requires(T t) { t.get_bitterness(); }; "package_type": "namespace", "relationships": [ { - "destination": "486119377394642787", + "destination": "3888955019157142299", "label": "T", - "source": "560253541144761762", + "source": "4482028329158094097", "type": "constraint" }, { - "destination": "486119377394642787", + "destination": "3888955019157142299", "label": "T", - "source": "1059590388833603455", + "source": "8476723110668827646", "type": "constraint" } ], diff --git a/docs/test_cases/t00074_class.svg b/docs/test_cases/t00074_class.svg index dfdb8dd0..6cee385f 100644 --- a/docs/test_cases/t00074_class.svg +++ b/docs/test_cases/t00074_class.svg @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ - - + + «concept» @@ -20,8 +20,8 @@ - - + + «concept» @@ -31,8 +31,8 @@ - - + + «concept» @@ -42,10 +42,10 @@ - + T - + T diff --git a/docs/test_cases/t00074_class_mermaid.svg b/docs/test_cases/t00074_class_mermaid.svg index f83cab8c..4cc47b1b 100644 --- a/docs/test_cases/t00074_class_mermaid.svg +++ b/docs/test_cases/t00074_class_mermaid.svg @@ -78,8 +78,8 @@ - - + + @@ -97,8 +97,8 @@ - - + + @@ -116,8 +116,8 @@ - - + + diff --git a/docs/test_cases/t00075.md b/docs/test_cases/t00075.md index a5917295..4e0bb5b8 100644 --- a/docs/test_cases/t00075.md +++ b/docs/test_cases/t00075.md @@ -75,7 +75,7 @@ struct R { "elements": [ { "display_name": "C", - "id": "1809332102026994985", + "id": "14474656816215959881", "name": "C", "namespace": "clanguml::t00075::ns1::ns2", "parameters": [ @@ -102,7 +102,7 @@ struct R { "k2" ], "display_name": "E", - "id": "1495076068471344273", + "id": "11960608547770754184", "is_nested": false, "name": "E", "namespace": "clanguml::t00075::ns1::ns2", @@ -117,7 +117,7 @@ struct R { { "bases": [], "display_name": "A", - "id": "939187921829983364", + "id": "7513503374639866918", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -168,7 +168,7 @@ struct R { { "bases": [], "display_name": "B", - "id": "707211578295440427", + "id": "5657692626363523421", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -219,7 +219,7 @@ struct R { { "bases": [], "display_name": "ABE", - "id": "783353028058924890", + "id": "6266824224471399124", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -261,7 +261,7 @@ struct R { { "bases": [], "display_name": "ABE", - "id": "1387241450840584649", + "id": "11097931606724677197", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -290,7 +290,7 @@ struct R { { "bases": [], "display_name": "ABE", - "id": "1119831184809815406", + "id": "8958649478478523249", "is_abstract": false, "is_nested": false, "is_struct": false, @@ -319,7 +319,7 @@ struct R { { "bases": [], "display_name": "R", - "id": "48082947340048353", + "id": "384663578720386827", "is_abstract": false, "is_nested": false, "is_struct": true, @@ -377,58 +377,58 @@ struct R { "relationships": [ { "access": "public", - "destination": "1495076068471344273", - "source": "939187921829983364", + "destination": "11960608547770754184", + "source": "7513503374639866918", "type": "dependency" }, { "access": "public", - "destination": "1495076068471344273", - "source": "707211578295440427", + "destination": "11960608547770754184", + "source": "5657692626363523421", "type": "dependency" }, { - "destination": "1809332102026994985", + "destination": "14474656816215959881", "label": "T", - "source": "783353028058924890", + "source": "6266824224471399124", "type": "constraint" }, { "access": "public", - "destination": "939187921829983364", - "source": "1387241450840584649", + "destination": "7513503374639866918", + "source": "11097931606724677197", "type": "dependency" }, { "access": "public", - "destination": "783353028058924890", - "source": "1387241450840584649", + "destination": "6266824224471399124", + "source": "11097931606724677197", "type": "instantiation" }, { "access": "public", - "destination": "707211578295440427", - "source": "1119831184809815406", + "destination": "5657692626363523421", + "source": "8958649478478523249", "type": "dependency" }, { "access": "public", - "destination": "783353028058924890", - "source": "1119831184809815406", + "destination": "6266824224471399124", + "source": "8958649478478523249", "type": "instantiation" }, { "access": "public", - "destination": "1387241450840584649", + "destination": "11097931606724677197", "label": "a", - "source": "48082947340048353", + "source": "384663578720386827", "type": "aggregation" }, { "access": "public", - "destination": "1119831184809815406", + "destination": "8958649478478523249", "label": "b", - "source": "48082947340048353", + "source": "384663578720386827", "type": "aggregation" } ], diff --git a/docs/test_cases/t00075_class.svg b/docs/test_cases/t00075_class.svg index 9d93ca48..b9dc2e18 100644 --- a/docs/test_cases/t00075_class.svg +++ b/docs/test_cases/t00075_class.svg @@ -1,6 +1,6 @@ - + @@ -9,14 +9,14 @@ - + ns1 - + ns2 - - + + @@ -30,8 +30,8 @@ T{} t.e() - - + + E @@ -40,40 +40,40 @@ k2 - - + + A - + - + e() const : E - - + + B - + - + e() const : E - - + + @@ -83,15 +83,15 @@ - + - + a_or_b : T - - + + @@ -101,8 +101,8 @@ - - + + @@ -112,8 +112,8 @@ - - + + @@ -121,39 +121,39 @@ - + - + a : ABE<A> - + - + b : ABE<B> - + - + - + T - + - + - + - + - + +a - + +b diff --git a/docs/test_cases/t00075_class_mermaid.svg b/docs/test_cases/t00075_class_mermaid.svg index 6fabb7aa..fe304ab6 100644 --- a/docs/test_cases/t00075_class_mermaid.svg +++ b/docs/test_cases/t00075_class_mermaid.svg @@ -162,8 +162,8 @@ - - + + @@ -196,8 +196,8 @@ - - + + @@ -225,8 +225,8 @@ - - + + @@ -249,8 +249,8 @@ - - + + @@ -273,8 +273,8 @@ - - + + @@ -297,8 +297,8 @@ - - + + @@ -316,8 +316,8 @@ - - + + @@ -335,8 +335,8 @@ - - + + diff --git a/docs/test_cases/t00076.md b/docs/test_cases/t00076.md new file mode 100644 index 00000000..5828c6b2 --- /dev/null +++ b/docs/test_cases/t00076.md @@ -0,0 +1,631 @@ +# t00076 - Test case for context diagram with inward direction flag +## Config +```yaml +diagrams: + t00076_class: + type: class + glob: + - t00076.cc + include: + namespaces: + - clanguml::t00076 + context: + - match: + radius: 2 + pattern: clanguml::t00076::B + direction: inward + using_namespace: clanguml::t00076 +``` +## Source code +File `tests/t00076/t00076.cc` +```cpp +namespace clanguml { +namespace t00076 { + +enum Color { red, green, blue }; + +struct F; +struct GG { }; +struct G { + GG gg; +}; +struct GGG { + G g; +}; +struct H { }; +struct J { }; + +struct A { }; + +struct B : public A { + F *f; + Color c; + G g; + /// @uml{composition[0..1:1..*]} + J j; + + struct BB { }; + + BB *bb; + + void a(H *h) { (void)h; } +}; + +struct C : public B { }; + +struct D : public C { }; + +struct EE { }; + +struct E { + B *b; + EE *ee; +}; + +struct EEE { + E *e; +}; + +struct F { }; + +struct I { + void i(B *b) { (void)b; } +}; +} +} +``` +## Generated PlantUML diagrams +![t00076_class](./t00076_class.svg "Test case for context diagram with inward direction flag") +## Generated Mermaid diagrams +![t00076_class](./t00076_class_mermaid.svg "Test case for context diagram with inward direction flag") +## Generated JSON models +```json +{ + "diagram_type": "class", + "elements": [ + { + "constants": [ + "red", + "green", + "blue" + ], + "display_name": "Color", + "id": "1357160052467496131", + "is_nested": false, + "name": "Color", + "namespace": "clanguml::t00076", + "source_location": { + "column": 6, + "file": "t00076.cc", + "line": 4, + "translation_unit": "t00076.cc" + }, + "type": "enum" + }, + { + "bases": [], + "display_name": "GG", + "id": "268571154127239712", + "is_abstract": false, + "is_nested": false, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [], + "methods": [], + "name": "GG", + "namespace": "clanguml::t00076", + "source_location": { + "column": 8, + "file": "t00076.cc", + "line": 7, + "translation_unit": "t00076.cc" + }, + "template_parameters": [], + "type": "class" + }, + { + "bases": [], + "display_name": "G", + "id": "14155804895193829672", + "is_abstract": false, + "is_nested": false, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [ + { + "access": "public", + "is_static": false, + "name": "gg", + "source_location": { + "column": 8, + "file": "t00076.cc", + "line": 9, + "translation_unit": "t00076.cc" + }, + "type": "GG" + } + ], + "methods": [], + "name": "G", + "namespace": "clanguml::t00076", + "source_location": { + "column": 8, + "file": "t00076.cc", + "line": 8, + "translation_unit": "t00076.cc" + }, + "template_parameters": [], + "type": "class" + }, + { + "bases": [], + "display_name": "J", + "id": "2798432465627505061", + "is_abstract": false, + "is_nested": false, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [], + "methods": [], + "name": "J", + "namespace": "clanguml::t00076", + "source_location": { + "column": 8, + "file": "t00076.cc", + "line": 15, + "translation_unit": "t00076.cc" + }, + "template_parameters": [], + "type": "class" + }, + { + "bases": [ + { + "access": "public", + "id": "14151717565203342260", + "is_virtual": false, + "name": "clanguml::t00076::A" + } + ], + "display_name": "B", + "id": "17401388407958641079", + "is_abstract": false, + "is_nested": false, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [ + { + "access": "public", + "is_static": false, + "name": "f", + "source_location": { + "column": 8, + "file": "t00076.cc", + "line": 20, + "translation_unit": "t00076.cc" + }, + "type": "F *" + }, + { + "access": "public", + "is_static": false, + "name": "c", + "source_location": { + "column": 11, + "file": "t00076.cc", + "line": 21, + "translation_unit": "t00076.cc" + }, + "type": "Color" + }, + { + "access": "public", + "is_static": false, + "name": "g", + "source_location": { + "column": 7, + "file": "t00076.cc", + "line": 22, + "translation_unit": "t00076.cc" + }, + "type": "G" + }, + { + "access": "public", + "comment": { + "formatted": "@uml{composition[0..1:1..*]}", + "raw": "/// @uml{composition[0..1:1..*]}" + }, + "is_static": false, + "name": "j", + "source_location": { + "column": 7, + "file": "t00076.cc", + "line": 24, + "translation_unit": "t00076.cc" + }, + "type": "J" + }, + { + "access": "public", + "is_static": false, + "name": "bb", + "source_location": { + "column": 9, + "file": "t00076.cc", + "line": 28, + "translation_unit": "t00076.cc" + }, + "type": "BB *" + } + ], + "methods": [ + { + "access": "public", + "display_name": "a", + "is_const": false, + "is_consteval": false, + "is_constexpr": false, + "is_constructor": false, + "is_copy_assignment": false, + "is_coroutine": false, + "is_defaulted": false, + "is_deleted": false, + "is_move_assignment": false, + "is_noexcept": false, + "is_operator": false, + "is_pure_virtual": false, + "is_static": false, + "is_virtual": false, + "name": "a", + "parameters": [ + { + "name": "h", + "type": "H *" + } + ], + "source_location": { + "column": 10, + "file": "t00076.cc", + "line": 30, + "translation_unit": "t00076.cc" + }, + "template_parameters": [], + "type": "void" + } + ], + "name": "B", + "namespace": "clanguml::t00076", + "source_location": { + "column": 8, + "file": "t00076.cc", + "line": 19, + "translation_unit": "t00076.cc" + }, + "template_parameters": [], + "type": "class" + }, + { + "bases": [], + "display_name": "B::BB", + "id": "8692768569991895602", + "is_abstract": false, + "is_nested": true, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [], + "methods": [], + "name": "B::BB", + "namespace": "clanguml::t00076", + "source_location": { + "column": 12, + "file": "t00076.cc", + "line": 26, + "translation_unit": "t00076.cc" + }, + "template_parameters": [], + "type": "class" + }, + { + "bases": [ + { + "access": "public", + "id": "17401388407958641079", + "is_virtual": false, + "name": "clanguml::t00076::B" + } + ], + "display_name": "C", + "id": "6450714203544144591", + "is_abstract": false, + "is_nested": false, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [], + "methods": [], + "name": "C", + "namespace": "clanguml::t00076", + "source_location": { + "column": 8, + "file": "t00076.cc", + "line": 33, + "translation_unit": "t00076.cc" + }, + "template_parameters": [], + "type": "class" + }, + { + "bases": [ + { + "access": "public", + "id": "6450714203544144591", + "is_virtual": false, + "name": "clanguml::t00076::C" + } + ], + "display_name": "D", + "id": "8310927683014217983", + "is_abstract": false, + "is_nested": false, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [], + "methods": [], + "name": "D", + "namespace": "clanguml::t00076", + "source_location": { + "column": 8, + "file": "t00076.cc", + "line": 35, + "translation_unit": "t00076.cc" + }, + "template_parameters": [], + "type": "class" + }, + { + "bases": [], + "display_name": "E", + "id": "17377451137994128435", + "is_abstract": false, + "is_nested": false, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [ + { + "access": "public", + "is_static": false, + "name": "b", + "source_location": { + "column": 8, + "file": "t00076.cc", + "line": 40, + "translation_unit": "t00076.cc" + }, + "type": "B *" + }, + { + "access": "public", + "is_static": false, + "name": "ee", + "source_location": { + "column": 9, + "file": "t00076.cc", + "line": 41, + "translation_unit": "t00076.cc" + }, + "type": "EE *" + } + ], + "methods": [], + "name": "E", + "namespace": "clanguml::t00076", + "source_location": { + "column": 8, + "file": "t00076.cc", + "line": 39, + "translation_unit": "t00076.cc" + }, + "template_parameters": [], + "type": "class" + }, + { + "bases": [], + "display_name": "EEE", + "id": "6110290676921432917", + "is_abstract": false, + "is_nested": false, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [ + { + "access": "public", + "is_static": false, + "name": "e", + "source_location": { + "column": 8, + "file": "t00076.cc", + "line": 45, + "translation_unit": "t00076.cc" + }, + "type": "E *" + } + ], + "methods": [], + "name": "EEE", + "namespace": "clanguml::t00076", + "source_location": { + "column": 8, + "file": "t00076.cc", + "line": 44, + "translation_unit": "t00076.cc" + }, + "template_parameters": [], + "type": "class" + }, + { + "bases": [], + "display_name": "I", + "id": "427444038316199137", + "is_abstract": false, + "is_nested": false, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [], + "methods": [ + { + "access": "public", + "display_name": "i", + "is_const": false, + "is_consteval": false, + "is_constexpr": false, + "is_constructor": false, + "is_copy_assignment": false, + "is_coroutine": false, + "is_defaulted": false, + "is_deleted": false, + "is_move_assignment": false, + "is_noexcept": false, + "is_operator": false, + "is_pure_virtual": false, + "is_static": false, + "is_virtual": false, + "name": "i", + "parameters": [ + { + "name": "b", + "type": "B *" + } + ], + "source_location": { + "column": 10, + "file": "t00076.cc", + "line": 51, + "translation_unit": "t00076.cc" + }, + "template_parameters": [], + "type": "void" + } + ], + "name": "I", + "namespace": "clanguml::t00076", + "source_location": { + "column": 8, + "file": "t00076.cc", + "line": 50, + "translation_unit": "t00076.cc" + }, + "template_parameters": [], + "type": "class" + } + ], + "name": "t00076_class", + "package_type": "namespace", + "relationships": [ + { + "access": "public", + "destination": "268571154127239712", + "label": "gg", + "source": "14155804895193829672", + "type": "aggregation" + }, + { + "access": "public", + "destination": "8045105059193364232", + "source": "17401388407958641079", + "type": "dependency" + }, + { + "access": "public", + "destination": "4095144754042414379", + "label": "f", + "source": "17401388407958641079", + "type": "association" + }, + { + "access": "public", + "destination": "1357160052467496131", + "label": "c", + "source": "17401388407958641079", + "type": "aggregation" + }, + { + "access": "public", + "destination": "14155804895193829672", + "label": "g", + "source": "17401388407958641079", + "type": "aggregation" + }, + { + "access": "public", + "destination": "2798432465627505061", + "label": "j", + "multiplicity_destination": "1..*", + "multiplicity_source": "0..1", + "source": "17401388407958641079", + "type": "composition" + }, + { + "access": "public", + "destination": "14151717565203342260", + "source": "17401388407958641079", + "type": "extension" + }, + { + "access": "public", + "destination": "17401388407958641079", + "source": "8692768569991895602", + "type": "containment" + }, + { + "access": "public", + "destination": "17401388407958641079", + "source": "6450714203544144591", + "type": "extension" + }, + { + "access": "public", + "destination": "6450714203544144591", + "source": "8310927683014217983", + "type": "extension" + }, + { + "access": "public", + "destination": "17401388407958641079", + "label": "b", + "source": "17377451137994128435", + "type": "association" + }, + { + "access": "public", + "destination": "15384080308608873696", + "label": "ee", + "source": "17377451137994128435", + "type": "association" + }, + { + "access": "public", + "destination": "17377451137994128435", + "label": "e", + "source": "6110290676921432917", + "type": "association" + }, + { + "access": "public", + "destination": "17401388407958641079", + "source": "427444038316199137", + "type": "dependency" + } + ], + "using_namespace": "clanguml::t00076" +} +``` diff --git a/docs/test_cases/t00076_class.svg b/docs/test_cases/t00076_class.svg new file mode 100644 index 00000000..072e18ad --- /dev/null +++ b/docs/test_cases/t00076_class.svg @@ -0,0 +1,212 @@ + + + + + + + + + + + + + + + + Color + + red + green + blue + + + + + + + GG + + + + + + + + G + + + + + + + + + gg : GG + + + + + + J + + + + + + + + B + + + + + + + + a(H * h) : void + + + + + + + + bb : BB * + + + + + + + c : Color + + + + + + + f : F * + + + + + + + g : G + + + + + + + j : J + + + + + + B::BB + + + + + + + + C + + + + + + + + D + + + + + + + + E + + + + + + + + + b : B * + + + + + + + ee : EE * + + + + + + EEE + + + + + + + + + e : E * + + + + + + I + + + + + + + + i(B * b) : void + + + + + + gg + + + +c + + + +g + + + +j + 0..1 + 1..* + + + + + + + + + + + +b + + + +e + + + + diff --git a/docs/test_cases/t00076_class_mermaid.svg b/docs/test_cases/t00076_class_mermaid.svg new file mode 100644 index 00000000..2132b7fe --- /dev/null +++ b/docs/test_cases/t00076_class_mermaid.svg @@ -0,0 +1,472 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +gg + +
+ + + + + + +
+ + +c + +
+ + + + + + +
+ + +g + +
+ + + + + + +
+ + +j + +
+ + + + + + +
+ 0..1 +
+ + + + + + +
+ 1..* +
+ + + + + +
+ + + +
+ + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + +
+ + +b + +
+ + + + + + +
+ + +e + +
+ + + + + + +
+ + + +
+ + + + + + + + + + + + +
+ «enumeration» +
+ + +
+ Color +
+ + +
+ red +
+ + +
+ green +
+ + +
+ blue +
+ + + + + + + + + + + +
+ +
+ + +
+ GG +
+ + + + + + + + + + + +
+ +
+ + +
+ G +
+ + +
+ +gg : GG +
+ + + + + + + + + + + +
+ +
+ + +
+ J +
+ + + + + + + + + + + +
+ +
+ + +
+ B +
+ + +
+ +bb : BB +
+ + +
+ +c : Color +
+ + +
+ +f : F +
+ + +
+ +g : G +
+ + +
+ +j : J +
+ + +
+ +a(H * h) : void +
+ + + + + + + + + + + +
+ +
+ + +
+ B::BB +
+ + + + + + + + + + + +
+ +
+ + +
+ C +
+ + + + + + + + + + + +
+ +
+ + +
+ D +
+ + + + + + + + + + + +
+ +
+ + +
+ E +
+ + +
+ +b : B +
+ + +
+ +ee : EE +
+ + + + + + + + + + + +
+ +
+ + +
+ EEE +
+ + +
+ +e : E +
+ + + + + + + + + + + +
+ +
+ + +
+ I +
+ + +
+ +i(B * b) : void +
+ + + + + + + + diff --git a/docs/test_cases/t00077.md b/docs/test_cases/t00077.md new file mode 100644 index 00000000..39ff9571 --- /dev/null +++ b/docs/test_cases/t00077.md @@ -0,0 +1,512 @@ +# t00077 - Test case for context diagram with outward direction flag +## Config +```yaml +diagrams: + t00077_class: + type: class + glob: + - t00077.cc + include: + namespaces: + - clanguml::t00077 + context: + - match: + radius: 2 + pattern: clanguml::t00077::B + direction: outward + using_namespace: clanguml::t00077 +``` +## Source code +File `tests/t00077/t00077.cc` +```cpp +namespace clanguml { +namespace t00077 { + +enum Color { red, green, blue }; + +struct F; +struct GG { }; +struct G { + GG gg; +}; +struct GGG { + G g; +}; +struct H { }; +struct J { }; + +struct Base { }; + +struct A : public Base { }; + +struct B : public A { + F *f; + Color c; + G g; + /// @uml{composition[0..1:1..*]} + J j; + + void a(H *h) { (void)h; } +}; + +struct C : public B { }; + +struct D : public C { }; + +struct EE { }; + +struct E { + B *b; + EE *ee; +}; + +struct EEE { + E *e; +}; + +struct FF { }; +struct F { + FF *ff; +}; +struct FFF { + F *f; +}; + +struct I { + void i(B *b) { (void)b; } +}; + +struct KKK { }; + +struct K { + B b; + KKK kkk; +}; + +struct KK { + K k; +}; +} +} +``` +## Generated PlantUML diagrams +![t00077_class](./t00077_class.svg "Test case for context diagram with outward direction flag") +## Generated Mermaid diagrams +![t00077_class](./t00077_class_mermaid.svg "Test case for context diagram with outward direction flag") +## Generated JSON models +```json +{ + "diagram_type": "class", + "elements": [ + { + "bases": [], + "display_name": "H", + "id": "4471280448157207059", + "is_abstract": false, + "is_nested": false, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [], + "methods": [], + "name": "H", + "namespace": "clanguml::t00077", + "source_location": { + "column": 8, + "file": "t00077.cc", + "line": 14, + "translation_unit": "t00077.cc" + }, + "template_parameters": [], + "type": "class" + }, + { + "bases": [], + "display_name": "Base", + "id": "962922109375459669", + "is_abstract": false, + "is_nested": false, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [], + "methods": [], + "name": "Base", + "namespace": "clanguml::t00077", + "source_location": { + "column": 8, + "file": "t00077.cc", + "line": 17, + "translation_unit": "t00077.cc" + }, + "template_parameters": [], + "type": "class" + }, + { + "bases": [ + { + "access": "public", + "id": "962922109375459669", + "is_virtual": false, + "name": "clanguml::t00077::Base" + } + ], + "display_name": "A", + "id": "11110555698388355337", + "is_abstract": false, + "is_nested": false, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [], + "methods": [], + "name": "A", + "namespace": "clanguml::t00077", + "source_location": { + "column": 8, + "file": "t00077.cc", + "line": 19, + "translation_unit": "t00077.cc" + }, + "template_parameters": [], + "type": "class" + }, + { + "bases": [ + { + "access": "public", + "id": "11110555698388355337", + "is_virtual": false, + "name": "clanguml::t00077::A" + } + ], + "display_name": "B", + "id": "611485414721657062", + "is_abstract": false, + "is_nested": false, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [ + { + "access": "public", + "is_static": false, + "name": "f", + "source_location": { + "column": 8, + "file": "t00077.cc", + "line": 22, + "translation_unit": "t00077.cc" + }, + "type": "F *" + }, + { + "access": "public", + "is_static": false, + "name": "c", + "source_location": { + "column": 11, + "file": "t00077.cc", + "line": 23, + "translation_unit": "t00077.cc" + }, + "type": "Color" + }, + { + "access": "public", + "is_static": false, + "name": "g", + "source_location": { + "column": 7, + "file": "t00077.cc", + "line": 24, + "translation_unit": "t00077.cc" + }, + "type": "G" + }, + { + "access": "public", + "comment": { + "formatted": "@uml{composition[0..1:1..*]}", + "raw": "/// @uml{composition[0..1:1..*]}" + }, + "is_static": false, + "name": "j", + "source_location": { + "column": 7, + "file": "t00077.cc", + "line": 26, + "translation_unit": "t00077.cc" + }, + "type": "J" + } + ], + "methods": [ + { + "access": "public", + "display_name": "a", + "is_const": false, + "is_consteval": false, + "is_constexpr": false, + "is_constructor": false, + "is_copy_assignment": false, + "is_coroutine": false, + "is_defaulted": false, + "is_deleted": false, + "is_move_assignment": false, + "is_noexcept": false, + "is_operator": false, + "is_pure_virtual": false, + "is_static": false, + "is_virtual": false, + "name": "a", + "parameters": [ + { + "name": "h", + "type": "H *" + } + ], + "source_location": { + "column": 10, + "file": "t00077.cc", + "line": 28, + "translation_unit": "t00077.cc" + }, + "template_parameters": [], + "type": "void" + } + ], + "name": "B", + "namespace": "clanguml::t00077", + "source_location": { + "column": 8, + "file": "t00077.cc", + "line": 21, + "translation_unit": "t00077.cc" + }, + "template_parameters": [], + "type": "class" + }, + { + "bases": [], + "display_name": "FF", + "id": "100067327928786611", + "is_abstract": false, + "is_nested": false, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [], + "methods": [], + "name": "FF", + "namespace": "clanguml::t00077", + "source_location": { + "column": 8, + "file": "t00077.cc", + "line": 46, + "translation_unit": "t00077.cc" + }, + "template_parameters": [], + "type": "class" + }, + { + "bases": [], + "display_name": "F", + "id": "4107826685860758244", + "is_abstract": false, + "is_nested": false, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [ + { + "access": "public", + "is_static": false, + "name": "ff", + "source_location": { + "column": 9, + "file": "t00077.cc", + "line": 48, + "translation_unit": "t00077.cc" + }, + "type": "FF *" + } + ], + "methods": [], + "name": "F", + "namespace": "clanguml::t00077", + "source_location": { + "column": 8, + "file": "t00077.cc", + "line": 47, + "translation_unit": "t00077.cc" + }, + "template_parameters": [], + "type": "class" + }, + { + "bases": [], + "display_name": "K", + "id": "2855344937087077573", + "is_abstract": false, + "is_nested": false, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [ + { + "access": "public", + "is_static": false, + "name": "b", + "source_location": { + "column": 7, + "file": "t00077.cc", + "line": 61, + "translation_unit": "t00077.cc" + }, + "type": "B" + }, + { + "access": "public", + "is_static": false, + "name": "kkk", + "source_location": { + "column": 9, + "file": "t00077.cc", + "line": 62, + "translation_unit": "t00077.cc" + }, + "type": "KKK" + } + ], + "methods": [], + "name": "K", + "namespace": "clanguml::t00077", + "source_location": { + "column": 8, + "file": "t00077.cc", + "line": 60, + "translation_unit": "t00077.cc" + }, + "template_parameters": [], + "type": "class" + }, + { + "bases": [], + "display_name": "KK", + "id": "16909696417266973013", + "is_abstract": false, + "is_nested": false, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [ + { + "access": "public", + "is_static": false, + "name": "k", + "source_location": { + "column": 7, + "file": "t00077.cc", + "line": 66, + "translation_unit": "t00077.cc" + }, + "type": "K" + } + ], + "methods": [], + "name": "KK", + "namespace": "clanguml::t00077", + "source_location": { + "column": 8, + "file": "t00077.cc", + "line": 65, + "translation_unit": "t00077.cc" + }, + "template_parameters": [], + "type": "class" + } + ], + "name": "t00077_class", + "package_type": "namespace", + "relationships": [ + { + "access": "public", + "destination": "962922109375459669", + "source": "11110555698388355337", + "type": "extension" + }, + { + "access": "public", + "destination": "4471280448157207059", + "source": "611485414721657062", + "type": "dependency" + }, + { + "access": "public", + "destination": "4107826685860758244", + "label": "f", + "source": "611485414721657062", + "type": "association" + }, + { + "access": "public", + "destination": "13808657890485968392", + "label": "c", + "source": "611485414721657062", + "type": "aggregation" + }, + { + "access": "public", + "destination": "14499052668890138637", + "label": "g", + "source": "611485414721657062", + "type": "aggregation" + }, + { + "access": "public", + "destination": "8461727026638237611", + "label": "j", + "multiplicity_destination": "1..*", + "multiplicity_source": "0..1", + "source": "611485414721657062", + "type": "composition" + }, + { + "access": "public", + "destination": "11110555698388355337", + "source": "611485414721657062", + "type": "extension" + }, + { + "access": "public", + "destination": "100067327928786611", + "label": "ff", + "source": "4107826685860758244", + "type": "association" + }, + { + "access": "public", + "destination": "611485414721657062", + "label": "b", + "source": "2855344937087077573", + "type": "aggregation" + }, + { + "access": "public", + "destination": "15983793244020940633", + "label": "kkk", + "source": "2855344937087077573", + "type": "aggregation" + }, + { + "access": "public", + "destination": "2855344937087077573", + "label": "k", + "source": "16909696417266973013", + "type": "aggregation" + } + ], + "using_namespace": "clanguml::t00077" +} +``` diff --git a/docs/test_cases/t00077_class.svg b/docs/test_cases/t00077_class.svg new file mode 100644 index 00000000..66a36370 --- /dev/null +++ b/docs/test_cases/t00077_class.svg @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + H + + + + + + + + Base + + + + + + + + A + + + + + + + + B + + + + + + + + a(H * h) : void + + + + + + + + c : Color + + + + + + + f : F * + + + + + + + g : G + + + + + + + j : J + + + + + + FF + + + + + + + + F + + + + + + + + + ff : FF * + + + + + + K + + + + + + + + + b : B + + + + + + + kkk : KKK + + + + + + KK + + + + + + + + + k : K + + + + + + + + +f + + + + + + ff + + + +b + + + +k + + diff --git a/docs/test_cases/t00077_class_mermaid.svg b/docs/test_cases/t00077_class_mermaid.svg new file mode 100644 index 00000000..732b34b2 --- /dev/null +++ b/docs/test_cases/t00077_class_mermaid.svg @@ -0,0 +1,337 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + +
+ + + +
+ + + + + + +
+ + +f + +
+ + + + + + +
+ +
+ + + + + + +
+ + +ff + +
+ + + + + + +
+ + +b + +
+ + + + + + +
+ + +k + +
+ + + + + + + + + + + + +
+ +
+ + +
+ H +
+ + + + + + + + + + + +
+ +
+ + +
+ Base +
+ + + + + + + + + + + +
+ +
+ + +
+ A +
+ + + + + + + + + + + +
+ +
+ + +
+ B +
+ + +
+ +c : Color +
+ + +
+ +f : F +
+ + +
+ +g : G +
+ + +
+ +j : J +
+ + +
+ +a(H * h) : void +
+ + + + + + + + + + + +
+ +
+ + +
+ FF +
+ + + + + + + + + + + +
+ +
+ + +
+ F +
+ + +
+ +ff : FF +
+ + + + + + + + + + + +
+ +
+ + +
+ K +
+ + +
+ +b : B +
+ + +
+ +kkk : KKK +
+ + + + + + + + + + + +
+ +
+ + +
+ KK +
+ + +
+ +k : K +
+ + + + + + + + diff --git a/docs/test_cases/t00078.md b/docs/test_cases/t00078.md new file mode 100644 index 00000000..ca17fc83 --- /dev/null +++ b/docs/test_cases/t00078.md @@ -0,0 +1,223 @@ +# t00078 - Test case for context diagram with relationships option +## Config +```yaml +diagrams: + t00078_class: + type: class + glob: + - t00078.cc + include: + namespaces: + - clanguml::t00078 + context: + - match: + radius: 1 + pattern: clanguml::t00078::A + relationships: + - inheritance + - aggregation + using_namespace: clanguml::t00078 +``` +## Source code +File `tests/t00078/t00078.cc` +```cpp +namespace clanguml { +namespace t00078 { + +struct Base { }; + +struct D { }; +struct E { }; +struct A : public Base { + D d; + E *e; +}; + +struct B { + A *a; +}; + +struct C { + A a; +}; + +} +} +``` +## Generated PlantUML diagrams +![t00078_class](./t00078_class.svg "Test case for context diagram with relationships option") +## Generated Mermaid diagrams +![t00078_class](./t00078_class_mermaid.svg "Test case for context diagram with relationships option") +## Generated JSON models +```json +{ + "diagram_type": "class", + "elements": [ + { + "bases": [], + "display_name": "Base", + "id": "8530329873091241519", + "is_abstract": false, + "is_nested": false, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [], + "methods": [], + "name": "Base", + "namespace": "clanguml::t00078", + "source_location": { + "column": 8, + "file": "t00078.cc", + "line": 4, + "translation_unit": "t00078.cc" + }, + "template_parameters": [], + "type": "class" + }, + { + "bases": [], + "display_name": "D", + "id": "827774810081248671", + "is_abstract": false, + "is_nested": false, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [], + "methods": [], + "name": "D", + "namespace": "clanguml::t00078", + "source_location": { + "column": 8, + "file": "t00078.cc", + "line": 6, + "translation_unit": "t00078.cc" + }, + "template_parameters": [], + "type": "class" + }, + { + "bases": [ + { + "access": "public", + "id": "8530329873091241519", + "is_virtual": false, + "name": "clanguml::t00078::Base" + } + ], + "display_name": "A", + "id": "2648609453195038561", + "is_abstract": false, + "is_nested": false, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [ + { + "access": "public", + "is_static": false, + "name": "d", + "source_location": { + "column": 7, + "file": "t00078.cc", + "line": 9, + "translation_unit": "t00078.cc" + }, + "type": "D" + }, + { + "access": "public", + "is_static": false, + "name": "e", + "source_location": { + "column": 8, + "file": "t00078.cc", + "line": 10, + "translation_unit": "t00078.cc" + }, + "type": "E *" + } + ], + "methods": [], + "name": "A", + "namespace": "clanguml::t00078", + "source_location": { + "column": 8, + "file": "t00078.cc", + "line": 8, + "translation_unit": "t00078.cc" + }, + "template_parameters": [], + "type": "class" + }, + { + "bases": [], + "display_name": "C", + "id": "17273429802989715399", + "is_abstract": false, + "is_nested": false, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [ + { + "access": "public", + "is_static": false, + "name": "a", + "source_location": { + "column": 7, + "file": "t00078.cc", + "line": 18, + "translation_unit": "t00078.cc" + }, + "type": "A" + } + ], + "methods": [], + "name": "C", + "namespace": "clanguml::t00078", + "source_location": { + "column": 8, + "file": "t00078.cc", + "line": 17, + "translation_unit": "t00078.cc" + }, + "template_parameters": [], + "type": "class" + } + ], + "name": "t00078_class", + "package_type": "namespace", + "relationships": [ + { + "access": "public", + "destination": "827774810081248671", + "label": "d", + "source": "2648609453195038561", + "type": "aggregation" + }, + { + "access": "public", + "destination": "13336639887154812399", + "label": "e", + "source": "2648609453195038561", + "type": "association" + }, + { + "access": "public", + "destination": "8530329873091241519", + "source": "2648609453195038561", + "type": "extension" + }, + { + "access": "public", + "destination": "2648609453195038561", + "label": "a", + "source": "17273429802989715399", + "type": "aggregation" + } + ], + "using_namespace": "clanguml::t00078" +} +``` diff --git a/docs/test_cases/t00078_class.svg b/docs/test_cases/t00078_class.svg new file mode 100644 index 00000000..c238778e --- /dev/null +++ b/docs/test_cases/t00078_class.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + Base + + + + + + + + D + + + + + + + + A + + + + + + + + + d : D + + + + + + + e : E * + + + + + + C + + + + + + + + + a : A + + + + +d + + + + + +a + + diff --git a/docs/test_cases/t00078_class_mermaid.svg b/docs/test_cases/t00078_class_mermaid.svg new file mode 100644 index 00000000..da6a0850 --- /dev/null +++ b/docs/test_cases/t00078_class_mermaid.svg @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +d + +
+ + + + + + +
+ +
+ + + + + + +
+ + +a + +
+ + + + + + + + + + + + +
+ +
+ + +
+ Base +
+ + + + + + + + + + + +
+ +
+ + +
+ D +
+ + + + + + + + + + + +
+ +
+ + +
+ A +
+ + +
+ +d : D +
+ + +
+ +e : E +
+ + + + + + + + + + + +
+ +
+ + +
+ C +
+ + +
+ +a : A +
+ + + + + + + + diff --git a/docs/test_cases/t00079.md b/docs/test_cases/t00079.md new file mode 100644 index 00000000..e52b8444 --- /dev/null +++ b/docs/test_cases/t00079.md @@ -0,0 +1,128 @@ +# t00079 - Test case for context diagram exclude filter with relationships option +## Config +```yaml +diagrams: + t00079_class: + type: class + glob: + - t00079.cc + include: + namespaces: + - clanguml::t00079 + exclude: + context: + - match: + radius: 1 + pattern: clanguml::t00079::A + relationships: + - inheritance + - aggregation + using_namespace: clanguml::t00079 +``` +## Source code +File `tests/t00079/t00079.cc` +```cpp +namespace clanguml { +namespace t00079 { + +struct Base { }; + +struct D { }; +struct E { }; +struct A : public Base { + D d; + E *e; +}; + +struct B { + A *a; +}; + +struct C { + A a; +}; + +} +} +``` +## Generated PlantUML diagrams +![t00079_class](./t00079_class.svg "Test case for context diagram exclude filter with relationships option") +## Generated Mermaid diagrams +![t00079_class](./t00079_class_mermaid.svg "Test case for context diagram exclude filter with relationships option") +## Generated JSON models +```json +{ + "diagram_type": "class", + "elements": [ + { + "bases": [], + "display_name": "E", + "id": "18284199960848715524", + "is_abstract": false, + "is_nested": false, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [], + "methods": [], + "name": "E", + "namespace": "clanguml::t00079", + "source_location": { + "column": 8, + "file": "t00079.cc", + "line": 7, + "translation_unit": "t00079.cc" + }, + "template_parameters": [], + "type": "class" + }, + { + "bases": [], + "display_name": "B", + "id": "17719745761779016384", + "is_abstract": false, + "is_nested": false, + "is_struct": true, + "is_template": false, + "is_union": false, + "members": [ + { + "access": "public", + "is_static": false, + "name": "a", + "source_location": { + "column": 8, + "file": "t00079.cc", + "line": 14, + "translation_unit": "t00079.cc" + }, + "type": "A *" + } + ], + "methods": [], + "name": "B", + "namespace": "clanguml::t00079", + "source_location": { + "column": 8, + "file": "t00079.cc", + "line": 13, + "translation_unit": "t00079.cc" + }, + "template_parameters": [], + "type": "class" + } + ], + "name": "t00079_class", + "package_type": "namespace", + "relationships": [ + { + "access": "public", + "destination": "8374063247524690299", + "label": "a", + "source": "17719745761779016384", + "type": "association" + } + ], + "using_namespace": "clanguml::t00079" +} +``` diff --git a/docs/test_cases/t00079_class.svg b/docs/test_cases/t00079_class.svg new file mode 100644 index 00000000..ba5d6156 --- /dev/null +++ b/docs/test_cases/t00079_class.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + E + + + + + + + + B + + + + + + + + + a : A * + + + diff --git a/docs/test_cases/t00079_class_mermaid.svg b/docs/test_cases/t00079_class_mermaid.svg new file mode 100644 index 00000000..545effdb --- /dev/null +++ b/docs/test_cases/t00079_class_mermaid.svg @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + +
+ E +
+ + + + + + + + + + + +
+ +
+ + +
+ B +
+ + +
+ +a : A +
+ + + + + + + + diff --git a/docs/test_cases/t20001.md b/docs/test_cases/t20001.md index c2fd7462..56035514 100644 --- a/docs/test_cases/t20001.md +++ b/docs/test_cases/t20001.md @@ -121,7 +121,7 @@ int tmain() { "display_name": "tmain()", "full_name": "clanguml::t20001::tmain()", - "id": "622672604730036140", + "id": "4981380837840289120", "name": "tmain", "namespace": "clanguml::t20001", "source_location": { @@ -137,7 +137,7 @@ int tmain() { "display_name": "A()", "full_name": "clanguml::t20001::A::A()", - "id": "275353461034438145", + "id": "2202827688275505167", "name": "A", "namespace": "", "source_location": { @@ -151,7 +151,7 @@ int tmain() { "display_name": "add(int,int)", "full_name": "clanguml::t20001::A::add(int,int)", - "id": "1131549932713395402", + "id": "9052399461707163220", "name": "add", "namespace": "", "source_location": { @@ -165,7 +165,7 @@ int tmain() { "display_name": "add3(int,int,int)", "full_name": "clanguml::t20001::A::add3(int,int,int)", - "id": "2090436635449419593", + "id": "16723493083595356745", "name": "add3", "namespace": "", "source_location": { @@ -179,7 +179,7 @@ int tmain() { "display_name": "log_result(int)", "full_name": "clanguml::t20001::A::log_result(int)", - "id": "1205947631808952097", + "id": "9647581054471616782", "name": "log_result", "namespace": "", "source_location": { @@ -193,7 +193,7 @@ int tmain() ], "display_name": "A", "full_name": "clanguml::t20001::A", - "id": "1771943546649183134", + "id": "14175548373193465074", "name": "A", "namespace": "clanguml::t20001", "source_location": { @@ -209,7 +209,7 @@ int tmain() { "display_name": "B(A &)", "full_name": "clanguml::t20001::B::B(A &)", - "id": "2235477658795500000", + "id": "17883821270364000003", "name": "B", "namespace": "", "source_location": { @@ -223,7 +223,7 @@ int tmain() { "display_name": "wrap_add3(int,int,int)", "full_name": "clanguml::t20001::B::wrap_add3(int,int,int)", - "id": "642550151323208936", + "id": "5140401210585671495", "name": "wrap_add3", "namespace": "", "source_location": { @@ -237,7 +237,7 @@ int tmain() ], "display_name": "B", "full_name": "clanguml::t20001::B", - "id": "272433898507800600", + "id": "2179471188062404803", "name": "B", "namespace": "clanguml::t20001", "source_location": { @@ -254,8 +254,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "622672604730036140", - "participant_id": "622672604730036140" + "activity_id": "4981380837840289120", + "participant_id": "4981380837840289120" }, "name": "A()", "return_type": "void", @@ -267,15 +267,15 @@ int tmain() "translation_unit": "t20001.cc" }, "to": { - "activity_id": "275353461034438145", - "participant_id": "1771943546649183134" + "activity_id": "2202827688275505167", + "participant_id": "14175548373193465074" }, "type": "message" }, { "from": { - "activity_id": "622672604730036140", - "participant_id": "622672604730036140" + "activity_id": "4981380837840289120", + "participant_id": "4981380837840289120" }, "name": "B(A &)", "return_type": "void", @@ -287,15 +287,15 @@ int tmain() "translation_unit": "t20001.cc" }, "to": { - "activity_id": "2235477658795500000", - "participant_id": "272433898507800600" + "activity_id": "17883821270364000003", + "participant_id": "2179471188062404803" }, "type": "message" }, { "from": { - "activity_id": "622672604730036140", - "participant_id": "622672604730036140" + "activity_id": "4981380837840289120", + "participant_id": "4981380837840289120" }, "name": "add(int,int)", "return_type": "int", @@ -307,15 +307,15 @@ int tmain() "translation_unit": "t20001.cc" }, "to": { - "activity_id": "1131549932713395402", - "participant_id": "1771943546649183134" + "activity_id": "9052399461707163220", + "participant_id": "14175548373193465074" }, "type": "message" }, { "from": { - "activity_id": "622672604730036140", - "participant_id": "622672604730036140" + "activity_id": "4981380837840289120", + "participant_id": "4981380837840289120" }, "name": "wrap_add3(int,int,int)", "return_type": "int", @@ -327,15 +327,15 @@ int tmain() "translation_unit": "t20001.cc" }, "to": { - "activity_id": "642550151323208936", - "participant_id": "272433898507800600" + "activity_id": "5140401210585671495", + "participant_id": "2179471188062404803" }, "type": "message" }, { "from": { - "activity_id": "642550151323208936", - "participant_id": "272433898507800600" + "activity_id": "5140401210585671495", + "participant_id": "2179471188062404803" }, "name": "add3(int,int,int)", "return_type": "int", @@ -347,15 +347,15 @@ int tmain() "translation_unit": "t20001.cc" }, "to": { - "activity_id": "2090436635449419593", - "participant_id": "1771943546649183134" + "activity_id": "16723493083595356745", + "participant_id": "14175548373193465074" }, "type": "message" }, { "from": { - "activity_id": "2090436635449419593", - "participant_id": "1771943546649183134" + "activity_id": "16723493083595356745", + "participant_id": "14175548373193465074" }, "name": "add(int,int)", "return_type": "int", @@ -367,15 +367,15 @@ int tmain() "translation_unit": "t20001.cc" }, "to": { - "activity_id": "1131549932713395402", - "participant_id": "1771943546649183134" + "activity_id": "9052399461707163220", + "participant_id": "14175548373193465074" }, "type": "message" }, { "from": { - "activity_id": "2090436635449419593", - "participant_id": "1771943546649183134" + "activity_id": "16723493083595356745", + "participant_id": "14175548373193465074" }, "name": "log_result(int)", "return_type": "void", @@ -387,15 +387,15 @@ int tmain() "translation_unit": "t20001.cc" }, "to": { - "activity_id": "1205947631808952097", - "participant_id": "1771943546649183134" + "activity_id": "9647581054471616782", + "participant_id": "14175548373193465074" }, "type": "message" }, { "from": { - "activity_id": "642550151323208936", - "participant_id": "272433898507800600" + "activity_id": "5140401210585671495", + "participant_id": "2179471188062404803" }, "name": "log_result(int)", "return_type": "void", @@ -407,14 +407,14 @@ int tmain() "translation_unit": "t20001.cc" }, "to": { - "activity_id": "1205947631808952097", - "participant_id": "1771943546649183134" + "activity_id": "9647581054471616782", + "participant_id": "14175548373193465074" }, "type": "message" } ], "start_from": { - "id": 622672604730036140, + "id": "4981380837840289120", "location": "clanguml::t20001::tmain()" } } diff --git a/docs/test_cases/t20001_sequence.svg b/docs/test_cases/t20001_sequence.svg index fab73893..0b1724d7 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 481514d5..dd9dac2e 100644 --- a/docs/test_cases/t20002.md +++ b/docs/test_cases/t20002.md @@ -48,7 +48,7 @@ void m1() { m2(); } { "display_name": "m1()", "full_name": "clanguml::t20002::m1()", - "id": "1619421429271064154", + "id": "12955371434168513235", "name": "m1", "namespace": "clanguml::t20002", "source_location": { @@ -62,7 +62,7 @@ void m1() { m2(); } { "display_name": "m2()", "full_name": "clanguml::t20002::m2()", - "id": "1575240232156112674", + "id": "12601921857248901395", "name": "m2", "namespace": "clanguml::t20002", "source_location": { @@ -76,7 +76,7 @@ void m1() { m2(); } { "display_name": "m3()", "full_name": "clanguml::t20002::m3()", - "id": "1838809176089209580", + "id": "14710473408713676641", "name": "m3", "namespace": "clanguml::t20002", "source_location": { @@ -90,7 +90,7 @@ void m1() { m2(); } { "display_name": "m4()", "full_name": "clanguml::t20002::m4()", - "id": "63715062711218534", + "id": "509720501689748277", "name": "m4", "namespace": "clanguml::t20002", "source_location": { @@ -107,8 +107,8 @@ void m1() { m2(); } "messages": [ { "from": { - "activity_id": "1619421429271064154", - "participant_id": "1619421429271064154" + "activity_id": "12955371434168513235", + "participant_id": "12955371434168513235" }, "name": "", "return_type": "void", @@ -120,15 +120,15 @@ void m1() { m2(); } "translation_unit": "t20002.cc" }, "to": { - "activity_id": "1575240232156112674", - "participant_id": "1575240232156112674" + "activity_id": "12601921857248901395", + "participant_id": "12601921857248901395" }, "type": "message" }, { "from": { - "activity_id": "1575240232156112674", - "participant_id": "1575240232156112674" + "activity_id": "12601921857248901395", + "participant_id": "12601921857248901395" }, "name": "", "return_type": "void", @@ -140,15 +140,15 @@ void m1() { m2(); } "translation_unit": "t20002.cc" }, "to": { - "activity_id": "1838809176089209580", - "participant_id": "1838809176089209580" + "activity_id": "14710473408713676641", + "participant_id": "14710473408713676641" }, "type": "message" }, { "from": { - "activity_id": "1838809176089209580", - "participant_id": "1838809176089209580" + "activity_id": "14710473408713676641", + "participant_id": "14710473408713676641" }, "name": "", "return_type": "void", @@ -160,14 +160,14 @@ void m1() { m2(); } "translation_unit": "t20002.cc" }, "to": { - "activity_id": "63715062711218534", - "participant_id": "63715062711218534" + "activity_id": "509720501689748277", + "participant_id": "509720501689748277" }, "type": "message" } ], "start_from": { - "id": 1619421429271064154, + "id": "12955371434168513235", "location": "clanguml::t20002::m1()" } } diff --git a/docs/test_cases/t20002_sequence.svg b/docs/test_cases/t20002_sequence.svg index 5ae66bce..0cf0f956 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 50382330..2ecde268 100644 --- a/docs/test_cases/t20003.md +++ b/docs/test_cases/t20003.md @@ -44,7 +44,7 @@ template void m1(T p) { m2(p); } { "display_name": "m1(T)", "full_name": "clanguml::t20003::m1(T)", - "id": "469205740799240869", + "id": "3753645926393926952", "name": "m1", "namespace": "clanguml::t20003", "source_location": { @@ -58,7 +58,7 @@ template void m1(T p) { m2(p); } { "display_name": "m2(T)", "full_name": "clanguml::t20003::m2(T)", - "id": "1502957449367040488", + "id": "12023659594936323905", "name": "m2", "namespace": "clanguml::t20003", "source_location": { @@ -72,7 +72,7 @@ template void m1(T p) { m2(p); } { "display_name": "m3(T)", "full_name": "clanguml::t20003::m3(T)", - "id": "613477682313507585", + "id": "4907821458508060685", "name": "m3", "namespace": "clanguml::t20003", "source_location": { @@ -86,7 +86,7 @@ template void m1(T p) { m2(p); } { "display_name": "m4(T)", "full_name": "clanguml::t20003::m4(T)", - "id": "619960023608507925", + "id": "4959680188868063405", "name": "m4", "namespace": "clanguml::t20003", "source_location": { @@ -103,8 +103,8 @@ template void m1(T p) { m2(p); } "messages": [ { "from": { - "activity_id": "469205740799240869", - "participant_id": "469205740799240869" + "activity_id": "3753645926393926952", + "participant_id": "3753645926393926952" }, "name": "", "return_type": "void", @@ -116,15 +116,15 @@ template void m1(T p) { m2(p); } "translation_unit": "t20003.cc" }, "to": { - "activity_id": "1502957449367040488", - "participant_id": "1502957449367040488" + "activity_id": "12023659594936323905", + "participant_id": "12023659594936323905" }, "type": "message" }, { "from": { - "activity_id": "1502957449367040488", - "participant_id": "1502957449367040488" + "activity_id": "12023659594936323905", + "participant_id": "12023659594936323905" }, "name": "", "return_type": "void", @@ -136,15 +136,15 @@ template void m1(T p) { m2(p); } "translation_unit": "t20003.cc" }, "to": { - "activity_id": "613477682313507585", - "participant_id": "613477682313507585" + "activity_id": "4907821458508060685", + "participant_id": "4907821458508060685" }, "type": "message" }, { "from": { - "activity_id": "613477682313507585", - "participant_id": "613477682313507585" + "activity_id": "4907821458508060685", + "participant_id": "4907821458508060685" }, "name": "", "return_type": "void", @@ -156,14 +156,14 @@ template void m1(T p) { m2(p); } "translation_unit": "t20003.cc" }, "to": { - "activity_id": "619960023608507925", - "participant_id": "619960023608507925" + "activity_id": "4959680188868063405", + "participant_id": "4959680188868063405" }, "type": "message" } ], "start_from": { - "id": 469205740799240869, + "id": "3753645926393926952", "location": "clanguml::t20003::m1(T)" } } diff --git a/docs/test_cases/t20003_sequence.svg b/docs/test_cases/t20003_sequence.svg index 59351534..227e2271 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 c9e2c49f..a3f78d88 100644 --- a/docs/test_cases/t20004.md +++ b/docs/test_cases/t20004.md @@ -80,7 +80,7 @@ int main() { "display_name": "main()", "full_name": "clanguml::t20004::main()", - "id": "2299662004367884401", + "id": "18397296034943075211", "name": "main", "namespace": "clanguml::t20004", "source_location": { @@ -94,7 +94,7 @@ int main() { "display_name": "m1(float)", "full_name": "clanguml::t20004::m1(float)", - "id": "138925040763435897", + "id": "1111400326107487179", "name": "m1", "namespace": "clanguml::t20004", "source_location": { @@ -108,7 +108,7 @@ int main() { "display_name": "m1(unsigned long)", "full_name": "clanguml::t20004::m1(unsigned long)", - "id": "1239083518717603720", + "id": "9912668149740829763", "name": "m1", "namespace": "clanguml::t20004", "source_location": { @@ -122,7 +122,7 @@ int main() { "display_name": "m4(unsigned long)", "full_name": "clanguml::t20004::m4(unsigned long)", - "id": "376599675205498367", + "id": "3012797401643986940", "name": "m4", "namespace": "clanguml::t20004", "source_location": { @@ -136,7 +136,7 @@ int main() { "display_name": "m1(std::string)", "full_name": "clanguml::t20004::m1(std::string)", - "id": "1845817984839618223", + "id": "14766543878716945784", "name": "m1", "namespace": "clanguml::t20004", "source_location": { @@ -150,7 +150,7 @@ int main() { "display_name": "m2(std::string)", "full_name": "clanguml::t20004::m2(std::string)", - "id": "1735054254122948614", + "id": "13880434032983588915", "name": "m2", "namespace": "clanguml::t20004", "source_location": { @@ -164,7 +164,7 @@ int main() { "display_name": "m1(int)", "full_name": "clanguml::t20004::m1(int)", - "id": "121663532044911922", + "id": "973308256359295383", "name": "m1", "namespace": "clanguml::t20004", "source_location": { @@ -178,7 +178,7 @@ int main() { "display_name": "m2(int)", "full_name": "clanguml::t20004::m2(int)", - "id": "1475362124497386656", + "id": "11802896995979093254", "name": "m2", "namespace": "clanguml::t20004", "source_location": { @@ -192,7 +192,7 @@ int main() { "display_name": "m3(int)", "full_name": "clanguml::t20004::m3(int)", - "id": "734999226157549914", + "id": "5879993809260399317", "name": "m3", "namespace": "clanguml::t20004", "source_location": { @@ -206,7 +206,7 @@ int main() { "display_name": "m4(int)", "full_name": "clanguml::t20004::m4(int)", - "id": "1006390865908497562", + "id": "8051126927267980501", "name": "m4", "namespace": "clanguml::t20004", "source_location": { @@ -223,8 +223,8 @@ int main() "messages": [ { "from": { - "activity_id": "2299662004367884401", - "participant_id": "2299662004367884401" + "activity_id": "18397296034943075211", + "participant_id": "18397296034943075211" }, "name": "", "return_type": "", @@ -236,15 +236,15 @@ int main() "translation_unit": "t20004.cc" }, "to": { - "activity_id": "138925040763435897", - "participant_id": "138925040763435897" + "activity_id": "1111400326107487179", + "participant_id": "1111400326107487179" }, "type": "message" }, { "from": { - "activity_id": "2299662004367884401", - "participant_id": "2299662004367884401" + "activity_id": "18397296034943075211", + "participant_id": "18397296034943075211" }, "name": "", "return_type": "", @@ -256,15 +256,15 @@ int main() "translation_unit": "t20004.cc" }, "to": { - "activity_id": "1239083518717603720", - "participant_id": "1239083518717603720" + "activity_id": "9912668149740829763", + "participant_id": "9912668149740829763" }, "type": "message" }, { "from": { - "activity_id": "1239083518717603720", - "participant_id": "1239083518717603720" + "activity_id": "9912668149740829763", + "participant_id": "9912668149740829763" }, "name": "", "return_type": "", @@ -276,15 +276,15 @@ int main() "translation_unit": "t20004.cc" }, "to": { - "activity_id": "376599675205498367", - "participant_id": "376599675205498367" + "activity_id": "3012797401643986940", + "participant_id": "3012797401643986940" }, "type": "message" }, { "from": { - "activity_id": "2299662004367884401", - "participant_id": "2299662004367884401" + "activity_id": "18397296034943075211", + "participant_id": "18397296034943075211" }, "name": "", "return_type": "", @@ -296,15 +296,15 @@ int main() "translation_unit": "t20004.cc" }, "to": { - "activity_id": "1845817984839618223", - "participant_id": "1845817984839618223" + "activity_id": "14766543878716945784", + "participant_id": "14766543878716945784" }, "type": "message" }, { "from": { - "activity_id": "1845817984839618223", - "participant_id": "1845817984839618223" + "activity_id": "14766543878716945784", + "participant_id": "14766543878716945784" }, "name": "", "return_type": "", @@ -316,15 +316,15 @@ int main() "translation_unit": "t20004.cc" }, "to": { - "activity_id": "1735054254122948614", - "participant_id": "1735054254122948614" + "activity_id": "13880434032983588915", + "participant_id": "13880434032983588915" }, "type": "message" }, { "from": { - "activity_id": "2299662004367884401", - "participant_id": "2299662004367884401" + "activity_id": "18397296034943075211", + "participant_id": "18397296034943075211" }, "name": "", "return_type": "", @@ -336,15 +336,15 @@ int main() "translation_unit": "t20004.cc" }, "to": { - "activity_id": "121663532044911922", - "participant_id": "121663532044911922" + "activity_id": "973308256359295383", + "participant_id": "973308256359295383" }, "type": "message" }, { "from": { - "activity_id": "121663532044911922", - "participant_id": "121663532044911922" + "activity_id": "973308256359295383", + "participant_id": "973308256359295383" }, "name": "", "return_type": "", @@ -356,15 +356,15 @@ int main() "translation_unit": "t20004.cc" }, "to": { - "activity_id": "1475362124497386656", - "participant_id": "1475362124497386656" + "activity_id": "11802896995979093254", + "participant_id": "11802896995979093254" }, "type": "message" }, { "from": { - "activity_id": "1475362124497386656", - "participant_id": "1475362124497386656" + "activity_id": "11802896995979093254", + "participant_id": "11802896995979093254" }, "name": "", "return_type": "", @@ -376,15 +376,15 @@ int main() "translation_unit": "t20004.cc" }, "to": { - "activity_id": "734999226157549914", - "participant_id": "734999226157549914" + "activity_id": "5879993809260399317", + "participant_id": "5879993809260399317" }, "type": "message" }, { "from": { - "activity_id": "734999226157549914", - "participant_id": "734999226157549914" + "activity_id": "5879993809260399317", + "participant_id": "5879993809260399317" }, "name": "", "return_type": "", @@ -396,14 +396,14 @@ int main() "translation_unit": "t20004.cc" }, "to": { - "activity_id": "1006390865908497562", - "participant_id": "1006390865908497562" + "activity_id": "8051126927267980501", + "participant_id": "8051126927267980501" }, "type": "message" } ], "start_from": { - "id": 2299662004367884401, + "id": "18397296034943075211", "location": "clanguml::t20004::main()" } } diff --git a/docs/test_cases/t20004_sequence.svg b/docs/test_cases/t20004_sequence.svg index 8a8a160d..9b8b596a 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 36feee57..0fd88daf 100644 --- a/docs/test_cases/t20005.md +++ b/docs/test_cases/t20005.md @@ -53,7 +53,7 @@ template struct C { { "display_name": "c(T)", "full_name": "clanguml::t20005::C::c(T)", - "id": "578718872965404973", + "id": "4629750983723239790", "name": "c", "namespace": "", "source_location": { @@ -67,7 +67,7 @@ template struct C { ], "display_name": "C", "full_name": "clanguml::t20005::C", - "id": "365569130532127604", + "id": "2924553044257020835", "name": "C", "namespace": "clanguml::t20005", "source_location": { @@ -83,7 +83,7 @@ template struct C { { "display_name": "b(T)", "full_name": "clanguml::t20005::B::b(T)", - "id": "870466496899932117", + "id": "6963731975199456942", "name": "b", "namespace": "", "source_location": { @@ -97,7 +97,7 @@ template struct C { ], "display_name": "B", "full_name": "clanguml::t20005::B", - "id": "666000829532846850", + "id": "5328006636262774803", "name": "B", "namespace": "clanguml::t20005", "source_location": { @@ -113,7 +113,7 @@ template struct C { { "display_name": "a(T)", "full_name": "clanguml::t20005::A::a(T)", - "id": "124853455814403745", + "id": "998827646515229964", "name": "a", "namespace": "", "source_location": { @@ -127,7 +127,7 @@ template struct C { ], "display_name": "A", "full_name": "clanguml::t20005::A", - "id": "1278330455625941185", + "id": "10226643645007529481", "name": "A", "namespace": "clanguml::t20005", "source_location": { @@ -144,8 +144,8 @@ template struct C { "messages": [ { "from": { - "activity_id": "578718872965404973", - "participant_id": "365569130532127604" + "activity_id": "4629750983723239790", + "participant_id": "2924553044257020835" }, "name": "b(T)", "return_type": "T", @@ -157,15 +157,15 @@ template struct C { "translation_unit": "t20005.cc" }, "to": { - "activity_id": "870466496899932117", - "participant_id": "666000829532846850" + "activity_id": "6963731975199456942", + "participant_id": "5328006636262774803" }, "type": "message" }, { "from": { - "activity_id": "870466496899932117", - "participant_id": "666000829532846850" + "activity_id": "6963731975199456942", + "participant_id": "5328006636262774803" }, "name": "a(T)", "return_type": "T", @@ -177,15 +177,15 @@ template struct C { "translation_unit": "t20005.cc" }, "to": { - "activity_id": "124853455814403745", - "participant_id": "1278330455625941185" + "activity_id": "998827646515229964", + "participant_id": "10226643645007529481" }, "type": "message" } ], "return_type": "T", "start_from": { - "id": 578718872965404973, + "id": "4629750983723239790", "location": "clanguml::t20005::C::c(T)" } } diff --git a/docs/test_cases/t20005_sequence.svg b/docs/test_cases/t20005_sequence.svg index aea15704..bcf7ad09 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 59c28d0b..24241032 100644 --- a/docs/test_cases/t20006.md +++ b/docs/test_cases/t20006.md @@ -109,7 +109,7 @@ void tmain() { "display_name": "tmain()", "full_name": "clanguml::t20006::tmain()", - "id": "363965584448680958", + "id": "2911724675589447667", "name": "tmain", "namespace": "clanguml::t20006", "source_location": { @@ -125,7 +125,7 @@ void tmain() { "display_name": "b(int)", "full_name": "clanguml::t20006::B::b(int)", - "id": "250247217888843587", + "id": "2001977743110748701", "name": "b", "namespace": "", "source_location": { @@ -139,7 +139,7 @@ void tmain() ], "display_name": "B", "full_name": "clanguml::t20006::B", - "id": "2197760498261923035", + "id": "17582083986095384286", "name": "B", "namespace": "clanguml::t20006", "source_location": { @@ -155,7 +155,7 @@ void tmain() { "display_name": "a1(int)", "full_name": "clanguml::t20006::A::a1(int)", - "id": "196390487987395669", + "id": "1571123903899165357", "name": "a1", "namespace": "", "source_location": { @@ -169,7 +169,7 @@ void tmain() ], "display_name": "A", "full_name": "clanguml::t20006::A", - "id": "596484796124829039", + "id": "4771878368998632313", "name": "A", "namespace": "clanguml::t20006", "source_location": { @@ -185,7 +185,7 @@ void tmain() { "display_name": "b(std::string)", "full_name": "clanguml::t20006::B::b(std::string)", - "id": "13049632552871157", + "id": "104397060422969259", "name": "b", "namespace": "", "source_location": { @@ -199,7 +199,7 @@ void tmain() ], "display_name": "B", "full_name": "clanguml::t20006::B", - "id": "2102622661983365981", + "id": "16820981295866927848", "name": "B", "namespace": "clanguml::t20006", "source_location": { @@ -215,7 +215,7 @@ void tmain() { "display_name": "a2(std::string)", "full_name": "clanguml::t20006::A::a2(std::string)", - "id": "11762588624112907", + "id": "94100708992903256", "name": "a2", "namespace": "", "source_location": { @@ -229,7 +229,7 @@ void tmain() ], "display_name": "A", "full_name": "clanguml::t20006::A", - "id": "413459875415381273", + "id": "3307679003323050191", "name": "A", "namespace": "clanguml::t20006", "source_location": { @@ -245,7 +245,7 @@ void tmain() { "display_name": "BB(AA *)", "full_name": "clanguml::t20006::BB::BB(AA *)", - "id": "381732876807761480", + "id": "3053863014462091843", "name": "BB", "namespace": "", "source_location": { @@ -259,7 +259,7 @@ void tmain() { "display_name": "bb1(int,std::string)", "full_name": "clanguml::t20006::BB::bb1(int,std::string)", - "id": "1062874005712014125", + "id": "8502992045696113005", "name": "bb1", "namespace": "", "source_location": { @@ -273,7 +273,7 @@ void tmain() { "display_name": "bb2(int,std::string)", "full_name": "clanguml::t20006::BB::bb2(int,std::string)", - "id": "787705189994778234", + "id": "6301641519958225878", "name": "bb2", "namespace": "", "source_location": { @@ -287,7 +287,7 @@ void tmain() ], "display_name": "BB", "full_name": "clanguml::t20006::BB", - "id": "2269742833301555472", + "id": "18157942666412443777", "name": "BB", "namespace": "clanguml::t20006", "source_location": { @@ -303,7 +303,7 @@ void tmain() { "display_name": "BB(AA &)", "full_name": "clanguml::t20006::BB::BB(AA &)", - "id": "1051013203072323842", + "id": "8408105624578590737", "name": "BB", "namespace": "", "source_location": { @@ -317,7 +317,7 @@ void tmain() { "display_name": "bb1(int,float)", "full_name": "clanguml::t20006::BB::bb1(int,float)", - "id": "1463188845572485713", + "id": "11705510764579885710", "name": "bb1", "namespace": "", "source_location": { @@ -331,7 +331,7 @@ void tmain() { "display_name": "bb2(int,float)", "full_name": "clanguml::t20006::BB::bb2(int,float)", - "id": "732362671329401903", + "id": "5858901370635215228", "name": "bb2", "namespace": "", "source_location": { @@ -345,7 +345,7 @@ void tmain() ], "display_name": "BB", "full_name": "clanguml::t20006::BB", - "id": "1743503037360505162", + "id": "13948024298884041299", "name": "BB", "namespace": "clanguml::t20006", "source_location": { @@ -361,7 +361,7 @@ void tmain() { "display_name": "bb1(int,int)", "full_name": "clanguml::t20006::BB::bb1(int,int)", - "id": "1213865121829347654", + "id": "9710920974634781233", "name": "bb1", "namespace": "", "source_location": { @@ -375,7 +375,7 @@ void tmain() { "display_name": "bb2(int,int)", "full_name": "clanguml::t20006::BB::bb2(int,int)", - "id": "361650123916792854", + "id": "2893200991334342837", "name": "bb2", "namespace": "", "source_location": { @@ -389,7 +389,7 @@ void tmain() ], "display_name": "BB", "full_name": "clanguml::t20006::BB", - "id": "264392653889863384", + "id": "2115141231118907078", "name": "BB", "namespace": "clanguml::t20006", "source_location": { @@ -405,7 +405,7 @@ void tmain() { "display_name": "aa1(int)", "full_name": "clanguml::t20006::AA::aa1(int)", - "id": "1235428163990670191", + "id": "9883425311925361535", "name": "aa1", "namespace": "", "source_location": { @@ -419,7 +419,7 @@ void tmain() { "display_name": "aa2(int)", "full_name": "clanguml::t20006::AA::aa2(int)", - "id": "582097827335267290", + "id": "4656782618682138323", "name": "aa2", "namespace": "", "source_location": { @@ -433,7 +433,7 @@ void tmain() ], "display_name": "AA", "full_name": "clanguml::t20006::AA", - "id": "1903567228894636312", + "id": "15228537831157090497", "name": "AA", "namespace": "clanguml::t20006", "source_location": { @@ -450,8 +450,8 @@ void tmain() "messages": [ { "from": { - "activity_id": "363965584448680958", - "participant_id": "363965584448680958" + "activity_id": "2911724675589447667", + "participant_id": "2911724675589447667" }, "name": "b(int)", "return_type": "int", @@ -463,15 +463,15 @@ void tmain() "translation_unit": "t20006.cc" }, "to": { - "activity_id": "250247217888843587", - "participant_id": "2197760498261923035" + "activity_id": "2001977743110748701", + "participant_id": "17582083986095384286" }, "type": "message" }, { "from": { - "activity_id": "250247217888843587", - "participant_id": "2197760498261923035" + "activity_id": "2001977743110748701", + "participant_id": "17582083986095384286" }, "name": "a1(int)", "return_type": "int", @@ -483,15 +483,15 @@ void tmain() "translation_unit": "t20006.cc" }, "to": { - "activity_id": "196390487987395669", - "participant_id": "596484796124829039" + "activity_id": "1571123903899165357", + "participant_id": "4771878368998632313" }, "type": "message" }, { "from": { - "activity_id": "363965584448680958", - "participant_id": "363965584448680958" + "activity_id": "2911724675589447667", + "participant_id": "2911724675589447667" }, "name": "b(std::string)", "return_type": "std::string", @@ -503,15 +503,15 @@ void tmain() "translation_unit": "t20006.cc" }, "to": { - "activity_id": "13049632552871157", - "participant_id": "2102622661983365981" + "activity_id": "104397060422969259", + "participant_id": "16820981295866927848" }, "type": "message" }, { "from": { - "activity_id": "13049632552871157", - "participant_id": "2102622661983365981" + "activity_id": "104397060422969259", + "participant_id": "16820981295866927848" }, "name": "a2(std::string)", "return_type": "std::string", @@ -523,15 +523,15 @@ void tmain() "translation_unit": "t20006.cc" }, "to": { - "activity_id": "11762588624112907", - "participant_id": "413459875415381273" + "activity_id": "94100708992903256", + "participant_id": "3307679003323050191" }, "type": "message" }, { "from": { - "activity_id": "363965584448680958", - "participant_id": "363965584448680958" + "activity_id": "2911724675589447667", + "participant_id": "2911724675589447667" }, "name": "BB(AA *)", "return_type": "void", @@ -543,15 +543,15 @@ void tmain() "translation_unit": "t20006.cc" }, "to": { - "activity_id": "381732876807761480", - "participant_id": "2269742833301555472" + "activity_id": "3053863014462091843", + "participant_id": "18157942666412443777" }, "type": "message" }, { "from": { - "activity_id": "363965584448680958", - "participant_id": "363965584448680958" + "activity_id": "2911724675589447667", + "participant_id": "2911724675589447667" }, "name": "BB(AA &)", "return_type": "void", @@ -563,15 +563,15 @@ void tmain() "translation_unit": "t20006.cc" }, "to": { - "activity_id": "1051013203072323842", - "participant_id": "1743503037360505162" + "activity_id": "8408105624578590737", + "participant_id": "13948024298884041299" }, "type": "message" }, { "from": { - "activity_id": "363965584448680958", - "participant_id": "363965584448680958" + "activity_id": "2911724675589447667", + "participant_id": "2911724675589447667" }, "name": "bb1(int,int)", "return_type": "void", @@ -583,15 +583,15 @@ void tmain() "translation_unit": "t20006.cc" }, "to": { - "activity_id": "1213865121829347654", - "participant_id": "264392653889863384" + "activity_id": "9710920974634781233", + "participant_id": "2115141231118907078" }, "type": "message" }, { "from": { - "activity_id": "1213865121829347654", - "participant_id": "264392653889863384" + "activity_id": "9710920974634781233", + "participant_id": "2115141231118907078" }, "name": "aa1(int)", "return_type": "void", @@ -603,15 +603,15 @@ void tmain() "translation_unit": "t20006.cc" }, "to": { - "activity_id": "1235428163990670191", - "participant_id": "1903567228894636312" + "activity_id": "9883425311925361535", + "participant_id": "15228537831157090497" }, "type": "message" }, { "from": { - "activity_id": "363965584448680958", - "participant_id": "363965584448680958" + "activity_id": "2911724675589447667", + "participant_id": "2911724675589447667" }, "name": "bb2(int,int)", "return_type": "void", @@ -623,15 +623,15 @@ void tmain() "translation_unit": "t20006.cc" }, "to": { - "activity_id": "361650123916792854", - "participant_id": "264392653889863384" + "activity_id": "2893200991334342837", + "participant_id": "2115141231118907078" }, "type": "message" }, { "from": { - "activity_id": "361650123916792854", - "participant_id": "264392653889863384" + "activity_id": "2893200991334342837", + "participant_id": "2115141231118907078" }, "name": "aa2(int)", "return_type": "void", @@ -643,15 +643,15 @@ void tmain() "translation_unit": "t20006.cc" }, "to": { - "activity_id": "582097827335267290", - "participant_id": "1903567228894636312" + "activity_id": "4656782618682138323", + "participant_id": "15228537831157090497" }, "type": "message" }, { "from": { - "activity_id": "363965584448680958", - "participant_id": "363965584448680958" + "activity_id": "2911724675589447667", + "participant_id": "2911724675589447667" }, "name": "bb1(int,std::string)", "return_type": "void", @@ -663,15 +663,15 @@ void tmain() "translation_unit": "t20006.cc" }, "to": { - "activity_id": "1062874005712014125", - "participant_id": "2269742833301555472" + "activity_id": "8502992045696113005", + "participant_id": "18157942666412443777" }, "type": "message" }, { "from": { - "activity_id": "1062874005712014125", - "participant_id": "2269742833301555472" + "activity_id": "8502992045696113005", + "participant_id": "18157942666412443777" }, "name": "aa2(int)", "return_type": "void", @@ -683,15 +683,15 @@ void tmain() "translation_unit": "t20006.cc" }, "to": { - "activity_id": "582097827335267290", - "participant_id": "1903567228894636312" + "activity_id": "4656782618682138323", + "participant_id": "15228537831157090497" }, "type": "message" }, { "from": { - "activity_id": "363965584448680958", - "participant_id": "363965584448680958" + "activity_id": "2911724675589447667", + "participant_id": "2911724675589447667" }, "name": "bb2(int,std::string)", "return_type": "void", @@ -703,15 +703,15 @@ void tmain() "translation_unit": "t20006.cc" }, "to": { - "activity_id": "787705189994778234", - "participant_id": "2269742833301555472" + "activity_id": "6301641519958225878", + "participant_id": "18157942666412443777" }, "type": "message" }, { "from": { - "activity_id": "787705189994778234", - "participant_id": "2269742833301555472" + "activity_id": "6301641519958225878", + "participant_id": "18157942666412443777" }, "name": "aa1(int)", "return_type": "void", @@ -723,15 +723,15 @@ void tmain() "translation_unit": "t20006.cc" }, "to": { - "activity_id": "1235428163990670191", - "participant_id": "1903567228894636312" + "activity_id": "9883425311925361535", + "participant_id": "15228537831157090497" }, "type": "message" }, { "from": { - "activity_id": "363965584448680958", - "participant_id": "363965584448680958" + "activity_id": "2911724675589447667", + "participant_id": "2911724675589447667" }, "name": "bb1(int,float)", "return_type": "void", @@ -743,15 +743,15 @@ void tmain() "translation_unit": "t20006.cc" }, "to": { - "activity_id": "1463188845572485713", - "participant_id": "1743503037360505162" + "activity_id": "11705510764579885710", + "participant_id": "13948024298884041299" }, "type": "message" }, { "from": { - "activity_id": "1463188845572485713", - "participant_id": "1743503037360505162" + "activity_id": "11705510764579885710", + "participant_id": "13948024298884041299" }, "name": "bb2(int,float)", "return_type": "void", @@ -763,15 +763,15 @@ void tmain() "translation_unit": "t20006.cc" }, "to": { - "activity_id": "732362671329401903", - "participant_id": "1743503037360505162" + "activity_id": "5858901370635215228", + "participant_id": "13948024298884041299" }, "type": "message" }, { "from": { - "activity_id": "732362671329401903", - "participant_id": "1743503037360505162" + "activity_id": "5858901370635215228", + "participant_id": "13948024298884041299" }, "name": "aa2(int)", "return_type": "void", @@ -783,14 +783,14 @@ void tmain() "translation_unit": "t20006.cc" }, "to": { - "activity_id": "582097827335267290", - "participant_id": "1903567228894636312" + "activity_id": "4656782618682138323", + "participant_id": "15228537831157090497" }, "type": "message" } ], "start_from": { - "id": 363965584448680958, + "id": "2911724675589447667", "location": "clanguml::t20006::tmain()" } } diff --git a/docs/test_cases/t20006_sequence.svg b/docs/test_cases/t20006_sequence.svg index c1b18404..3800ce93 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 31bd73c9..504fbe1d 100644 --- a/docs/test_cases/t20007.md +++ b/docs/test_cases/t20007.md @@ -55,7 +55,7 @@ void tmain() { "display_name": "tmain()", "full_name": "clanguml::t20007::tmain()", - "id": "622662006747239840", + "id": "4981296053977918722", "name": "tmain", "namespace": "clanguml::t20007", "source_location": { @@ -71,7 +71,7 @@ void tmain() { "display_name": "add(int &&,int &&)", "full_name": "clanguml::t20007::Adder::add(int &&,int &&)", - "id": "438133719207269065", + "id": "3505069753658152525", "name": "add", "namespace": "", "source_location": { @@ -85,7 +85,7 @@ void tmain() ], "display_name": "Adder", "full_name": "clanguml::t20007::Adder", - "id": "1742497005509009302", + "id": "13939976044072074422", "name": "Adder", "namespace": "clanguml::t20007", "source_location": { @@ -101,7 +101,7 @@ void tmain() { "display_name": "add(int &&,float &&,double &&)", "full_name": "clanguml::t20007::Adder::add(int &&,float &&,double &&)", - "id": "9522724767688870", + "id": "76181798141510966", "name": "add", "namespace": "", "source_location": { @@ -115,7 +115,7 @@ void tmain() ], "display_name": "Adder", "full_name": "clanguml::t20007::Adder", - "id": "599640474306956868", + "id": "4797123794455654949", "name": "Adder", "namespace": "clanguml::t20007", "source_location": { @@ -131,7 +131,7 @@ void tmain() { "display_name": "add(std::string &&,std::string &&,std::string &&)", "full_name": "clanguml::t20007::Adder::add(std::string &&,std::string &&,std::string &&)", - "id": "384866641042941480", + "id": "3078933128343531840", "name": "add", "namespace": "", "source_location": { @@ -145,7 +145,7 @@ void tmain() ], "display_name": "Adder", "full_name": "clanguml::t20007::Adder", - "id": "228191787514523926", + "id": "1825534300116191409", "name": "Adder", "namespace": "clanguml::t20007", "source_location": { @@ -162,8 +162,8 @@ void tmain() "messages": [ { "from": { - "activity_id": "622662006747239840", - "participant_id": "622662006747239840" + "activity_id": "4981296053977918722", + "participant_id": "4981296053977918722" }, "name": "add(int &&,int &&)", "return_type": "int", @@ -175,15 +175,15 @@ void tmain() "translation_unit": "t20007.cc" }, "to": { - "activity_id": "438133719207269065", - "participant_id": "1742497005509009302" + "activity_id": "3505069753658152525", + "participant_id": "13939976044072074422" }, "type": "message" }, { "from": { - "activity_id": "622662006747239840", - "participant_id": "622662006747239840" + "activity_id": "4981296053977918722", + "participant_id": "4981296053977918722" }, "name": "add(int &&,float &&,double &&)", "return_type": "int", @@ -195,15 +195,15 @@ void tmain() "translation_unit": "t20007.cc" }, "to": { - "activity_id": "9522724767688870", - "participant_id": "599640474306956868" + "activity_id": "76181798141510966", + "participant_id": "4797123794455654949" }, "type": "message" }, { "from": { - "activity_id": "622662006747239840", - "participant_id": "622662006747239840" + "activity_id": "4981296053977918722", + "participant_id": "4981296053977918722" }, "name": "add(std::string &&,std::string &&,std::string &&)", "return_type": "std::string", @@ -215,14 +215,14 @@ void tmain() "translation_unit": "t20007.cc" }, "to": { - "activity_id": "384866641042941480", - "participant_id": "228191787514523926" + "activity_id": "3078933128343531840", + "participant_id": "1825534300116191409" }, "type": "message" } ], "start_from": { - "id": 622662006747239840, + "id": "4981296053977918722", "location": "clanguml::t20007::tmain()" } } diff --git a/docs/test_cases/t20007_sequence.svg b/docs/test_cases/t20007_sequence.svg index 3166f78d..4c2c95b9 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 76969d1d..df4394c2 100644 --- a/docs/test_cases/t20008.md +++ b/docs/test_cases/t20008.md @@ -73,7 +73,7 @@ void tmain() { "display_name": "tmain()", "full_name": "clanguml::t20008::tmain()", - "id": "1180776240543224244", + "id": "9446209924345793952", "name": "tmain", "namespace": "clanguml::t20008", "source_location": { @@ -89,7 +89,7 @@ void tmain() { "display_name": "b(int)", "full_name": "clanguml::t20008::B::b(int)", - "id": "379850145437051189", + "id": "3038801163496409516", "name": "b", "namespace": "", "source_location": { @@ -103,7 +103,7 @@ void tmain() ], "display_name": "B", "full_name": "clanguml::t20008::B", - "id": "1906510289157013670", + "id": "15252082313256109366", "name": "B", "namespace": "clanguml::t20008", "source_location": { @@ -119,7 +119,7 @@ void tmain() { "display_name": "a1(int)", "full_name": "clanguml::t20008::A::a1(int)", - "id": "2066363630174644719", + "id": "16530909041397157752", "name": "a1", "namespace": "", "source_location": { @@ -133,7 +133,7 @@ void tmain() ], "display_name": "A", "full_name": "clanguml::t20008::A", - "id": "1376149084762923197", + "id": "11009192678103385580", "name": "A", "namespace": "clanguml::t20008", "source_location": { @@ -149,7 +149,7 @@ void tmain() { "display_name": "b(const char *)", "full_name": "clanguml::t20008::B::b(const char *)", - "id": "1347162523481637780", + "id": "10777300187853102245", "name": "b", "namespace": "", "source_location": { @@ -163,7 +163,7 @@ void tmain() ], "display_name": "B", "full_name": "clanguml::t20008::B", - "id": "867098551202196741", + "id": "6936788409617573928", "name": "B", "namespace": "clanguml::t20008", "source_location": { @@ -179,7 +179,7 @@ void tmain() { "display_name": "a2(const char *)", "full_name": "clanguml::t20008::A::a2(const char *)", - "id": "718650834962275580", + "id": "5749206679698204640", "name": "a2", "namespace": "", "source_location": { @@ -193,7 +193,7 @@ void tmain() ], "display_name": "A", "full_name": "clanguml::t20008::A", - "id": "144833378017373200", + "id": "1158667024138985603", "name": "A", "namespace": "clanguml::t20008", "source_location": { @@ -209,7 +209,7 @@ void tmain() { "display_name": "b(std::string)", "full_name": "clanguml::t20008::B::b(std::string)", - "id": "1286410946666951254", + "id": "10291287573335610033", "name": "b", "namespace": "", "source_location": { @@ -223,7 +223,7 @@ void tmain() ], "display_name": "B", "full_name": "clanguml::t20008::B", - "id": "927702553742507923", + "id": "7421620429940063385", "name": "B", "namespace": "clanguml::t20008", "source_location": { @@ -239,7 +239,7 @@ void tmain() { "display_name": "a3(std::string)", "full_name": "clanguml::t20008::A::a3(std::string)", - "id": "1404594247101138737", + "id": "11236753976809109901", "name": "a3", "namespace": "", "source_location": { @@ -253,7 +253,7 @@ void tmain() ], "display_name": "A", "full_name": "clanguml::t20008::A", - "id": "390605614583363778", + "id": "3124844916666910226", "name": "A", "namespace": "clanguml::t20008", "source_location": { @@ -270,8 +270,8 @@ void tmain() "messages": [ { "from": { - "activity_id": "1180776240543224244", - "participant_id": "1180776240543224244" + "activity_id": "9446209924345793952", + "participant_id": "9446209924345793952" }, "name": "b(int)", "return_type": "void", @@ -283,15 +283,15 @@ void tmain() "translation_unit": "t20008.cc" }, "to": { - "activity_id": "379850145437051189", - "participant_id": "1906510289157013670" + "activity_id": "3038801163496409516", + "participant_id": "15252082313256109366" }, "type": "message" }, { "from": { - "activity_id": "379850145437051189", - "participant_id": "1906510289157013670" + "activity_id": "3038801163496409516", + "participant_id": "15252082313256109366" }, "name": "a1(int)", "return_type": "void", @@ -303,15 +303,15 @@ void tmain() "translation_unit": "t20008.cc" }, "to": { - "activity_id": "2066363630174644719", - "participant_id": "1376149084762923197" + "activity_id": "16530909041397157752", + "participant_id": "11009192678103385580" }, "type": "message" }, { "from": { - "activity_id": "1180776240543224244", - "participant_id": "1180776240543224244" + "activity_id": "9446209924345793952", + "participant_id": "9446209924345793952" }, "name": "b(const char *)", "return_type": "void", @@ -323,15 +323,15 @@ void tmain() "translation_unit": "t20008.cc" }, "to": { - "activity_id": "1347162523481637780", - "participant_id": "867098551202196741" + "activity_id": "10777300187853102245", + "participant_id": "6936788409617573928" }, "type": "message" }, { "from": { - "activity_id": "1347162523481637780", - "participant_id": "867098551202196741" + "activity_id": "10777300187853102245", + "participant_id": "6936788409617573928" }, "name": "a2(const char *)", "return_type": "void", @@ -343,15 +343,15 @@ void tmain() "translation_unit": "t20008.cc" }, "to": { - "activity_id": "718650834962275580", - "participant_id": "144833378017373200" + "activity_id": "5749206679698204640", + "participant_id": "1158667024138985603" }, "type": "message" }, { "from": { - "activity_id": "1180776240543224244", - "participant_id": "1180776240543224244" + "activity_id": "9446209924345793952", + "participant_id": "9446209924345793952" }, "name": "b(std::string)", "return_type": "void", @@ -363,15 +363,15 @@ void tmain() "translation_unit": "t20008.cc" }, "to": { - "activity_id": "1286410946666951254", - "participant_id": "927702553742507923" + "activity_id": "10291287573335610033", + "participant_id": "7421620429940063385" }, "type": "message" }, { "from": { - "activity_id": "1286410946666951254", - "participant_id": "927702553742507923" + "activity_id": "10291287573335610033", + "participant_id": "7421620429940063385" }, "name": "a3(std::string)", "return_type": "void", @@ -383,14 +383,14 @@ void tmain() "translation_unit": "t20008.cc" }, "to": { - "activity_id": "1404594247101138737", - "participant_id": "390605614583363778" + "activity_id": "11236753976809109901", + "participant_id": "3124844916666910226" }, "type": "message" } ], "start_from": { - "id": 1180776240543224244, + "id": "9446209924345793952", "location": "clanguml::t20008::tmain()" } } diff --git a/docs/test_cases/t20008_sequence.svg b/docs/test_cases/t20008_sequence.svg index 23f8450c..1e6e9765 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 664a6e17..4343a636 100644 --- a/docs/test_cases/t20009.md +++ b/docs/test_cases/t20009.md @@ -59,7 +59,7 @@ void tmain() { "display_name": "tmain()", "full_name": "clanguml::t20009::tmain()", - "id": "791066686606379857", + "id": "6328533492851038858", "name": "tmain", "namespace": "clanguml::t20009", "source_location": { @@ -75,7 +75,7 @@ void tmain() { "display_name": "b(std::string)", "full_name": "clanguml::t20009::B::b(std::string)", - "id": "1960266381909090879", + "id": "15682131055272727033", "name": "b", "namespace": "", "source_location": { @@ -89,7 +89,7 @@ void tmain() ], "display_name": "B", "full_name": "clanguml::t20009::B", - "id": "450813573860627679", + "id": "3606508590885021433", "name": "B", "namespace": "clanguml::t20009", "source_location": { @@ -105,7 +105,7 @@ void tmain() { "display_name": "a(std::string)", "full_name": "clanguml::t20009::A::a(std::string)", - "id": "1716775846967761286", + "id": "13734206775742090288", "name": "a", "namespace": "", "source_location": { @@ -119,7 +119,7 @@ void tmain() ], "display_name": "A", "full_name": "clanguml::t20009::A", - "id": "1197403810800583218", + "id": "9579230486404665750", "name": "A", "namespace": "clanguml::t20009", "source_location": { @@ -135,7 +135,7 @@ void tmain() { "display_name": "b(int)", "full_name": "clanguml::t20009::B::b(int)", - "id": "660557928399203634", + "id": "5284463427193629079", "name": "b", "namespace": "", "source_location": { @@ -149,7 +149,7 @@ void tmain() ], "display_name": "B", "full_name": "clanguml::t20009::B", - "id": "2002310682025149090", + "id": "16018485456201192723", "name": "B", "namespace": "clanguml::t20009", "source_location": { @@ -165,7 +165,7 @@ void tmain() { "display_name": "a(int)", "full_name": "clanguml::t20009::A::a(int)", - "id": "2030629454810805092", + "id": "16245035638486440742", "name": "a", "namespace": "", "source_location": { @@ -179,7 +179,7 @@ void tmain() ], "display_name": "A", "full_name": "clanguml::t20009::A", - "id": "1228498754558363121", + "id": "9827990036466904972", "name": "A", "namespace": "clanguml::t20009", "source_location": { @@ -195,7 +195,7 @@ void tmain() { "display_name": "b(float)", "full_name": "clanguml::t20009::B::b(float)", - "id": "367805163135583282", + "id": "2942441305084666258", "name": "b", "namespace": "", "source_location": { @@ -209,7 +209,7 @@ void tmain() ], "display_name": "B", "full_name": "clanguml::t20009::B", - "id": "1461902328659683203", + "id": "11695218629277465628", "name": "B", "namespace": "clanguml::t20009", "source_location": { @@ -225,7 +225,7 @@ void tmain() { "display_name": "a(float)", "full_name": "clanguml::t20009::A::a(float)", - "id": "1643733911490581293", + "id": "13149871291924650350", "name": "a", "namespace": "", "source_location": { @@ -239,7 +239,7 @@ void tmain() ], "display_name": "A", "full_name": "clanguml::t20009::A", - "id": "1243520246309441967", + "id": "9948161970475535740", "name": "A", "namespace": "clanguml::t20009", "source_location": { @@ -256,8 +256,8 @@ void tmain() "messages": [ { "from": { - "activity_id": "791066686606379857", - "participant_id": "791066686606379857" + "activity_id": "6328533492851038858", + "participant_id": "6328533492851038858" }, "name": "b(std::string)", "return_type": "void", @@ -269,15 +269,15 @@ void tmain() "translation_unit": "t20009.cc" }, "to": { - "activity_id": "1960266381909090879", - "participant_id": "450813573860627679" + "activity_id": "15682131055272727033", + "participant_id": "3606508590885021433" }, "type": "message" }, { "from": { - "activity_id": "1960266381909090879", - "participant_id": "450813573860627679" + "activity_id": "15682131055272727033", + "participant_id": "3606508590885021433" }, "name": "a(std::string)", "return_type": "void", @@ -289,15 +289,15 @@ void tmain() "translation_unit": "t20009.cc" }, "to": { - "activity_id": "1716775846967761286", - "participant_id": "1197403810800583218" + "activity_id": "13734206775742090288", + "participant_id": "9579230486404665750" }, "type": "message" }, { "from": { - "activity_id": "791066686606379857", - "participant_id": "791066686606379857" + "activity_id": "6328533492851038858", + "participant_id": "6328533492851038858" }, "name": "b(int)", "return_type": "void", @@ -309,15 +309,15 @@ void tmain() "translation_unit": "t20009.cc" }, "to": { - "activity_id": "660557928399203634", - "participant_id": "2002310682025149090" + "activity_id": "5284463427193629079", + "participant_id": "16018485456201192723" }, "type": "message" }, { "from": { - "activity_id": "660557928399203634", - "participant_id": "2002310682025149090" + "activity_id": "5284463427193629079", + "participant_id": "16018485456201192723" }, "name": "a(int)", "return_type": "void", @@ -329,15 +329,15 @@ void tmain() "translation_unit": "t20009.cc" }, "to": { - "activity_id": "2030629454810805092", - "participant_id": "1228498754558363121" + "activity_id": "16245035638486440742", + "participant_id": "9827990036466904972" }, "type": "message" }, { "from": { - "activity_id": "791066686606379857", - "participant_id": "791066686606379857" + "activity_id": "6328533492851038858", + "participant_id": "6328533492851038858" }, "name": "b(float)", "return_type": "void", @@ -349,15 +349,15 @@ void tmain() "translation_unit": "t20009.cc" }, "to": { - "activity_id": "367805163135583282", - "participant_id": "1461902328659683203" + "activity_id": "2942441305084666258", + "participant_id": "11695218629277465628" }, "type": "message" }, { "from": { - "activity_id": "367805163135583282", - "participant_id": "1461902328659683203" + "activity_id": "2942441305084666258", + "participant_id": "11695218629277465628" }, "name": "a(float)", "return_type": "void", @@ -369,14 +369,14 @@ void tmain() "translation_unit": "t20009.cc" }, "to": { - "activity_id": "1643733911490581293", - "participant_id": "1243520246309441967" + "activity_id": "13149871291924650350", + "participant_id": "9948161970475535740" }, "type": "message" } ], "start_from": { - "id": 791066686606379857, + "id": "6328533492851038858", "location": "clanguml::t20009::tmain()" } } diff --git a/docs/test_cases/t20009_sequence.svg b/docs/test_cases/t20009_sequence.svg index b811e011..40af9e0b 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 600e5f34..a75435e9 100644 --- a/docs/test_cases/t20010.md +++ b/docs/test_cases/t20010.md @@ -69,7 +69,7 @@ void tmain() { "display_name": "tmain()", "full_name": "clanguml::t20010::tmain()", - "id": "1364660609791735244", + "id": "10917284878333881955", "name": "tmain", "namespace": "clanguml::t20010", "source_location": { @@ -85,7 +85,7 @@ void tmain() { "display_name": "b1()", "full_name": "clanguml::t20010::B::b1()", - "id": "343626060927491836", + "id": "2749008487419934688", "name": "b1", "namespace": "", "source_location": { @@ -99,7 +99,7 @@ void tmain() { "display_name": "b2()", "full_name": "clanguml::t20010::B::b2()", - "id": "1633031113603062043", + "id": "13064248908824496351", "name": "b2", "namespace": "", "source_location": { @@ -113,7 +113,7 @@ void tmain() { "display_name": "b3()", "full_name": "clanguml::t20010::B::b3()", - "id": "786218543654309692", + "id": "6289748349234477538", "name": "b3", "namespace": "", "source_location": { @@ -127,7 +127,7 @@ void tmain() { "display_name": "b4()", "full_name": "clanguml::t20010::B::b4()", - "id": "1866068965397702666", + "id": "14928551723181621328", "name": "b4", "namespace": "", "source_location": { @@ -141,7 +141,7 @@ void tmain() ], "display_name": "B", "full_name": "clanguml::t20010::B", - "id": "2154977200904210115", + "id": "17239817607233680921", "name": "B", "namespace": "clanguml::t20010", "source_location": { @@ -157,7 +157,7 @@ void tmain() { "display_name": "a1()", "full_name": "clanguml::t20010::A::a1()", - "id": "981184681827469850", + "id": "7849477454619758807", "name": "a1", "namespace": "", "source_location": { @@ -171,7 +171,7 @@ void tmain() { "display_name": "a2()", "full_name": "clanguml::t20010::A::a2()", - "id": "664370880632146592", + "id": "5314967045057172736", "name": "a2", "namespace": "", "source_location": { @@ -185,7 +185,7 @@ void tmain() { "display_name": "a3()", "full_name": "clanguml::t20010::A::a3()", - "id": "2145739294823015899", + "id": "17165914358584127192", "name": "a3", "namespace": "", "source_location": { @@ -199,7 +199,7 @@ void tmain() { "display_name": "a4()", "full_name": "clanguml::t20010::A::a4()", - "id": "1224936485834400821", + "id": "9799491886675206575", "name": "a4", "namespace": "", "source_location": { @@ -213,7 +213,7 @@ void tmain() ], "display_name": "A", "full_name": "clanguml::t20010::A", - "id": "102070351492425113", + "id": "816562811939400905", "name": "A", "namespace": "clanguml::t20010", "source_location": { @@ -230,8 +230,8 @@ void tmain() "messages": [ { "from": { - "activity_id": "1364660609791735244", - "participant_id": "1364660609791735244" + "activity_id": "10917284878333881955", + "participant_id": "10917284878333881955" }, "name": "b1()", "return_type": "void", @@ -243,15 +243,15 @@ void tmain() "translation_unit": "t20010.cc" }, "to": { - "activity_id": "343626060927491836", - "participant_id": "2154977200904210115" + "activity_id": "2749008487419934688", + "participant_id": "17239817607233680921" }, "type": "message" }, { "from": { - "activity_id": "343626060927491836", - "participant_id": "2154977200904210115" + "activity_id": "2749008487419934688", + "participant_id": "17239817607233680921" }, "name": "a1()", "return_type": "void", @@ -263,15 +263,15 @@ void tmain() "translation_unit": "t20010.cc" }, "to": { - "activity_id": "981184681827469850", - "participant_id": "102070351492425113" + "activity_id": "7849477454619758807", + "participant_id": "816562811939400905" }, "type": "message" }, { "from": { - "activity_id": "1364660609791735244", - "participant_id": "1364660609791735244" + "activity_id": "10917284878333881955", + "participant_id": "10917284878333881955" }, "name": "b2()", "return_type": "void", @@ -283,15 +283,15 @@ void tmain() "translation_unit": "t20010.cc" }, "to": { - "activity_id": "1633031113603062043", - "participant_id": "2154977200904210115" + "activity_id": "13064248908824496351", + "participant_id": "17239817607233680921" }, "type": "message" }, { "from": { - "activity_id": "1633031113603062043", - "participant_id": "2154977200904210115" + "activity_id": "13064248908824496351", + "participant_id": "17239817607233680921" }, "name": "a2()", "return_type": "void", @@ -303,15 +303,15 @@ void tmain() "translation_unit": "t20010.cc" }, "to": { - "activity_id": "664370880632146592", - "participant_id": "102070351492425113" + "activity_id": "5314967045057172736", + "participant_id": "816562811939400905" }, "type": "message" }, { "from": { - "activity_id": "1364660609791735244", - "participant_id": "1364660609791735244" + "activity_id": "10917284878333881955", + "participant_id": "10917284878333881955" }, "name": "b3()", "return_type": "void", @@ -323,15 +323,15 @@ void tmain() "translation_unit": "t20010.cc" }, "to": { - "activity_id": "786218543654309692", - "participant_id": "2154977200904210115" + "activity_id": "6289748349234477538", + "participant_id": "17239817607233680921" }, "type": "message" }, { "from": { - "activity_id": "786218543654309692", - "participant_id": "2154977200904210115" + "activity_id": "6289748349234477538", + "participant_id": "17239817607233680921" }, "name": "a3()", "return_type": "void", @@ -343,15 +343,15 @@ void tmain() "translation_unit": "t20010.cc" }, "to": { - "activity_id": "2145739294823015899", - "participant_id": "102070351492425113" + "activity_id": "17165914358584127192", + "participant_id": "816562811939400905" }, "type": "message" }, { "from": { - "activity_id": "1364660609791735244", - "participant_id": "1364660609791735244" + "activity_id": "10917284878333881955", + "participant_id": "10917284878333881955" }, "name": "b4()", "return_type": "void", @@ -363,15 +363,15 @@ void tmain() "translation_unit": "t20010.cc" }, "to": { - "activity_id": "1866068965397702666", - "participant_id": "2154977200904210115" + "activity_id": "14928551723181621328", + "participant_id": "17239817607233680921" }, "type": "message" }, { "from": { - "activity_id": "1866068965397702666", - "participant_id": "2154977200904210115" + "activity_id": "14928551723181621328", + "participant_id": "17239817607233680921" }, "name": "a4()", "return_type": "void", @@ -383,14 +383,14 @@ void tmain() "translation_unit": "t20010.cc" }, "to": { - "activity_id": "1224936485834400821", - "participant_id": "102070351492425113" + "activity_id": "9799491886675206575", + "participant_id": "816562811939400905" }, "type": "message" } ], "start_from": { - "id": 1364660609791735244, + "id": "10917284878333881955", "location": "clanguml::t20010::tmain()" } } diff --git a/docs/test_cases/t20010_sequence.svg b/docs/test_cases/t20010_sequence.svg index d60eaf30..c4443020 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 e0c1db8a..2b51a4fd 100644 --- a/docs/test_cases/t20011.md +++ b/docs/test_cases/t20011.md @@ -61,7 +61,7 @@ void tmain() { "display_name": "tmain()", "full_name": "clanguml::t20011::tmain()", - "id": "1866210527166391126", + "id": "14929684217331129010", "name": "tmain", "namespace": "clanguml::t20011", "source_location": { @@ -77,7 +77,7 @@ void tmain() { "display_name": "a(int)", "full_name": "clanguml::t20011::A::a(int)", - "id": "1647578261840204206", + "id": "13180626094721633652", "name": "a", "namespace": "", "source_location": { @@ -91,7 +91,7 @@ void tmain() { "display_name": "b(int)", "full_name": "clanguml::t20011::A::b(int)", - "id": "305456175818875420", + "id": "2443649406551003360", "name": "b", "namespace": "", "source_location": { @@ -105,7 +105,7 @@ void tmain() { "display_name": "c(int)", "full_name": "clanguml::t20011::A::c(int)", - "id": "963268672079901211", + "id": "7706149376639209694", "name": "c", "namespace": "", "source_location": { @@ -119,7 +119,7 @@ void tmain() { "display_name": "d(int)", "full_name": "clanguml::t20011::A::d(int)", - "id": "1874311762268001137", + "id": "14994494098144009100", "name": "d", "namespace": "", "source_location": { @@ -133,7 +133,7 @@ void tmain() ], "display_name": "A", "full_name": "clanguml::t20011::A", - "id": "816061502062128285", + "id": "6528492016497026282", "name": "A", "namespace": "clanguml::t20011", "source_location": { @@ -150,8 +150,8 @@ void tmain() "messages": [ { "from": { - "activity_id": "1866210527166391126", - "participant_id": "1866210527166391126" + "activity_id": "14929684217331129010", + "participant_id": "14929684217331129010" }, "name": "a(int)", "return_type": "void", @@ -163,20 +163,20 @@ void tmain() "translation_unit": "t20011.cc" }, "to": { - "activity_id": "1647578261840204206", - "participant_id": "816061502062128285" + "activity_id": "13180626094721633652", + "participant_id": "6528492016497026282" }, "type": "message" }, { - "activity_id": "1647578261840204206", + "activity_id": "13180626094721633652", "branches": [ { "messages": [ { "from": { - "activity_id": "1647578261840204206", - "participant_id": "816061502062128285" + "activity_id": "13180626094721633652", + "participant_id": "6528492016497026282" }, "name": "a(int)", "return_type": "void", @@ -188,8 +188,8 @@ void tmain() "translation_unit": "t20011.cc" }, "to": { - "activity_id": "1647578261840204206", - "participant_id": "816061502062128285" + "activity_id": "13180626094721633652", + "participant_id": "6528492016497026282" }, "type": "message" } @@ -202,8 +202,8 @@ void tmain() }, { "from": { - "activity_id": "1866210527166391126", - "participant_id": "1866210527166391126" + "activity_id": "14929684217331129010", + "participant_id": "14929684217331129010" }, "name": "b(int)", "return_type": "void", @@ -215,15 +215,15 @@ void tmain() "translation_unit": "t20011.cc" }, "to": { - "activity_id": "305456175818875420", - "participant_id": "816061502062128285" + "activity_id": "2443649406551003360", + "participant_id": "6528492016497026282" }, "type": "message" }, { "from": { - "activity_id": "305456175818875420", - "participant_id": "816061502062128285" + "activity_id": "2443649406551003360", + "participant_id": "6528492016497026282" }, "name": "c(int)", "return_type": "void", @@ -235,15 +235,15 @@ void tmain() "translation_unit": "t20011.cc" }, "to": { - "activity_id": "963268672079901211", - "participant_id": "816061502062128285" + "activity_id": "7706149376639209694", + "participant_id": "6528492016497026282" }, "type": "message" }, { "from": { - "activity_id": "963268672079901211", - "participant_id": "816061502062128285" + "activity_id": "7706149376639209694", + "participant_id": "6528492016497026282" }, "name": "d(int)", "return_type": "void", @@ -255,20 +255,20 @@ void tmain() "translation_unit": "t20011.cc" }, "to": { - "activity_id": "1874311762268001137", - "participant_id": "816061502062128285" + "activity_id": "14994494098144009100", + "participant_id": "6528492016497026282" }, "type": "message" }, { - "activity_id": "1874311762268001137", + "activity_id": "14994494098144009100", "branches": [ { "messages": [ { "from": { - "activity_id": "1874311762268001137", - "participant_id": "816061502062128285" + "activity_id": "14994494098144009100", + "participant_id": "6528492016497026282" }, "name": "b(int)", "return_type": "void", @@ -280,15 +280,15 @@ void tmain() "translation_unit": "t20011.cc" }, "to": { - "activity_id": "305456175818875420", - "participant_id": "816061502062128285" + "activity_id": "2443649406551003360", + "participant_id": "6528492016497026282" }, "type": "message" }, { "from": { - "activity_id": "1874311762268001137", - "participant_id": "816061502062128285" + "activity_id": "14994494098144009100", + "participant_id": "6528492016497026282" }, "name": "a(int)", "return_type": "void", @@ -300,20 +300,20 @@ void tmain() "translation_unit": "t20011.cc" }, "to": { - "activity_id": "1647578261840204206", - "participant_id": "816061502062128285" + "activity_id": "13180626094721633652", + "participant_id": "6528492016497026282" }, "type": "message" }, { - "activity_id": "1647578261840204206", + "activity_id": "13180626094721633652", "branches": [ { "messages": [ { "from": { - "activity_id": "1647578261840204206", - "participant_id": "816061502062128285" + "activity_id": "13180626094721633652", + "participant_id": "6528492016497026282" }, "name": "a(int)", "return_type": "void", @@ -325,8 +325,8 @@ void tmain() "translation_unit": "t20011.cc" }, "to": { - "activity_id": "1647578261840204206", - "participant_id": "816061502062128285" + "activity_id": "13180626094721633652", + "participant_id": "6528492016497026282" }, "type": "message" } @@ -346,7 +346,7 @@ void tmain() } ], "start_from": { - "id": 1866210527166391126, + "id": "14929684217331129010", "location": "clanguml::t20011::tmain()" } } diff --git a/docs/test_cases/t20011_sequence.svg b/docs/test_cases/t20011_sequence.svg index dc245271..dbae1acd 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 6eb66e0d..66af06a1 100644 --- a/docs/test_cases/t20012.md +++ b/docs/test_cases/t20012.md @@ -136,7 +136,7 @@ void tmain() { "display_name": "tmain()", "full_name": "clanguml::t20012::tmain()", - "id": "893699278278125827", + "id": "7149594226225006621", "name": "tmain", "namespace": "clanguml::t20012", "source_location": { @@ -152,7 +152,7 @@ void tmain() { "display_name": "operator()() const", "full_name": "clanguml::t20012::tmain()::(lambda t20012.cc:67:20)::operator()() const", - "id": "844942554717397525", + "id": "6759540437739180205", "name": "operator()", "namespace": "", "type": "method" @@ -160,7 +160,7 @@ void tmain() ], "display_name": "tmain()::(lambda t20012.cc:67:20)", "full_name": "clanguml::t20012::tmain()::(lambda t20012.cc:67:20)", - "id": "1823127147500894672", + "id": "14585017180007157378", "name": "tmain()::(lambda t20012.cc:67:20)", "namespace": "clanguml::t20012", "source_location": { @@ -176,7 +176,7 @@ void tmain() { "display_name": "a()", "full_name": "clanguml::t20012::A::a()", - "id": "1871432932744498976", + "id": "14971463461955991809", "name": "a", "namespace": "", "source_location": { @@ -190,7 +190,7 @@ void tmain() { "display_name": "aa()", "full_name": "clanguml::t20012::A::aa()", - "id": "1100933039353876539", + "id": "8807464314831012313", "name": "aa", "namespace": "", "source_location": { @@ -204,7 +204,7 @@ void tmain() { "display_name": "aaa()", "full_name": "clanguml::t20012::A::aaa()", - "id": "941636185823691898", + "id": "7533089486589535184", "name": "aaa", "namespace": "", "source_location": { @@ -218,7 +218,7 @@ void tmain() ], "display_name": "A", "full_name": "clanguml::t20012::A", - "id": "1798184226128732119", + "id": "14385473809029856958", "name": "A", "namespace": "clanguml::t20012", "source_location": { @@ -234,7 +234,7 @@ void tmain() { "display_name": "b()", "full_name": "clanguml::t20012::B::b()", - "id": "2142697410385270633", + "id": "17141579283082165068", "name": "b", "namespace": "", "source_location": { @@ -248,7 +248,7 @@ void tmain() { "display_name": "bb()", "full_name": "clanguml::t20012::B::bb()", - "id": "973718340784931313", + "id": "7789746726279450510", "name": "bb", "namespace": "", "source_location": { @@ -262,7 +262,7 @@ void tmain() { "display_name": "bbb()", "full_name": "clanguml::t20012::B::bbb()", - "id": "195788529004378403", + "id": "1566308232035027228", "name": "bbb", "namespace": "", "source_location": { @@ -276,7 +276,7 @@ void tmain() ], "display_name": "B", "full_name": "clanguml::t20012::B", - "id": "1893469899260202653", + "id": "15147759194081621226", "name": "B", "namespace": "clanguml::t20012", "source_location": { @@ -292,7 +292,7 @@ void tmain() { "display_name": "operator()() const", "full_name": "clanguml::t20012::tmain()::(lambda t20012.cc:80:20)::operator()() const", - "id": "2080867854705352490", + "id": "16646942837642819925", "name": "operator()", "namespace": "", "type": "method" @@ -300,7 +300,7 @@ void tmain() ], "display_name": "tmain()::(lambda t20012.cc:80:20)", "full_name": "clanguml::t20012::tmain()::(lambda t20012.cc:80:20)", - "id": "2103332104162021186", + "id": "16826656833296169492", "name": "tmain()::(lambda t20012.cc:80:20)", "namespace": "clanguml::t20012", "source_location": { @@ -316,7 +316,7 @@ void tmain() { "display_name": "c()", "full_name": "clanguml::t20012::C::c()", - "id": "675369415318225607", + "id": "5402955322545804857", "name": "c", "namespace": "", "source_location": { @@ -330,7 +330,7 @@ void tmain() { "display_name": "cc()", "full_name": "clanguml::t20012::C::cc()", - "id": "1451821704315336057", + "id": "11614573634522688457", "name": "cc", "namespace": "", "source_location": { @@ -344,7 +344,7 @@ void tmain() { "display_name": "ccc()", "full_name": "clanguml::t20012::C::ccc()", - "id": "1956141408799600460", + "id": "15649131270396803681", "name": "ccc", "namespace": "", "source_location": { @@ -358,7 +358,7 @@ void tmain() ], "display_name": "C", "full_name": "clanguml::t20012::C", - "id": "2071958121786360262", + "id": "16575664974290882098", "name": "C", "namespace": "clanguml::t20012", "source_location": { @@ -374,7 +374,7 @@ void tmain() { "display_name": "R((lambda at t20012.cc:86:9) &&)", "full_name": "clanguml::t20012::R<(lambda at t20012.cc:86:9)>::R((lambda at t20012.cc:86:9) &&)", - "id": "1976182450987832927", + "id": "15809459607902663419", "name": "R", "namespace": "", "source_location": { @@ -388,7 +388,7 @@ void tmain() { "display_name": "r()", "full_name": "clanguml::t20012::R<(lambda at t20012.cc:86:9)>::r()", - "id": "1627963942447215983", + "id": "13023711539577727870", "name": "r", "namespace": "", "source_location": { @@ -402,7 +402,7 @@ void tmain() ], "display_name": "R<(lambda at t20012.cc:86:9)>", "full_name": "clanguml::t20012::R<(lambda at t20012.cc:86:9)>", - "id": "1418878159628415236", + "id": "11351025277027321892", "name": "R", "namespace": "clanguml::t20012", "source_location": { @@ -418,7 +418,7 @@ void tmain() { "display_name": "operator()() const", "full_name": "clanguml::t20012::tmain()::(lambda t20012.cc:86:9)::operator()() const", - "id": "997617437879117371", + "id": "7980939503032938975", "name": "operator()", "namespace": "", "type": "method" @@ -426,7 +426,7 @@ void tmain() ], "display_name": "tmain()::(lambda t20012.cc:86:9)", "full_name": "clanguml::t20012::tmain()::(lambda t20012.cc:86:9)", - "id": "1523229682883773614", + "id": "12185837463070188914", "name": "tmain()::(lambda t20012.cc:86:9)", "namespace": "clanguml::t20012", "source_location": { @@ -442,7 +442,7 @@ void tmain() { "display_name": "operator()(auto) const", "full_name": "clanguml::t20012::tmain()::(lambda t20012.cc:94:9)::operator()(auto) const", - "id": "1625806587339243213", + "id": "13006452698713945708", "name": "operator()", "namespace": "", "type": "method" @@ -450,7 +450,7 @@ void tmain() ], "display_name": "tmain()::(lambda t20012.cc:94:9)", "full_name": "clanguml::t20012::tmain()::(lambda t20012.cc:94:9)", - "id": "1585686021763298522", + "id": "12685488174106388182", "name": "tmain()::(lambda t20012.cc:94:9)", "namespace": "clanguml::t20012", "source_location": { @@ -466,7 +466,7 @@ void tmain() { "display_name": "add5(int) const", "full_name": "clanguml::t20012::D::add5(int) const", - "id": "379068559069876883", + "id": "3032548472559015070", "name": "add5", "namespace": "", "source_location": { @@ -480,7 +480,7 @@ void tmain() ], "display_name": "D", "full_name": "clanguml::t20012::D", - "id": "1627226326147373737", + "id": "13017810609178989903", "name": "D", "namespace": "clanguml::t20012", "source_location": { @@ -497,8 +497,8 @@ void tmain() "messages": [ { "from": { - "activity_id": "893699278278125827", - "participant_id": "893699278278125827" + "activity_id": "7149594226225006621", + "participant_id": "7149594226225006621" }, "name": "operator()() const", "return_type": "void", @@ -510,15 +510,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "844942554717397525", - "participant_id": "1823127147500894672" + "activity_id": "6759540437739180205", + "participant_id": "14585017180007157378" }, "type": "message" }, { "from": { - "activity_id": "844942554717397525", - "participant_id": "1823127147500894672" + "activity_id": "6759540437739180205", + "participant_id": "14585017180007157378" }, "name": "a()", "return_type": "void", @@ -530,15 +530,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "1871432932744498976", - "participant_id": "1798184226128732119" + "activity_id": "14971463461955991809", + "participant_id": "14385473809029856958" }, "type": "message" }, { "from": { - "activity_id": "1871432932744498976", - "participant_id": "1798184226128732119" + "activity_id": "14971463461955991809", + "participant_id": "14385473809029856958" }, "name": "aa()", "return_type": "void", @@ -550,15 +550,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "1100933039353876539", - "participant_id": "1798184226128732119" + "activity_id": "8807464314831012313", + "participant_id": "14385473809029856958" }, "type": "message" }, { "from": { - "activity_id": "1100933039353876539", - "participant_id": "1798184226128732119" + "activity_id": "8807464314831012313", + "participant_id": "14385473809029856958" }, "name": "aaa()", "return_type": "void", @@ -570,15 +570,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "941636185823691898", - "participant_id": "1798184226128732119" + "activity_id": "7533089486589535184", + "participant_id": "14385473809029856958" }, "type": "message" }, { "from": { - "activity_id": "844942554717397525", - "participant_id": "1823127147500894672" + "activity_id": "6759540437739180205", + "participant_id": "14585017180007157378" }, "name": "b()", "return_type": "void", @@ -590,15 +590,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "2142697410385270633", - "participant_id": "1893469899260202653" + "activity_id": "17141579283082165068", + "participant_id": "15147759194081621226" }, "type": "message" }, { "from": { - "activity_id": "2142697410385270633", - "participant_id": "1893469899260202653" + "activity_id": "17141579283082165068", + "participant_id": "15147759194081621226" }, "name": "bb()", "return_type": "void", @@ -610,15 +610,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "973718340784931313", - "participant_id": "1893469899260202653" + "activity_id": "7789746726279450510", + "participant_id": "15147759194081621226" }, "type": "message" }, { "from": { - "activity_id": "973718340784931313", - "participant_id": "1893469899260202653" + "activity_id": "7789746726279450510", + "participant_id": "15147759194081621226" }, "name": "bbb()", "return_type": "void", @@ -630,15 +630,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "195788529004378403", - "participant_id": "1893469899260202653" + "activity_id": "1566308232035027228", + "participant_id": "15147759194081621226" }, "type": "message" }, { "from": { - "activity_id": "893699278278125827", - "participant_id": "893699278278125827" + "activity_id": "7149594226225006621", + "participant_id": "7149594226225006621" }, "name": "operator()() const", "return_type": "void", @@ -650,15 +650,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "2080867854705352490", - "participant_id": "2103332104162021186" + "activity_id": "16646942837642819925", + "participant_id": "16826656833296169492" }, "type": "message" }, { "from": { - "activity_id": "2080867854705352490", - "participant_id": "2103332104162021186" + "activity_id": "16646942837642819925", + "participant_id": "16826656833296169492" }, "name": "c()", "return_type": "void", @@ -670,15 +670,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "675369415318225607", - "participant_id": "2071958121786360262" + "activity_id": "5402955322545804857", + "participant_id": "16575664974290882098" }, "type": "message" }, { "from": { - "activity_id": "675369415318225607", - "participant_id": "2071958121786360262" + "activity_id": "5402955322545804857", + "participant_id": "16575664974290882098" }, "name": "cc()", "return_type": "void", @@ -690,15 +690,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "1451821704315336057", - "participant_id": "2071958121786360262" + "activity_id": "11614573634522688457", + "participant_id": "16575664974290882098" }, "type": "message" }, { "from": { - "activity_id": "1451821704315336057", - "participant_id": "2071958121786360262" + "activity_id": "11614573634522688457", + "participant_id": "16575664974290882098" }, "name": "ccc()", "return_type": "void", @@ -710,15 +710,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "1956141408799600460", - "participant_id": "2071958121786360262" + "activity_id": "15649131270396803681", + "participant_id": "16575664974290882098" }, "type": "message" }, { "from": { - "activity_id": "2080867854705352490", - "participant_id": "2103332104162021186" + "activity_id": "16646942837642819925", + "participant_id": "16826656833296169492" }, "name": "operator()() const", "return_type": "void", @@ -730,15 +730,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "844942554717397525", - "participant_id": "1823127147500894672" + "activity_id": "6759540437739180205", + "participant_id": "14585017180007157378" }, "type": "message" }, { "from": { - "activity_id": "844942554717397525", - "participant_id": "1823127147500894672" + "activity_id": "6759540437739180205", + "participant_id": "14585017180007157378" }, "name": "a()", "return_type": "void", @@ -750,15 +750,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "1871432932744498976", - "participant_id": "1798184226128732119" + "activity_id": "14971463461955991809", + "participant_id": "14385473809029856958" }, "type": "message" }, { "from": { - "activity_id": "1871432932744498976", - "participant_id": "1798184226128732119" + "activity_id": "14971463461955991809", + "participant_id": "14385473809029856958" }, "name": "aa()", "return_type": "void", @@ -770,15 +770,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "1100933039353876539", - "participant_id": "1798184226128732119" + "activity_id": "8807464314831012313", + "participant_id": "14385473809029856958" }, "type": "message" }, { "from": { - "activity_id": "1100933039353876539", - "participant_id": "1798184226128732119" + "activity_id": "8807464314831012313", + "participant_id": "14385473809029856958" }, "name": "aaa()", "return_type": "void", @@ -790,15 +790,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "941636185823691898", - "participant_id": "1798184226128732119" + "activity_id": "7533089486589535184", + "participant_id": "14385473809029856958" }, "type": "message" }, { "from": { - "activity_id": "844942554717397525", - "participant_id": "1823127147500894672" + "activity_id": "6759540437739180205", + "participant_id": "14585017180007157378" }, "name": "b()", "return_type": "void", @@ -810,15 +810,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "2142697410385270633", - "participant_id": "1893469899260202653" + "activity_id": "17141579283082165068", + "participant_id": "15147759194081621226" }, "type": "message" }, { "from": { - "activity_id": "2142697410385270633", - "participant_id": "1893469899260202653" + "activity_id": "17141579283082165068", + "participant_id": "15147759194081621226" }, "name": "bb()", "return_type": "void", @@ -830,15 +830,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "973718340784931313", - "participant_id": "1893469899260202653" + "activity_id": "7789746726279450510", + "participant_id": "15147759194081621226" }, "type": "message" }, { "from": { - "activity_id": "973718340784931313", - "participant_id": "1893469899260202653" + "activity_id": "7789746726279450510", + "participant_id": "15147759194081621226" }, "name": "bbb()", "return_type": "void", @@ -850,15 +850,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "195788529004378403", - "participant_id": "1893469899260202653" + "activity_id": "1566308232035027228", + "participant_id": "15147759194081621226" }, "type": "message" }, { "from": { - "activity_id": "893699278278125827", - "participant_id": "893699278278125827" + "activity_id": "7149594226225006621", + "participant_id": "7149594226225006621" }, "name": "R((lambda at t20012.cc:86:9) &&)", "return_type": "void", @@ -870,15 +870,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "1976182450987832927", - "participant_id": "1418878159628415236" + "activity_id": "15809459607902663419", + "participant_id": "11351025277027321892" }, "type": "message" }, { "from": { - "activity_id": "893699278278125827", - "participant_id": "893699278278125827" + "activity_id": "7149594226225006621", + "participant_id": "7149594226225006621" }, "name": "r()", "return_type": "void", @@ -890,15 +890,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "1627963942447215983", - "participant_id": "1418878159628415236" + "activity_id": "13023711539577727870", + "participant_id": "11351025277027321892" }, "type": "message" }, { "from": { - "activity_id": "1627963942447215983", - "participant_id": "1418878159628415236" + "activity_id": "13023711539577727870", + "participant_id": "11351025277027321892" }, "name": "operator()() const", "return_type": "void", @@ -910,15 +910,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "997617437879117371", - "participant_id": "1523229682883773614" + "activity_id": "7980939503032938975", + "participant_id": "12185837463070188914" }, "type": "message" }, { "from": { - "activity_id": "997617437879117371", - "participant_id": "1523229682883773614" + "activity_id": "7980939503032938975", + "participant_id": "12185837463070188914" }, "name": "c()", "return_type": "void", @@ -930,15 +930,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "675369415318225607", - "participant_id": "2071958121786360262" + "activity_id": "5402955322545804857", + "participant_id": "16575664974290882098" }, "type": "message" }, { "from": { - "activity_id": "675369415318225607", - "participant_id": "2071958121786360262" + "activity_id": "5402955322545804857", + "participant_id": "16575664974290882098" }, "name": "cc()", "return_type": "void", @@ -950,15 +950,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "1451821704315336057", - "participant_id": "2071958121786360262" + "activity_id": "11614573634522688457", + "participant_id": "16575664974290882098" }, "type": "message" }, { "from": { - "activity_id": "1451821704315336057", - "participant_id": "2071958121786360262" + "activity_id": "11614573634522688457", + "participant_id": "16575664974290882098" }, "name": "ccc()", "return_type": "void", @@ -970,15 +970,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "1956141408799600460", - "participant_id": "2071958121786360262" + "activity_id": "15649131270396803681", + "participant_id": "16575664974290882098" }, "type": "message" }, { "from": { - "activity_id": "893699278278125827", - "participant_id": "893699278278125827" + "activity_id": "7149594226225006621", + "participant_id": "7149594226225006621" }, "name": "operator()(auto) const", "return_type": "auto", @@ -990,15 +990,15 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "1625806587339243213", - "participant_id": "1585686021763298522" + "activity_id": "13006452698713945708", + "participant_id": "12685488174106388182" }, "type": "message" }, { "from": { - "activity_id": "1625806587339243213", - "participant_id": "1585686021763298522" + "activity_id": "13006452698713945708", + "participant_id": "12685488174106388182" }, "name": "add5(int) const", "return_type": "int", @@ -1010,14 +1010,14 @@ void tmain() "translation_unit": "t20012.cc" }, "to": { - "activity_id": "379068559069876883", - "participant_id": "1627226326147373737" + "activity_id": "3032548472559015070", + "participant_id": "13017810609178989903" }, "type": "message" } ], "start_from": { - "id": 893699278278125827, + "id": "7149594226225006621", "location": "clanguml::t20012::tmain()" } } diff --git a/docs/test_cases/t20012_sequence.svg b/docs/test_cases/t20012_sequence.svg index cbb92ee9..10cc615c 100644 --- a/docs/test_cases/t20012_sequence.svg +++ b/docs/test_cases/t20012_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,33 +9,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -46,243 +46,243 @@ - - + + tmain() - + tmain() - - + + tmain()::(lambda t20012.cc:67:20) - + tmain()::(lambda t20012.cc:67:20) - - + + A - + A - - + + B - + B - - + + tmain()::(lambda t20012.cc:80:20) - + tmain()::(lambda t20012.cc:80:20) - - + + C - + C - - + + R<(lambda at t20012.cc:86:9)> - + R<(lambda at t20012.cc:86:9)> - - + + tmain()::(lambda t20012.cc:86:9) - + tmain()::(lambda t20012.cc:86:9) - - + + tmain()::(lambda t20012.cc:94:9) - + tmain()::(lambda t20012.cc:94:9) - - + + D - + D - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + operator()() const - + a() - + aa() - + aaa() - + b() - + bb() - + bbb() - + operator()() const - + c() - + cc() - + ccc() - + operator()() const - + a() - + aa() - + aaa() - + b() - + bb() - + bbb() - + R((lambda at t20012.cc:86:9) &&) - + r() - + operator()() const - + c() - + cc() - + ccc() - + operator()(auto) const - + add5(int) const diff --git a/docs/test_cases/t20013.md b/docs/test_cases/t20013.md index 261586f4..3f89af6e 100644 --- a/docs/test_cases/t20013.md +++ b/docs/test_cases/t20013.md @@ -57,7 +57,7 @@ void tmain(int argc, char **argv) { "display_name": "tmain(int,char **)", "full_name": "clanguml::t20013::tmain(int,char **)", - "id": "1249768632077843821", + "id": "9998149056622750574", "name": "tmain", "namespace": "clanguml::t20013", "source_location": { @@ -73,7 +73,7 @@ void tmain(int argc, char **argv) { "display_name": "b(int)", "full_name": "clanguml::t20013::B::b(int)", - "id": "2144804108273682993", + "id": "17158432866189463946", "name": "b", "namespace": "", "source_location": { @@ -87,7 +87,7 @@ void tmain(int argc, char **argv) { "display_name": "b(double)", "full_name": "clanguml::t20013::B::b(double)", - "id": "640747884486165287", + "id": "5125983075889322302", "name": "b", "namespace": "", "source_location": { @@ -101,7 +101,7 @@ void tmain(int argc, char **argv) { "display_name": "b(const char *)", "full_name": "clanguml::t20013::B::b(const char *)", - "id": "1066935874364409142", + "id": "8535486994915273137", "name": "b", "namespace": "", "source_location": { @@ -115,7 +115,7 @@ void tmain(int argc, char **argv) ], "display_name": "B", "full_name": "clanguml::t20013::B", - "id": "1106407610612951303", + "id": "8851260884903610424", "name": "B", "namespace": "clanguml::t20013", "source_location": { @@ -131,7 +131,7 @@ void tmain(int argc, char **argv) { "display_name": "a1(int)", "full_name": "clanguml::t20013::A::a1(int)", - "id": "1034027282942033004", + "id": "8272218263536264033", "name": "a1", "namespace": "", "source_location": { @@ -145,7 +145,7 @@ void tmain(int argc, char **argv) { "display_name": "a2(double)", "full_name": "clanguml::t20013::A::a2(double)", - "id": "394053399890813915", + "id": "3152427199126511320", "name": "a2", "namespace": "", "source_location": { @@ -159,7 +159,7 @@ void tmain(int argc, char **argv) { "display_name": "a3(const char *)", "full_name": "clanguml::t20013::A::a3(const char *)", - "id": "1841239321495867611", + "id": "14729914571966940889", "name": "a3", "namespace": "", "source_location": { @@ -173,7 +173,7 @@ void tmain(int argc, char **argv) ], "display_name": "A", "full_name": "clanguml::t20013::A", - "id": "976623130699225079", + "id": "7812985045593800637", "name": "A", "namespace": "clanguml::t20013", "source_location": { @@ -190,8 +190,8 @@ void tmain(int argc, char **argv) "messages": [ { "from": { - "activity_id": "1249768632077843821", - "participant_id": "1249768632077843821" + "activity_id": "9998149056622750574", + "participant_id": "9998149056622750574" }, "name": "b(int)", "return_type": "int", @@ -203,15 +203,15 @@ void tmain(int argc, char **argv) "translation_unit": "t20013.cc" }, "to": { - "activity_id": "2144804108273682993", - "participant_id": "1106407610612951303" + "activity_id": "17158432866189463946", + "participant_id": "8851260884903610424" }, "type": "message" }, { "from": { - "activity_id": "2144804108273682993", - "participant_id": "1106407610612951303" + "activity_id": "17158432866189463946", + "participant_id": "8851260884903610424" }, "name": "a1(int)", "return_type": "int", @@ -223,15 +223,15 @@ void tmain(int argc, char **argv) "translation_unit": "t20013.cc" }, "to": { - "activity_id": "1034027282942033004", - "participant_id": "976623130699225079" + "activity_id": "8272218263536264033", + "participant_id": "7812985045593800637" }, "type": "message" }, { "from": { - "activity_id": "1249768632077843821", - "participant_id": "1249768632077843821" + "activity_id": "9998149056622750574", + "participant_id": "9998149056622750574" }, "name": "b(double)", "return_type": "double", @@ -243,15 +243,15 @@ void tmain(int argc, char **argv) "translation_unit": "t20013.cc" }, "to": { - "activity_id": "640747884486165287", - "participant_id": "1106407610612951303" + "activity_id": "5125983075889322302", + "participant_id": "8851260884903610424" }, "type": "message" }, { "from": { - "activity_id": "640747884486165287", - "participant_id": "1106407610612951303" + "activity_id": "5125983075889322302", + "participant_id": "8851260884903610424" }, "name": "a2(double)", "return_type": "double", @@ -263,15 +263,15 @@ void tmain(int argc, char **argv) "translation_unit": "t20013.cc" }, "to": { - "activity_id": "394053399890813915", - "participant_id": "976623130699225079" + "activity_id": "3152427199126511320", + "participant_id": "7812985045593800637" }, "type": "message" }, { "from": { - "activity_id": "1249768632077843821", - "participant_id": "1249768632077843821" + "activity_id": "9998149056622750574", + "participant_id": "9998149056622750574" }, "name": "b(const char *)", "return_type": "const char *", @@ -283,15 +283,15 @@ void tmain(int argc, char **argv) "translation_unit": "t20013.cc" }, "to": { - "activity_id": "1066935874364409142", - "participant_id": "1106407610612951303" + "activity_id": "8535486994915273137", + "participant_id": "8851260884903610424" }, "type": "message" }, { "from": { - "activity_id": "1066935874364409142", - "participant_id": "1106407610612951303" + "activity_id": "8535486994915273137", + "participant_id": "8851260884903610424" }, "name": "a3(const char *)", "return_type": "const char *", @@ -303,14 +303,14 @@ void tmain(int argc, char **argv) "translation_unit": "t20013.cc" }, "to": { - "activity_id": "1841239321495867611", - "participant_id": "976623130699225079" + "activity_id": "14729914571966940889", + "participant_id": "7812985045593800637" }, "type": "message" } ], "start_from": { - "id": 1249768632077843821, + "id": "9998149056622750574", "location": "clanguml::t20013::tmain(int,char **)" } } diff --git a/docs/test_cases/t20013_sequence.svg b/docs/test_cases/t20013_sequence.svg index 17e6baad..fe30ce73 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 d389364a..d736ffcc 100644 --- a/docs/test_cases/t20014.md +++ b/docs/test_cases/t20014.md @@ -156,7 +156,7 @@ struct A { { "display_name": "tmain()", "full_name": "clanguml::t20014::tmain()", - "id": "512436830818921250", + "id": "4099494646551370002", "name": "tmain", "namespace": "clanguml::t20014", "source_location": { @@ -172,7 +172,7 @@ struct A { { "display_name": "b1(int,int)", "full_name": "clanguml::t20014::B::b1(int,int)", - "id": "1251633571711578431", + "id": "10013068573692627454", "name": "b1", "namespace": "", "source_location": { @@ -186,7 +186,7 @@ struct A { { "display_name": "b2(int,int)", "full_name": "clanguml::t20014::B::b2(int,int)", - "id": "767830966714379991", + "id": "6142647733715039933", "name": "b2", "namespace": "", "source_location": { @@ -200,7 +200,7 @@ struct A { ], "display_name": "B", "full_name": "clanguml::t20014::B", - "id": "1537634076295867978", + "id": "12301072610366943830", "name": "B", "namespace": "clanguml::t20014", "source_location": { @@ -216,7 +216,7 @@ struct A { { "display_name": "a1(int,int)", "full_name": "clanguml::t20014::A::a1(int,int)", - "id": "1753682948110709616", + "id": "14029463584885676935", "name": "a1", "namespace": "", "source_location": { @@ -230,7 +230,7 @@ struct A { { "display_name": "a2(int,int)", "full_name": "clanguml::t20014::A::a2(int,int)", - "id": "1943487088673912694", + "id": "15547896709391301559", "name": "a2", "namespace": "", "source_location": { @@ -244,7 +244,7 @@ struct A { ], "display_name": "A", "full_name": "clanguml::t20014::A", - "id": "1504706415756333840", + "id": "12037651326050670722", "name": "A", "namespace": "clanguml::t20014", "source_location": { @@ -260,7 +260,7 @@ struct A { { "display_name": "c1(int,int)", "full_name": "clanguml::t20014::C::c1(int,int)", - "id": "407559038402563981", + "id": "3260472307220511850", "name": "c1", "namespace": "", "source_location": { @@ -274,7 +274,7 @@ struct A { ], "display_name": "C", "full_name": "clanguml::t20014::C", - "id": "500712304857049435", + "id": "4005698438856395483", "name": "C", "namespace": "clanguml::t20014", "source_location": { @@ -291,8 +291,8 @@ struct A { "messages": [ { "from": { - "activity_id": "512436830818921250", - "participant_id": "512436830818921250" + "activity_id": "4099494646551370002", + "participant_id": "4099494646551370002" }, "name": "b1(int,int)", "return_type": "int", @@ -304,15 +304,15 @@ struct A { "translation_unit": "t20014.cc" }, "to": { - "activity_id": "1251633571711578431", - "participant_id": "1537634076295867978" + "activity_id": "10013068573692627454", + "participant_id": "12301072610366943830" }, "type": "message" }, { "from": { - "activity_id": "1251633571711578431", - "participant_id": "1537634076295867978" + "activity_id": "10013068573692627454", + "participant_id": "12301072610366943830" }, "name": "a1(int,int)", "return_type": "int", @@ -324,15 +324,15 @@ struct A { "translation_unit": "t20014_b.cc" }, "to": { - "activity_id": "1753682948110709616", - "participant_id": "1504706415756333840" + "activity_id": "14029463584885676935", + "participant_id": "12037651326050670722" }, "type": "message" }, { "from": { - "activity_id": "512436830818921250", - "participant_id": "512436830818921250" + "activity_id": "4099494646551370002", + "participant_id": "4099494646551370002" }, "name": "b2(int,int)", "return_type": "int", @@ -344,15 +344,15 @@ struct A { "translation_unit": "t20014.cc" }, "to": { - "activity_id": "767830966714379991", - "participant_id": "1537634076295867978" + "activity_id": "6142647733715039933", + "participant_id": "12301072610366943830" }, "type": "message" }, { "from": { - "activity_id": "767830966714379991", - "participant_id": "1537634076295867978" + "activity_id": "6142647733715039933", + "participant_id": "12301072610366943830" }, "name": "a2(int,int)", "return_type": "int", @@ -364,15 +364,15 @@ struct A { "translation_unit": "t20014_b.cc" }, "to": { - "activity_id": "1943487088673912694", - "participant_id": "1504706415756333840" + "activity_id": "15547896709391301559", + "participant_id": "12037651326050670722" }, "type": "message" }, { "from": { - "activity_id": "512436830818921250", - "participant_id": "512436830818921250" + "activity_id": "4099494646551370002", + "participant_id": "4099494646551370002" }, "name": "c1(int,int)", "return_type": "int", @@ -384,15 +384,15 @@ struct A { "translation_unit": "t20014.cc" }, "to": { - "activity_id": "407559038402563981", - "participant_id": "500712304857049435" + "activity_id": "3260472307220511850", + "participant_id": "4005698438856395483" }, "type": "message" }, { "from": { - "activity_id": "407559038402563981", - "participant_id": "500712304857049435" + "activity_id": "3260472307220511850", + "participant_id": "4005698438856395483" }, "name": "b1(int,int)", "return_type": "int", @@ -404,15 +404,15 @@ struct A { "translation_unit": "t20014.cc" }, "to": { - "activity_id": "1251633571711578431", - "participant_id": "1537634076295867978" + "activity_id": "10013068573692627454", + "participant_id": "12301072610366943830" }, "type": "message" }, { "from": { - "activity_id": "1251633571711578431", - "participant_id": "1537634076295867978" + "activity_id": "10013068573692627454", + "participant_id": "12301072610366943830" }, "name": "a1(int,int)", "return_type": "int", @@ -424,14 +424,14 @@ struct A { "translation_unit": "t20014_b.cc" }, "to": { - "activity_id": "1753682948110709616", - "participant_id": "1504706415756333840" + "activity_id": "14029463584885676935", + "participant_id": "12037651326050670722" }, "type": "message" } ], "start_from": { - "id": 512436830818921250, + "id": "4099494646551370002", "location": "clanguml::t20014::tmain()" } } diff --git a/docs/test_cases/t20014_sequence.svg b/docs/test_cases/t20014_sequence.svg index da21d3da..e21f7b0b 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 65d268b0..56a23422 100644 --- a/docs/test_cases/t20015.md +++ b/docs/test_cases/t20015.md @@ -73,7 +73,7 @@ void tmain() { "display_name": "tmain()", "full_name": "clanguml::t20015::tmain()", - "id": "1011496551872082945", + "id": "8091972414976663567", "name": "tmain", "namespace": "clanguml::t20015", "source_location": { @@ -89,7 +89,7 @@ void tmain() { "display_name": "setup_a(std::shared_ptr &)", "full_name": "clanguml::t20015::B::setup_a(std::shared_ptr &)", - "id": "431575772398797060", + "id": "3452606179190376485", "name": "setup_a", "namespace": "", "source_location": { @@ -103,7 +103,7 @@ void tmain() ], "display_name": "B", "full_name": "clanguml::t20015::B", - "id": "1302656676783358645", + "id": "10421253414266869167", "name": "B", "namespace": "clanguml::t20015", "source_location": { @@ -120,8 +120,8 @@ void tmain() "messages": [ { "from": { - "activity_id": "1011496551872082945", - "participant_id": "1011496551872082945" + "activity_id": "8091972414976663567", + "participant_id": "8091972414976663567" }, "name": "setup_a(std::shared_ptr &)", "return_type": "void", @@ -133,14 +133,14 @@ void tmain() "translation_unit": "t20015.cc" }, "to": { - "activity_id": "431575772398797060", - "participant_id": "1302656676783358645" + "activity_id": "3452606179190376485", + "participant_id": "10421253414266869167" }, "type": "message" } ], "start_from": { - "id": 1011496551872082945, + "id": "8091972414976663567", "location": "clanguml::t20015::tmain()" } } diff --git a/docs/test_cases/t20015_sequence.svg b/docs/test_cases/t20015_sequence.svg index fecbc9e1..80d70f0d 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 4ae5396b..b241db63 100644 --- a/docs/test_cases/t20016.md +++ b/docs/test_cases/t20016.md @@ -55,7 +55,7 @@ void tmain() { "display_name": "tmain()", "full_name": "clanguml::t20016::tmain()", - "id": "1912662358651926712", + "id": "15301298869215413700", "name": "tmain", "namespace": "clanguml::t20016", "source_location": { @@ -71,7 +71,7 @@ void tmain() { "display_name": "b1(long)", "full_name": "clanguml::t20016::B::b1(long)", - "id": "2064264710178722261", + "id": "16514117681429778095", "name": "b1", "namespace": "", "source_location": { @@ -85,7 +85,7 @@ void tmain() { "display_name": "b2(long)", "full_name": "clanguml::t20016::B::b2(long)", - "id": "203381140188081853", + "id": "1627049121504654829", "name": "b2", "namespace": "", "source_location": { @@ -99,7 +99,7 @@ void tmain() ], "display_name": "B", "full_name": "clanguml::t20016::B", - "id": "1688340912643326666", + "id": "13506727301146613328", "name": "B", "namespace": "clanguml::t20016", "source_location": { @@ -115,7 +115,7 @@ void tmain() { "display_name": "a1(int)", "full_name": "clanguml::t20016::A::a1(int)", - "id": "1198371121423942542", + "id": "9586968971391540342", "name": "a1", "namespace": "", "source_location": { @@ -129,7 +129,7 @@ void tmain() { "display_name": "a2(const long &)", "full_name": "clanguml::t20016::A::a2(const long &)", - "id": "1208784669530380166", + "id": "9670277356243041331", "name": "a2", "namespace": "", "source_location": { @@ -143,7 +143,7 @@ void tmain() ], "display_name": "A", "full_name": "clanguml::t20016::A", - "id": "1351242594275053195", + "id": "10809940754200425565", "name": "A", "namespace": "clanguml::t20016", "source_location": { @@ -160,8 +160,8 @@ void tmain() "messages": [ { "from": { - "activity_id": "1912662358651926712", - "participant_id": "1912662358651926712" + "activity_id": "15301298869215413700", + "participant_id": "15301298869215413700" }, "name": "b1(long)", "return_type": "void", @@ -173,15 +173,15 @@ void tmain() "translation_unit": "t20016.cc" }, "to": { - "activity_id": "2064264710178722261", - "participant_id": "1688340912643326666" + "activity_id": "16514117681429778095", + "participant_id": "13506727301146613328" }, "type": "message" }, { "from": { - "activity_id": "2064264710178722261", - "participant_id": "1688340912643326666" + "activity_id": "16514117681429778095", + "participant_id": "13506727301146613328" }, "name": "a1(int)", "return_type": "void", @@ -193,15 +193,15 @@ void tmain() "translation_unit": "t20016.cc" }, "to": { - "activity_id": "1198371121423942542", - "participant_id": "1351242594275053195" + "activity_id": "9586968971391540342", + "participant_id": "10809940754200425565" }, "type": "message" }, { "from": { - "activity_id": "1912662358651926712", - "participant_id": "1912662358651926712" + "activity_id": "15301298869215413700", + "participant_id": "15301298869215413700" }, "name": "b2(long)", "return_type": "F", @@ -213,15 +213,15 @@ void tmain() "translation_unit": "t20016.cc" }, "to": { - "activity_id": "203381140188081853", - "participant_id": "1688340912643326666" + "activity_id": "1627049121504654829", + "participant_id": "13506727301146613328" }, "type": "message" }, { "from": { - "activity_id": "203381140188081853", - "participant_id": "1688340912643326666" + "activity_id": "1627049121504654829", + "participant_id": "13506727301146613328" }, "name": "a2(const long &)", "return_type": "long", @@ -233,14 +233,14 @@ void tmain() "translation_unit": "t20016.cc" }, "to": { - "activity_id": "1208784669530380166", - "participant_id": "1351242594275053195" + "activity_id": "9670277356243041331", + "participant_id": "10809940754200425565" }, "type": "message" } ], "start_from": { - "id": 1912662358651926712, + "id": "15301298869215413700", "location": "clanguml::t20016::tmain()" } } diff --git a/docs/test_cases/t20016_sequence.svg b/docs/test_cases/t20016_sequence.svg index ebc9c8eb..76ac93be 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 b3db9d52..0a584cc2 100644 --- a/docs/test_cases/t20017.md +++ b/docs/test_cases/t20017.md @@ -78,7 +78,7 @@ template T b2(T x, T y) { return x / y; } { "display_name": "tmain()", "full_name": "clanguml::t20017::tmain()", - "id": "1484746432546296115", + "id": "11877971460370368922", "name": "tmain", "namespace": "clanguml::t20017", "source_location": { @@ -92,7 +92,7 @@ template T b2(T x, T y) { return x / y; } ], "display_name": "t20017.cc", "full_name": "clanguml::t20017::tmain()", - "id": "294332401323799021", + "id": "2354659210590392173", "name": "t20017.cc", "namespace": "clanguml::t20017", "type": "file" @@ -102,7 +102,7 @@ template T b2(T x, T y) { return x / y; } { "display_name": "a3(int,int)", "full_name": "clanguml::t20017::a3(int,int)", - "id": "1681392050252260928", + "id": "13451136402018087431", "name": "a3", "namespace": "clanguml::t20017", "source_location": { @@ -116,7 +116,7 @@ template T b2(T x, T y) { return x / y; } { "display_name": "a2(int,int)", "full_name": "clanguml::t20017::a2(int,int)", - "id": "291553542743365259", + "id": "2332428341946922072", "name": "a2", "namespace": "clanguml::t20017", "source_location": { @@ -130,7 +130,7 @@ template T b2(T x, T y) { return x / y; } { "display_name": "a1(int,int)", "full_name": "clanguml::t20017::a1(int,int)", - "id": "113759676939330212", + "id": "910077415514641696", "name": "a1", "namespace": "clanguml::t20017", "source_location": { @@ -144,7 +144,7 @@ template T b2(T x, T y) { return x / y; } ], "display_name": "include/t20017_a.h", "full_name": "clanguml::t20017::a3(int,int)", - "id": "1591222867263639510", + "id": "12729782938109116085", "name": "t20017_a.h", "namespace": "clanguml::t20017", "type": "file" @@ -154,7 +154,7 @@ template T b2(T x, T y) { return x / y; } { "display_name": "b1(int,int)", "full_name": "clanguml::t20017::b1(int,int)", - "id": "1714277838806105702", + "id": "13714222710448845623", "name": "b1", "namespace": "clanguml::t20017", "source_location": { @@ -168,7 +168,7 @@ template T b2(T x, T y) { return x / y; } { "display_name": "b2(int,int)", "full_name": "clanguml::t20017::b2(int,int)", - "id": "775081116464505528", + "id": "6200648931716044224", "name": "b2", "namespace": "clanguml::t20017", "source_location": { @@ -182,7 +182,7 @@ template T b2(T x, T y) { return x / y; } ], "display_name": "include/t20017_b.h", "full_name": "clanguml::t20017::b1(int,int)", - "id": "1113611539183189365", + "id": "8908892313465514924", "name": "t20017_b.h", "namespace": "clanguml::t20017", "type": "file" @@ -193,8 +193,8 @@ template T b2(T x, T y) { return x / y; } "messages": [ { "from": { - "activity_id": "1484746432546296115", - "participant_id": "294332401323799021" + "activity_id": "11877971460370368922", + "participant_id": "2354659210590392173" }, "name": "a3(int,int)", "return_type": "int", @@ -206,15 +206,15 @@ template T b2(T x, T y) { return x / y; } "translation_unit": "t20017.cc" }, "to": { - "activity_id": "1681392050252260928", - "participant_id": "1591222867263639510" + "activity_id": "13451136402018087431", + "participant_id": "12729782938109116085" }, "type": "message" }, { "from": { - "activity_id": "1484746432546296115", - "participant_id": "294332401323799021" + "activity_id": "11877971460370368922", + "participant_id": "2354659210590392173" }, "name": "b1(int,int)", "return_type": "int", @@ -226,15 +226,15 @@ template T b2(T x, T y) { return x / y; } "translation_unit": "t20017.cc" }, "to": { - "activity_id": "1714277838806105702", - "participant_id": "1113611539183189365" + "activity_id": "13714222710448845623", + "participant_id": "8908892313465514924" }, "type": "message" }, { "from": { - "activity_id": "1484746432546296115", - "participant_id": "294332401323799021" + "activity_id": "11877971460370368922", + "participant_id": "2354659210590392173" }, "name": "a2(int,int)", "return_type": "int", @@ -246,15 +246,15 @@ template T b2(T x, T y) { return x / y; } "translation_unit": "t20017.cc" }, "to": { - "activity_id": "291553542743365259", - "participant_id": "1591222867263639510" + "activity_id": "2332428341946922072", + "participant_id": "12729782938109116085" }, "type": "message" }, { "from": { - "activity_id": "1484746432546296115", - "participant_id": "294332401323799021" + "activity_id": "11877971460370368922", + "participant_id": "2354659210590392173" }, "name": "a1(int,int)", "return_type": "int", @@ -266,15 +266,15 @@ template T b2(T x, T y) { return x / y; } "translation_unit": "t20017.cc" }, "to": { - "activity_id": "113759676939330212", - "participant_id": "1591222867263639510" + "activity_id": "910077415514641696", + "participant_id": "12729782938109116085" }, "type": "message" }, { "from": { - "activity_id": "1484746432546296115", - "participant_id": "294332401323799021" + "activity_id": "11877971460370368922", + "participant_id": "2354659210590392173" }, "name": "b2(int,int)", "return_type": "", @@ -286,15 +286,15 @@ template T b2(T x, T y) { return x / y; } "translation_unit": "t20017.cc" }, "to": { - "activity_id": "775081116464505528", - "participant_id": "1113611539183189365" + "activity_id": "6200648931716044224", + "participant_id": "8908892313465514924" }, "type": "message" } ], "return_type": "int", "start_from": { - "id": 1484746432546296115, + "id": "11877971460370368922", "location": "clanguml::t20017::tmain()" } } diff --git a/docs/test_cases/t20017_sequence.svg b/docs/test_cases/t20017_sequence.svg index 8347f966..8b1a4e9c 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 fb4c5e30..a7d1b352 100644 --- a/docs/test_cases/t20018.md +++ b/docs/test_cases/t20018.md @@ -57,7 +57,7 @@ void tmain() { Answer>::print(); } { "display_name": "tmain()", "full_name": "clanguml::t20018::tmain()", - "id": "227581758025403815", + "id": "1820654064203230521", "name": "tmain", "namespace": "clanguml::t20018", "source_location": { @@ -73,7 +73,7 @@ void tmain() { Answer>::print(); } { "display_name": "print()", "full_name": "clanguml::t20018::Answer,120>::print()", - "id": "1185770766239304952", + "id": "9486166129914439617", "name": "print", "namespace": "", "source_location": { @@ -87,7 +87,7 @@ void tmain() { Answer>::print(); } ], "display_name": "Answer,120>", "full_name": "clanguml::t20018::Answer,120>", - "id": "1163521725351533502", + "id": "9308173802812268017", "name": "Answer", "namespace": "clanguml::t20018", "source_location": { @@ -103,7 +103,7 @@ void tmain() { Answer>::print(); } { "display_name": "print(int)", "full_name": "clanguml::t20018::Factorial<5>::print(int)", - "id": "833100888453299461", + "id": "6664807107626395688", "name": "print", "namespace": "", "source_location": { @@ -117,7 +117,7 @@ void tmain() { Answer>::print(); } ], "display_name": "Factorial<5>", "full_name": "clanguml::t20018::Factorial<5>", - "id": "1482779373563849921", + "id": "11862234988510799368", "name": "Factorial", "namespace": "clanguml::t20018", "source_location": { @@ -133,7 +133,7 @@ void tmain() { Answer>::print(); } { "display_name": "print(int)", "full_name": "clanguml::t20018::Factorial<4>::print(int)", - "id": "1782586643813991247", + "id": "14260693150511929978", "name": "print", "namespace": "", "source_location": { @@ -147,7 +147,7 @@ void tmain() { Answer>::print(); } ], "display_name": "Factorial<4>", "full_name": "clanguml::t20018::Factorial<4>", - "id": "52416404065514823", + "id": "419331232524118585", "name": "Factorial", "namespace": "clanguml::t20018", "source_location": { @@ -163,7 +163,7 @@ void tmain() { Answer>::print(); } { "display_name": "print(int)", "full_name": "clanguml::t20018::Factorial<3>::print(int)", - "id": "1238078028595736678", + "id": "9904624228765893427", "name": "print", "namespace": "", "source_location": { @@ -177,7 +177,7 @@ void tmain() { Answer>::print(); } ], "display_name": "Factorial<3>", "full_name": "clanguml::t20018::Factorial<3>", - "id": "1658728078296100018", + "id": "13269824626368800150", "name": "Factorial", "namespace": "clanguml::t20018", "source_location": { @@ -193,7 +193,7 @@ void tmain() { Answer>::print(); } { "display_name": "print(int)", "full_name": "clanguml::t20018::Factorial<2>::print(int)", - "id": "2163270950475476780", + "id": "17306167603803814242", "name": "print", "namespace": "", "source_location": { @@ -207,7 +207,7 @@ void tmain() { Answer>::print(); } ], "display_name": "Factorial<2>", "full_name": "clanguml::t20018::Factorial<2>", - "id": "969903469166760124", + "id": "7759227753334080993", "name": "Factorial", "namespace": "clanguml::t20018", "source_location": { @@ -223,7 +223,7 @@ void tmain() { Answer>::print(); } { "display_name": "print(int)", "full_name": "clanguml::t20018::Factorial<1>::print(int)", - "id": "501166016325937670", + "id": "4009328130607501361", "name": "print", "namespace": "", "source_location": { @@ -237,7 +237,7 @@ void tmain() { Answer>::print(); } ], "display_name": "Factorial<1>", "full_name": "clanguml::t20018::Factorial<1>", - "id": "2032621198190600516", + "id": "16260969585524804132", "name": "Factorial", "namespace": "clanguml::t20018", "source_location": { @@ -253,7 +253,7 @@ void tmain() { Answer>::print(); } { "display_name": "print(int)", "full_name": "clanguml::t20018::Factorial<0>::print(int)", - "id": "577232827352391544", + "id": "4617862618819132358", "name": "print", "namespace": "", "source_location": { @@ -267,7 +267,7 @@ void tmain() { Answer>::print(); } ], "display_name": "Factorial<0>", "full_name": "clanguml::t20018::Factorial<0>", - "id": "1581865799666386458", + "id": "12654926397331091668", "name": "Factorial", "namespace": "clanguml::t20018", "source_location": { @@ -284,8 +284,8 @@ void tmain() { Answer>::print(); } "messages": [ { "from": { - "activity_id": "227581758025403815", - "participant_id": "227581758025403815" + "activity_id": "1820654064203230521", + "participant_id": "1820654064203230521" }, "name": "print()", "return_type": "void", @@ -297,15 +297,15 @@ void tmain() { Answer>::print(); } "translation_unit": "t20018.cc" }, "to": { - "activity_id": "1185770766239304952", - "participant_id": "1163521725351533502" + "activity_id": "9486166129914439617", + "participant_id": "9308173802812268017" }, "type": "message" }, { "from": { - "activity_id": "1185770766239304952", - "participant_id": "1163521725351533502" + "activity_id": "9486166129914439617", + "participant_id": "9308173802812268017" }, "name": "print(int)", "return_type": "void", @@ -317,15 +317,15 @@ void tmain() { Answer>::print(); } "translation_unit": "t20018.cc" }, "to": { - "activity_id": "833100888453299461", - "participant_id": "1482779373563849921" + "activity_id": "6664807107626395688", + "participant_id": "11862234988510799368" }, "type": "message" }, { "from": { - "activity_id": "833100888453299461", - "participant_id": "1482779373563849921" + "activity_id": "6664807107626395688", + "participant_id": "11862234988510799368" }, "name": "print(int)", "return_type": "void", @@ -337,15 +337,15 @@ void tmain() { Answer>::print(); } "translation_unit": "t20018.cc" }, "to": { - "activity_id": "1782586643813991247", - "participant_id": "52416404065514823" + "activity_id": "14260693150511929978", + "participant_id": "419331232524118585" }, "type": "message" }, { "from": { - "activity_id": "1782586643813991247", - "participant_id": "52416404065514823" + "activity_id": "14260693150511929978", + "participant_id": "419331232524118585" }, "name": "print(int)", "return_type": "void", @@ -357,15 +357,15 @@ void tmain() { Answer>::print(); } "translation_unit": "t20018.cc" }, "to": { - "activity_id": "1238078028595736678", - "participant_id": "1658728078296100018" + "activity_id": "9904624228765893427", + "participant_id": "13269824626368800150" }, "type": "message" }, { "from": { - "activity_id": "1238078028595736678", - "participant_id": "1658728078296100018" + "activity_id": "9904624228765893427", + "participant_id": "13269824626368800150" }, "name": "print(int)", "return_type": "void", @@ -377,15 +377,15 @@ void tmain() { Answer>::print(); } "translation_unit": "t20018.cc" }, "to": { - "activity_id": "2163270950475476780", - "participant_id": "969903469166760124" + "activity_id": "17306167603803814242", + "participant_id": "7759227753334080993" }, "type": "message" }, { "from": { - "activity_id": "2163270950475476780", - "participant_id": "969903469166760124" + "activity_id": "17306167603803814242", + "participant_id": "7759227753334080993" }, "name": "print(int)", "return_type": "void", @@ -397,15 +397,15 @@ void tmain() { Answer>::print(); } "translation_unit": "t20018.cc" }, "to": { - "activity_id": "501166016325937670", - "participant_id": "2032621198190600516" + "activity_id": "4009328130607501361", + "participant_id": "16260969585524804132" }, "type": "message" }, { "from": { - "activity_id": "501166016325937670", - "participant_id": "2032621198190600516" + "activity_id": "4009328130607501361", + "participant_id": "16260969585524804132" }, "name": "print(int)", "return_type": "void", @@ -417,14 +417,14 @@ void tmain() { Answer>::print(); } "translation_unit": "t20018.cc" }, "to": { - "activity_id": "577232827352391544", - "participant_id": "1581865799666386458" + "activity_id": "4617862618819132358", + "participant_id": "12654926397331091668" }, "type": "message" } ], "start_from": { - "id": 227581758025403815, + "id": "1820654064203230521", "location": "clanguml::t20018::tmain()" } } diff --git a/docs/test_cases/t20018_sequence.svg b/docs/test_cases/t20018_sequence.svg index 8449d497..5955daef 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 b8a58ad4..c0eefe21 100644 --- a/docs/test_cases/t20019.md +++ b/docs/test_cases/t20019.md @@ -64,7 +64,7 @@ void tmain() { "display_name": "tmain()", "full_name": "clanguml::t20019::tmain()", - "id": "375304196268652861", + "id": "3002433570149222892", "name": "tmain", "namespace": "clanguml::t20019", "source_location": { @@ -80,7 +80,7 @@ void tmain() { "display_name": "name()", "full_name": "clanguml::t20019::Base::name()", - "id": "1038853547136467401", + "id": "8310828377091739211", "name": "name", "namespace": "", "source_location": { @@ -94,7 +94,7 @@ void tmain() ], "display_name": "Base", "full_name": "clanguml::t20019::Base", - "id": "381327373934972004", + "id": "3050618991479776032", "name": "Base", "namespace": "clanguml::t20019", "source_location": { @@ -110,7 +110,7 @@ void tmain() { "display_name": "impl()", "full_name": "clanguml::t20019::D1::impl()", - "id": "603969604599968603", + "id": "4831756836799748825", "name": "impl", "namespace": "", "source_location": { @@ -124,7 +124,7 @@ void tmain() ], "display_name": "D1", "full_name": "clanguml::t20019::D1", - "id": "1282259011856139592", + "id": "10258072094849116738", "name": "D1", "namespace": "clanguml::t20019", "source_location": { @@ -140,7 +140,7 @@ void tmain() { "display_name": "name()", "full_name": "clanguml::t20019::Base::name()", - "id": "1918672956676175365", + "id": "15349383653409402924", "name": "name", "namespace": "", "source_location": { @@ -154,7 +154,7 @@ void tmain() ], "display_name": "Base", "full_name": "clanguml::t20019::Base", - "id": "1659477498076328530", + "id": "13275819984610628244", "name": "Base", "namespace": "clanguml::t20019", "source_location": { @@ -170,7 +170,7 @@ void tmain() { "display_name": "impl()", "full_name": "clanguml::t20019::D2::impl()", - "id": "861400435979772695", + "id": "6891203487838181565", "name": "impl", "namespace": "", "source_location": { @@ -184,7 +184,7 @@ void tmain() ], "display_name": "D2", "full_name": "clanguml::t20019::D2", - "id": "1307471723138212117", + "id": "10459773785105696943", "name": "D2", "namespace": "clanguml::t20019", "source_location": { @@ -201,8 +201,8 @@ void tmain() "messages": [ { "from": { - "activity_id": "375304196268652861", - "participant_id": "375304196268652861" + "activity_id": "3002433570149222892", + "participant_id": "3002433570149222892" }, "name": "name()", "return_type": "void", @@ -214,15 +214,15 @@ void tmain() "translation_unit": "t20019.cc" }, "to": { - "activity_id": "1038853547136467401", - "participant_id": "381327373934972004" + "activity_id": "8310828377091739211", + "participant_id": "3050618991479776032" }, "type": "message" }, { "from": { - "activity_id": "1038853547136467401", - "participant_id": "381327373934972004" + "activity_id": "8310828377091739211", + "participant_id": "3050618991479776032" }, "name": "impl()", "return_type": "void", @@ -234,15 +234,15 @@ void tmain() "translation_unit": "t20019.cc" }, "to": { - "activity_id": "603969604599968603", - "participant_id": "1282259011856139592" + "activity_id": "4831756836799748825", + "participant_id": "10258072094849116738" }, "type": "message" }, { "from": { - "activity_id": "375304196268652861", - "participant_id": "375304196268652861" + "activity_id": "3002433570149222892", + "participant_id": "3002433570149222892" }, "name": "name()", "return_type": "void", @@ -254,15 +254,15 @@ void tmain() "translation_unit": "t20019.cc" }, "to": { - "activity_id": "1918672956676175365", - "participant_id": "1659477498076328530" + "activity_id": "15349383653409402924", + "participant_id": "13275819984610628244" }, "type": "message" }, { "from": { - "activity_id": "1918672956676175365", - "participant_id": "1659477498076328530" + "activity_id": "15349383653409402924", + "participant_id": "13275819984610628244" }, "name": "impl()", "return_type": "void", @@ -274,15 +274,15 @@ void tmain() "translation_unit": "t20019.cc" }, "to": { - "activity_id": "861400435979772695", - "participant_id": "1307471723138212117" + "activity_id": "6891203487838181565", + "participant_id": "10459773785105696943" }, "type": "message" }, { "from": { - "activity_id": "375304196268652861", - "participant_id": "375304196268652861" + "activity_id": "3002433570149222892", + "participant_id": "3002433570149222892" }, "name": "name()", "return_type": "void", @@ -294,15 +294,15 @@ void tmain() "translation_unit": "t20019.cc" }, "to": { - "activity_id": "1038853547136467401", - "participant_id": "381327373934972004" + "activity_id": "8310828377091739211", + "participant_id": "3050618991479776032" }, "type": "message" }, { "from": { - "activity_id": "1038853547136467401", - "participant_id": "381327373934972004" + "activity_id": "8310828377091739211", + "participant_id": "3050618991479776032" }, "name": "impl()", "return_type": "void", @@ -314,15 +314,15 @@ void tmain() "translation_unit": "t20019.cc" }, "to": { - "activity_id": "603969604599968603", - "participant_id": "1282259011856139592" + "activity_id": "4831756836799748825", + "participant_id": "10258072094849116738" }, "type": "message" }, { "from": { - "activity_id": "375304196268652861", - "participant_id": "375304196268652861" + "activity_id": "3002433570149222892", + "participant_id": "3002433570149222892" }, "name": "name()", "return_type": "void", @@ -334,15 +334,15 @@ void tmain() "translation_unit": "t20019.cc" }, "to": { - "activity_id": "1918672956676175365", - "participant_id": "1659477498076328530" + "activity_id": "15349383653409402924", + "participant_id": "13275819984610628244" }, "type": "message" }, { "from": { - "activity_id": "1918672956676175365", - "participant_id": "1659477498076328530" + "activity_id": "15349383653409402924", + "participant_id": "13275819984610628244" }, "name": "impl()", "return_type": "void", @@ -354,14 +354,14 @@ void tmain() "translation_unit": "t20019.cc" }, "to": { - "activity_id": "861400435979772695", - "participant_id": "1307471723138212117" + "activity_id": "6891203487838181565", + "participant_id": "10459773785105696943" }, "type": "message" } ], "start_from": { - "id": 375304196268652861, + "id": "3002433570149222892", "location": "clanguml::t20019::tmain()" } } diff --git a/docs/test_cases/t20019_sequence.svg b/docs/test_cases/t20019_sequence.svg index d581c551..ad2ee0e8 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 891e9311..e636fe44 100644 --- a/docs/test_cases/t20020.md +++ b/docs/test_cases/t20020.md @@ -120,7 +120,7 @@ int tmain() { "display_name": "tmain()", "full_name": "clanguml::t20020::tmain()", - "id": "432124388562400664", + "id": "3456995108499205319", "name": "tmain", "namespace": "clanguml::t20020", "source_location": { @@ -136,7 +136,7 @@ int tmain() { "display_name": "a1()", "full_name": "clanguml::t20020::A::a1()", - "id": "43928675765534701", + "id": "351429406124277608", "name": "a1", "namespace": "", "source_location": { @@ -150,7 +150,7 @@ int tmain() { "display_name": "a5()", "full_name": "clanguml::t20020::A::a5()", - "id": "1613457246223182826", + "id": "12907657969785462610", "name": "a5", "namespace": "", "source_location": { @@ -164,7 +164,7 @@ int tmain() { "display_name": "a2()", "full_name": "clanguml::t20020::A::a2()", - "id": "1289745252290688140", + "id": "10317962018325505121", "name": "a2", "namespace": "", "source_location": { @@ -178,7 +178,7 @@ int tmain() { "display_name": "a3()", "full_name": "clanguml::t20020::A::a3()", - "id": "1983660679554669898", + "id": "15869285436437359185", "name": "a3", "namespace": "", "source_location": { @@ -192,7 +192,7 @@ int tmain() { "display_name": "a4()", "full_name": "clanguml::t20020::A::a4()", - "id": "20573198999978866", + "id": "164585591999830934", "name": "a4", "namespace": "", "source_location": { @@ -206,7 +206,7 @@ int tmain() ], "display_name": "A", "full_name": "clanguml::t20020::A", - "id": "208941846648931609", + "id": "1671534773191452877", "name": "A", "namespace": "clanguml::t20020", "source_location": { @@ -222,7 +222,7 @@ int tmain() { "display_name": "c3(int)", "full_name": "clanguml::t20020::C::c3(int)", - "id": "1303438784842196201", + "id": "10427510278737569612", "name": "c3", "namespace": "", "source_location": { @@ -236,7 +236,7 @@ int tmain() { "display_name": "c1() const", "full_name": "clanguml::t20020::C::c1() const", - "id": "1473521613404783653", + "id": "11788172907238269228", "name": "c1", "namespace": "", "source_location": { @@ -250,7 +250,7 @@ int tmain() { "display_name": "c2() const", "full_name": "clanguml::t20020::C::c2() const", - "id": "1789116382725485914", + "id": "14312931061803887318", "name": "c2", "namespace": "", "source_location": { @@ -264,7 +264,7 @@ int tmain() { "display_name": "log() const", "full_name": "clanguml::t20020::C::log() const", - "id": "635780525021572670", + "id": "5086244200172581365", "name": "log", "namespace": "", "source_location": { @@ -278,7 +278,7 @@ int tmain() ], "display_name": "C", "full_name": "clanguml::t20020::C", - "id": "1562462306909405383", + "id": "12499698455275243071", "name": "C", "namespace": "clanguml::t20020", "source_location": { @@ -294,7 +294,7 @@ int tmain() { "display_name": "b1()", "full_name": "clanguml::t20020::B::b1()", - "id": "542196582335607343", + "id": "4337572658684858744", "name": "b1", "namespace": "", "source_location": { @@ -308,7 +308,7 @@ int tmain() { "display_name": "b2()", "full_name": "clanguml::t20020::B::b2()", - "id": "505760236964179187", + "id": "4046081895713433497", "name": "b2", "namespace": "", "source_location": { @@ -322,7 +322,7 @@ int tmain() { "display_name": "log()", "full_name": "clanguml::t20020::B::log()", - "id": "1436250788704205026", + "id": "11490006309633640210", "name": "log", "namespace": "", "source_location": { @@ -336,7 +336,7 @@ int tmain() ], "display_name": "B", "full_name": "clanguml::t20020::B", - "id": "1342563483612170412", + "id": "10740507868897363302", "name": "B", "namespace": "clanguml::t20020", "source_location": { @@ -352,7 +352,7 @@ int tmain() { "display_name": "d1(int,int)", "full_name": "clanguml::t20020::D::d1(int,int)", - "id": "1780002010052842766", + "id": "14240016080422742133", "name": "d1", "namespace": "", "source_location": { @@ -366,7 +366,7 @@ int tmain() ], "display_name": "D", "full_name": "clanguml::t20020::D", - "id": "1605914310746811866", + "id": "12847314485974494933", "name": "D", "namespace": "clanguml::t20020", "source_location": { @@ -382,14 +382,14 @@ int tmain() { "messages": [ { - "activity_id": "432124388562400664", + "activity_id": "3456995108499205319", "branches": [ { "messages": [ { "from": { - "activity_id": "432124388562400664", - "participant_id": "432124388562400664" + "activity_id": "3456995108499205319", + "participant_id": "3456995108499205319" }, "name": "a1()", "return_type": "int", @@ -401,8 +401,8 @@ int tmain() "translation_unit": "t20020.cc" }, "to": { - "activity_id": "43928675765534701", - "participant_id": "208941846648931609" + "activity_id": "351429406124277608", + "participant_id": "1671534773191452877" }, "type": "message" } @@ -413,8 +413,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "432124388562400664", - "participant_id": "432124388562400664" + "activity_id": "3456995108499205319", + "participant_id": "3456995108499205319" }, "name": "a5()", "return_type": "int", @@ -426,8 +426,8 @@ int tmain() "translation_unit": "t20020.cc" }, "to": { - "activity_id": "1613457246223182826", - "participant_id": "208941846648931609" + "activity_id": "12907657969785462610", + "participant_id": "1671534773191452877" }, "type": "message" } @@ -437,14 +437,14 @@ int tmain() { "messages": [ { - "activity_id": "432124388562400664", + "activity_id": "3456995108499205319", "branches": [ { "messages": [ { "from": { - "activity_id": "432124388562400664", - "participant_id": "432124388562400664" + "activity_id": "3456995108499205319", + "participant_id": "3456995108499205319" }, "name": "a2()", "return_type": "int", @@ -456,15 +456,15 @@ int tmain() "translation_unit": "t20020.cc" }, "to": { - "activity_id": "1289745252290688140", - "participant_id": "208941846648931609" + "activity_id": "10317962018325505121", + "participant_id": "1671534773191452877" }, "type": "message" }, { "from": { - "activity_id": "432124388562400664", - "participant_id": "432124388562400664" + "activity_id": "3456995108499205319", + "participant_id": "3456995108499205319" }, "name": "c3(int)", "return_type": "int", @@ -476,15 +476,15 @@ int tmain() "translation_unit": "t20020.cc" }, "to": { - "activity_id": "1303438784842196201", - "participant_id": "1562462306909405383" + "activity_id": "10427510278737569612", + "participant_id": "12499698455275243071" }, "type": "message" }, { "from": { - "activity_id": "432124388562400664", - "participant_id": "432124388562400664" + "activity_id": "3456995108499205319", + "participant_id": "3456995108499205319" }, "name": "b1()", "return_type": "int", @@ -496,8 +496,8 @@ int tmain() "translation_unit": "t20020.cc" }, "to": { - "activity_id": "542196582335607343", - "participant_id": "1342563483612170412" + "activity_id": "4337572658684858744", + "participant_id": "10740507868897363302" }, "type": "message" } @@ -508,8 +508,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "432124388562400664", - "participant_id": "432124388562400664" + "activity_id": "3456995108499205319", + "participant_id": "3456995108499205319" }, "name": "a3()", "return_type": "int", @@ -521,15 +521,15 @@ int tmain() "translation_unit": "t20020.cc" }, "to": { - "activity_id": "1983660679554669898", - "participant_id": "208941846648931609" + "activity_id": "15869285436437359185", + "participant_id": "1671534773191452877" }, "type": "message" }, { "from": { - "activity_id": "432124388562400664", - "participant_id": "432124388562400664" + "activity_id": "3456995108499205319", + "participant_id": "3456995108499205319" }, "name": "b2()", "return_type": "int", @@ -541,8 +541,8 @@ int tmain() "translation_unit": "t20020.cc" }, "to": { - "activity_id": "505760236964179187", - "participant_id": "1342563483612170412" + "activity_id": "4046081895713433497", + "participant_id": "10740507868897363302" }, "type": "message" } @@ -560,8 +560,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "432124388562400664", - "participant_id": "432124388562400664" + "activity_id": "3456995108499205319", + "participant_id": "3456995108499205319" }, "name": "a4()", "return_type": "int", @@ -573,8 +573,8 @@ int tmain() "translation_unit": "t20020.cc" }, "to": { - "activity_id": "20573198999978866", - "participant_id": "208941846648931609" + "activity_id": "164585591999830934", + "participant_id": "1671534773191452877" }, "type": "message" } @@ -587,8 +587,8 @@ int tmain() }, { "from": { - "activity_id": "432124388562400664", - "participant_id": "432124388562400664" + "activity_id": "3456995108499205319", + "participant_id": "3456995108499205319" }, "name": "log()", "return_type": "void", @@ -600,20 +600,20 @@ int tmain() "translation_unit": "t20020.cc" }, "to": { - "activity_id": "1436250788704205026", - "participant_id": "1342563483612170412" + "activity_id": "11490006309633640210", + "participant_id": "10740507868897363302" }, "type": "message" }, { - "activity_id": "432124388562400664", + "activity_id": "3456995108499205319", "branches": [ { "messages": [ { "from": { - "activity_id": "432124388562400664", - "participant_id": "432124388562400664" + "activity_id": "3456995108499205319", + "participant_id": "3456995108499205319" }, "name": "c1() const", "return_type": "void", @@ -625,20 +625,20 @@ int tmain() "translation_unit": "t20020.cc" }, "to": { - "activity_id": "1473521613404783653", - "participant_id": "1562462306909405383" + "activity_id": "11788172907238269228", + "participant_id": "12499698455275243071" }, "type": "message" }, { - "activity_id": "1473521613404783653", + "activity_id": "11788172907238269228", "branches": [ { "messages": [ { "from": { - "activity_id": "1473521613404783653", - "participant_id": "1562462306909405383" + "activity_id": "11788172907238269228", + "participant_id": "12499698455275243071" }, "name": "c2() const", "return_type": "bool", @@ -650,15 +650,15 @@ int tmain() "translation_unit": "t20020.cc" }, "to": { - "activity_id": "1789116382725485914", - "participant_id": "1562462306909405383" + "activity_id": "14312931061803887318", + "participant_id": "12499698455275243071" }, "type": "message" }, { "from": { - "activity_id": "1473521613404783653", - "participant_id": "1562462306909405383" + "activity_id": "11788172907238269228", + "participant_id": "12499698455275243071" }, "name": "log() const", "return_type": "void", @@ -670,8 +670,8 @@ int tmain() "translation_unit": "t20020.cc" }, "to": { - "activity_id": "635780525021572670", - "participant_id": "1562462306909405383" + "activity_id": "5086244200172581365", + "participant_id": "12499698455275243071" }, "type": "message" } @@ -690,14 +690,14 @@ int tmain() "type": "alt" }, { - "activity_id": "432124388562400664", + "activity_id": "3456995108499205319", "branches": [ { "messages": [ { "from": { - "activity_id": "432124388562400664", - "participant_id": "432124388562400664" + "activity_id": "3456995108499205319", + "participant_id": "3456995108499205319" }, "name": "d1(int,int)", "return_type": "int", @@ -709,8 +709,8 @@ int tmain() "translation_unit": "t20020.cc" }, "to": { - "activity_id": "1780002010052842766", - "participant_id": "1605914310746811866" + "activity_id": "14240016080422742133", + "participant_id": "12847314485974494933" }, "type": "message" } @@ -723,7 +723,7 @@ int tmain() } ], "start_from": { - "id": 432124388562400664, + "id": "3456995108499205319", "location": "clanguml::t20020::tmain()" } } diff --git a/docs/test_cases/t20020_sequence.svg b/docs/test_cases/t20020_sequence.svg index cdf48caa..a2ffa58c 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 64a335e5..9dfba424 100644 --- a/docs/test_cases/t20021.md +++ b/docs/test_cases/t20021.md @@ -87,7 +87,7 @@ int tmain() { "display_name": "tmain()", "full_name": "clanguml::t20021::tmain()", - "id": "1682631020380557915", + "id": "13461048163044463326", "name": "tmain", "namespace": "clanguml::t20021", "source_location": { @@ -103,7 +103,7 @@ int tmain() { "display_name": "c4()", "full_name": "clanguml::t20021::C::c4()", - "id": "124927877622321176", + "id": "999423020978569411", "name": "c4", "namespace": "", "source_location": { @@ -117,7 +117,7 @@ int tmain() { "display_name": "c5()", "full_name": "clanguml::t20021::C::c5()", - "id": "1325720714179808628", + "id": "10605765713438469028", "name": "c5", "namespace": "", "source_location": { @@ -131,7 +131,7 @@ int tmain() { "display_name": "c1()", "full_name": "clanguml::t20021::C::c1()", - "id": "2143764740072323303", + "id": "17150117920578586424", "name": "c1", "namespace": "", "source_location": { @@ -145,7 +145,7 @@ int tmain() { "display_name": "c2()", "full_name": "clanguml::t20021::C::c2()", - "id": "1707693479408501017", + "id": "13661547835268008141", "name": "c2", "namespace": "", "source_location": { @@ -159,7 +159,7 @@ int tmain() { "display_name": "c3()", "full_name": "clanguml::t20021::C::c3()", - "id": "1302892753246800390", + "id": "10423142025974403121", "name": "c3", "namespace": "", "source_location": { @@ -173,7 +173,7 @@ int tmain() { "display_name": "contents()", "full_name": "clanguml::t20021::C::contents()", - "id": "814405216385697964", + "id": "6515241731085583713", "name": "contents", "namespace": "", "source_location": { @@ -187,7 +187,7 @@ int tmain() ], "display_name": "C", "full_name": "clanguml::t20021::C", - "id": "451128000259357438", + "id": "3609024002074859509", "name": "C", "namespace": "clanguml::t20021", "source_location": { @@ -203,7 +203,7 @@ int tmain() { "display_name": "a3()", "full_name": "clanguml::t20021::A::a3()", - "id": "1867955233624891190", + "id": "14943641868999129521", "name": "a3", "namespace": "", "source_location": { @@ -217,7 +217,7 @@ int tmain() { "display_name": "a2()", "full_name": "clanguml::t20021::A::a2()", - "id": "1139294797758415018", + "id": "9114358382067320148", "name": "a2", "namespace": "", "source_location": { @@ -231,7 +231,7 @@ int tmain() { "display_name": "a1()", "full_name": "clanguml::t20021::A::a1()", - "id": "1659488549696810992", + "id": "13275908397574487940", "name": "a1", "namespace": "", "source_location": { @@ -245,7 +245,7 @@ int tmain() ], "display_name": "A", "full_name": "clanguml::t20021::A", - "id": "1280483607329510730", + "id": "10243868858636085846", "name": "A", "namespace": "clanguml::t20021", "source_location": { @@ -261,7 +261,7 @@ int tmain() { "display_name": "b2() const", "full_name": "clanguml::t20021::B::b2() const", - "id": "1561040999276563077", + "id": "12488327994212504617", "name": "b2", "namespace": "", "source_location": { @@ -275,7 +275,7 @@ int tmain() ], "display_name": "B", "full_name": "clanguml::t20021::B", - "id": "1849696080443395393", + "id": "14797568643547163151", "name": "B", "namespace": "clanguml::t20021", "source_location": { @@ -291,12 +291,12 @@ int tmain() { "messages": [ { - "activity_id": "1682631020380557915", + "activity_id": "13461048163044463326", "messages": [ { "from": { - "activity_id": "1682631020380557915", - "participant_id": "1682631020380557915" + "activity_id": "13461048163044463326", + "participant_id": "13461048163044463326" }, "name": "c4()", "return_type": "int", @@ -308,15 +308,15 @@ int tmain() "translation_unit": "t20021.cc" }, "to": { - "activity_id": "124927877622321176", - "participant_id": "451128000259357438" + "activity_id": "999423020978569411", + "participant_id": "3609024002074859509" }, "type": "message" }, { "from": { - "activity_id": "124927877622321176", - "participant_id": "451128000259357438" + "activity_id": "999423020978569411", + "participant_id": "3609024002074859509" }, "name": "c5()", "return_type": "int", @@ -328,15 +328,15 @@ int tmain() "translation_unit": "t20021.cc" }, "to": { - "activity_id": "1325720714179808628", - "participant_id": "451128000259357438" + "activity_id": "10605765713438469028", + "participant_id": "3609024002074859509" }, "type": "message" }, { "from": { - "activity_id": "1682631020380557915", - "participant_id": "1682631020380557915" + "activity_id": "13461048163044463326", + "participant_id": "13461048163044463326" }, "name": "a3()", "return_type": "int", @@ -348,21 +348,21 @@ int tmain() "translation_unit": "t20021.cc" }, "to": { - "activity_id": "1867955233624891190", - "participant_id": "1280483607329510730" + "activity_id": "14943641868999129521", + "participant_id": "10243868858636085846" }, "type": "message" }, { - "activity_id": "1682631020380557915", + "activity_id": "13461048163044463326", "messages": [ { - "activity_id": "1682631020380557915", + "activity_id": "13461048163044463326", "messages": [ { "from": { - "activity_id": "1682631020380557915", - "participant_id": "1682631020380557915" + "activity_id": "13461048163044463326", + "participant_id": "13461048163044463326" }, "name": "a2()", "return_type": "int", @@ -374,15 +374,15 @@ int tmain() "translation_unit": "t20021.cc" }, "to": { - "activity_id": "1139294797758415018", - "participant_id": "1280483607329510730" + "activity_id": "9114358382067320148", + "participant_id": "10243868858636085846" }, "type": "message" }, { "from": { - "activity_id": "1682631020380557915", - "participant_id": "1682631020380557915" + "activity_id": "13461048163044463326", + "participant_id": "13461048163044463326" }, "name": "c1()", "return_type": "int", @@ -394,15 +394,15 @@ int tmain() "translation_unit": "t20021.cc" }, "to": { - "activity_id": "2143764740072323303", - "participant_id": "451128000259357438" + "activity_id": "17150117920578586424", + "participant_id": "3609024002074859509" }, "type": "message" }, { "from": { - "activity_id": "1682631020380557915", - "participant_id": "1682631020380557915" + "activity_id": "13461048163044463326", + "participant_id": "13461048163044463326" }, "name": "c2()", "return_type": "int", @@ -414,15 +414,15 @@ int tmain() "translation_unit": "t20021.cc" }, "to": { - "activity_id": "1707693479408501017", - "participant_id": "451128000259357438" + "activity_id": "13661547835268008141", + "participant_id": "3609024002074859509" }, "type": "message" }, { "from": { - "activity_id": "1682631020380557915", - "participant_id": "1682631020380557915" + "activity_id": "13461048163044463326", + "participant_id": "13461048163044463326" }, "name": "a1()", "return_type": "int", @@ -434,8 +434,8 @@ int tmain() "translation_unit": "t20021.cc" }, "to": { - "activity_id": "1659488549696810992", - "participant_id": "1280483607329510730" + "activity_id": "13275908397574487940", + "participant_id": "10243868858636085846" }, "type": "message" } @@ -445,8 +445,8 @@ int tmain() }, { "from": { - "activity_id": "1682631020380557915", - "participant_id": "1682631020380557915" + "activity_id": "13461048163044463326", + "participant_id": "13461048163044463326" }, "name": "c3()", "return_type": "int", @@ -458,8 +458,8 @@ int tmain() "translation_unit": "t20021.cc" }, "to": { - "activity_id": "1302892753246800390", - "participant_id": "451128000259357438" + "activity_id": "10423142025974403121", + "participant_id": "3609024002074859509" }, "type": "message" } @@ -472,12 +472,12 @@ int tmain() "type": "loop" }, { - "activity_id": "1682631020380557915", + "activity_id": "13461048163044463326", "messages": [ { "from": { - "activity_id": "1682631020380557915", - "participant_id": "1682631020380557915" + "activity_id": "13461048163044463326", + "participant_id": "13461048163044463326" }, "name": "b2() const", "return_type": "int", @@ -489,8 +489,8 @@ int tmain() "translation_unit": "t20021.cc" }, "to": { - "activity_id": "1561040999276563077", - "participant_id": "1849696080443395393" + "activity_id": "12488327994212504617", + "participant_id": "14797568643547163151" }, "type": "message" } @@ -499,12 +499,12 @@ int tmain() "type": "loop" }, { - "activity_id": "1682631020380557915", + "activity_id": "13461048163044463326", "messages": [ { "from": { - "activity_id": "1682631020380557915", - "participant_id": "1682631020380557915" + "activity_id": "13461048163044463326", + "participant_id": "13461048163044463326" }, "name": "contents()", "return_type": "std::vector &", @@ -516,8 +516,8 @@ int tmain() "translation_unit": "t20021.cc" }, "to": { - "activity_id": "814405216385697964", - "participant_id": "451128000259357438" + "activity_id": "6515241731085583713", + "participant_id": "3609024002074859509" }, "type": "message" } @@ -527,8 +527,8 @@ int tmain() }, { "from": { - "activity_id": "1682631020380557915", - "participant_id": "1682631020380557915" + "activity_id": "13461048163044463326", + "participant_id": "13461048163044463326" }, "name": "b2() const", "return_type": "int", @@ -540,14 +540,14 @@ int tmain() "translation_unit": "t20021.cc" }, "to": { - "activity_id": "1561040999276563077", - "participant_id": "1849696080443395393" + "activity_id": "12488327994212504617", + "participant_id": "14797568643547163151" }, "type": "message" } ], "start_from": { - "id": 1682631020380557915, + "id": "13461048163044463326", "location": "clanguml::t20021::tmain()" } } diff --git a/docs/test_cases/t20021_sequence.svg b/docs/test_cases/t20021_sequence.svg index 44adb93d..8e676933 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 f359bdc8..b44f3c4e 100644 --- a/docs/test_cases/t20022.md +++ b/docs/test_cases/t20022.md @@ -67,7 +67,7 @@ int tmain() { "display_name": "tmain()", "full_name": "clanguml::t20022::tmain()", - "id": "1374011101998494743", + "id": "10992088815987957949", "name": "tmain", "namespace": "clanguml::t20022", "source_location": { @@ -83,7 +83,7 @@ int tmain() { "display_name": "A(std::unique_ptr)", "full_name": "clanguml::t20022::A::A(std::unique_ptr)", - "id": "1226569306557207632", + "id": "9812554452457661061", "name": "A", "namespace": "", "source_location": { @@ -97,7 +97,7 @@ int tmain() { "display_name": "a()", "full_name": "clanguml::t20022::A::a()", - "id": "1158824701633811441", + "id": "9270597613070491528", "name": "a", "namespace": "", "source_location": { @@ -111,7 +111,7 @@ int tmain() ], "display_name": "A", "full_name": "clanguml::t20022::A", - "id": "1535467498096081224", + "id": "12283739984768649794", "name": "A", "namespace": "clanguml::t20022", "source_location": { @@ -127,7 +127,7 @@ int tmain() { "display_name": "b()", "full_name": "clanguml::t20022::B::b()", - "id": "2114222968575993291", + "id": "16913783748607946332", "name": "b", "namespace": "", "source_location": { @@ -141,7 +141,7 @@ int tmain() ], "display_name": "B", "full_name": "clanguml::t20022::B", - "id": "1316821731069034940", + "id": "10534573848552279523", "name": "B", "namespace": "clanguml::t20022", "source_location": { @@ -158,8 +158,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "1374011101998494743", - "participant_id": "1374011101998494743" + "activity_id": "10992088815987957949", + "participant_id": "10992088815987957949" }, "name": "A(std::unique_ptr)", "return_type": "void", @@ -171,15 +171,15 @@ int tmain() "translation_unit": "t20022.cc" }, "to": { - "activity_id": "1226569306557207632", - "participant_id": "1535467498096081224" + "activity_id": "9812554452457661061", + "participant_id": "12283739984768649794" }, "type": "message" }, { "from": { - "activity_id": "1374011101998494743", - "participant_id": "1374011101998494743" + "activity_id": "10992088815987957949", + "participant_id": "10992088815987957949" }, "name": "a()", "return_type": "void", @@ -191,15 +191,15 @@ int tmain() "translation_unit": "t20022.cc" }, "to": { - "activity_id": "1158824701633811441", - "participant_id": "1535467498096081224" + "activity_id": "9270597613070491528", + "participant_id": "12283739984768649794" }, "type": "message" }, { "from": { - "activity_id": "1158824701633811441", - "participant_id": "1535467498096081224" + "activity_id": "9270597613070491528", + "participant_id": "12283739984768649794" }, "name": "b()", "return_type": "void", @@ -211,14 +211,14 @@ int tmain() "translation_unit": "t20022.cc" }, "to": { - "activity_id": "2114222968575993291", - "participant_id": "1316821731069034940" + "activity_id": "16913783748607946332", + "participant_id": "10534573848552279523" }, "type": "message" } ], "start_from": { - "id": 1374011101998494743, + "id": "10992088815987957949", "location": "clanguml::t20022::tmain()" } } diff --git a/docs/test_cases/t20022_sequence.svg b/docs/test_cases/t20022_sequence.svg index 48b89bae..01cb987a 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 bdcac722..d2f291a4 100644 --- a/docs/test_cases/t20023.md +++ b/docs/test_cases/t20023.md @@ -70,7 +70,7 @@ int tmain() { "display_name": "tmain()", "full_name": "clanguml::t20023::tmain()", - "id": "761552264135157511", + "id": "6092418113081260088", "name": "tmain", "namespace": "clanguml::t20023", "source_location": { @@ -86,7 +86,7 @@ int tmain() { "display_name": "a()", "full_name": "clanguml::t20023::A::a()", - "id": "530651320277188697", + "id": "4245210562217509581", "name": "a", "namespace": "", "source_location": { @@ -100,7 +100,7 @@ int tmain() { "display_name": "a1()", "full_name": "clanguml::t20023::A::a1()", - "id": "94135113932519208", + "id": "753080911460153665", "name": "a1", "namespace": "", "source_location": { @@ -114,7 +114,7 @@ int tmain() { "display_name": "a2()", "full_name": "clanguml::t20023::A::a2()", - "id": "2060438178899014465", + "id": "16483505431192115726", "name": "a2", "namespace": "", "source_location": { @@ -128,7 +128,7 @@ int tmain() { "display_name": "a3()", "full_name": "clanguml::t20023::A::a3()", - "id": "1776927259621603017", + "id": "14215418076972824143", "name": "a3", "namespace": "", "source_location": { @@ -142,7 +142,7 @@ int tmain() { "display_name": "a4()", "full_name": "clanguml::t20023::A::a4()", - "id": "1082587698374248813", + "id": "8660701586993990509", "name": "a4", "namespace": "", "source_location": { @@ -156,7 +156,7 @@ int tmain() ], "display_name": "A", "full_name": "clanguml::t20023::A", - "id": "750638294800359616", + "id": "6005106358402876931", "name": "A", "namespace": "clanguml::t20023", "source_location": { @@ -173,8 +173,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "761552264135157511", - "participant_id": "761552264135157511" + "activity_id": "6092418113081260088", + "participant_id": "6092418113081260088" }, "name": "a()", "return_type": "int", @@ -186,20 +186,20 @@ int tmain() "translation_unit": "t20023.cc" }, "to": { - "activity_id": "530651320277188697", - "participant_id": "750638294800359616" + "activity_id": "4245210562217509581", + "participant_id": "6005106358402876931" }, "type": "message" }, { - "activity_id": "530651320277188697", + "activity_id": "4245210562217509581", "branches": [ { "messages": [ { "from": { - "activity_id": "530651320277188697", - "participant_id": "750638294800359616" + "activity_id": "4245210562217509581", + "participant_id": "6005106358402876931" }, "name": "a1()", "return_type": "int", @@ -211,8 +211,8 @@ int tmain() "translation_unit": "t20023.cc" }, "to": { - "activity_id": "94135113932519208", - "participant_id": "750638294800359616" + "activity_id": "753080911460153665", + "participant_id": "6005106358402876931" }, "type": "message" } @@ -223,8 +223,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "530651320277188697", - "participant_id": "750638294800359616" + "activity_id": "4245210562217509581", + "participant_id": "6005106358402876931" }, "name": "a2()", "return_type": "int", @@ -236,8 +236,8 @@ int tmain() "translation_unit": "t20023.cc" }, "to": { - "activity_id": "2060438178899014465", - "participant_id": "750638294800359616" + "activity_id": "16483505431192115726", + "participant_id": "6005106358402876931" }, "type": "message" } @@ -248,8 +248,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "530651320277188697", - "participant_id": "750638294800359616" + "activity_id": "4245210562217509581", + "participant_id": "6005106358402876931" }, "name": "a3()", "return_type": "int", @@ -261,8 +261,8 @@ int tmain() "translation_unit": "t20023.cc" }, "to": { - "activity_id": "1776927259621603017", - "participant_id": "750638294800359616" + "activity_id": "14215418076972824143", + "participant_id": "6005106358402876931" }, "type": "message" } @@ -273,8 +273,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "530651320277188697", - "participant_id": "750638294800359616" + "activity_id": "4245210562217509581", + "participant_id": "6005106358402876931" }, "name": "a4()", "return_type": "int", @@ -286,8 +286,8 @@ int tmain() "translation_unit": "t20023.cc" }, "to": { - "activity_id": "1082587698374248813", - "participant_id": "750638294800359616" + "activity_id": "8660701586993990509", + "participant_id": "6005106358402876931" }, "type": "message" } @@ -300,7 +300,7 @@ int tmain() } ], "start_from": { - "id": 761552264135157511, + "id": "6092418113081260088", "location": "clanguml::t20023::tmain()" } } diff --git a/docs/test_cases/t20023_sequence.svg b/docs/test_cases/t20023_sequence.svg index 4b9f8dee..6987b8b1 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 165f4a38..fd4b7bab 100644 --- a/docs/test_cases/t20024.md +++ b/docs/test_cases/t20024.md @@ -95,7 +95,7 @@ int tmain() { "display_name": "tmain()", "full_name": "clanguml::t20024::tmain()", - "id": "1919714441225983014", + "id": "15357715529807864116", "name": "tmain", "namespace": "clanguml::t20024", "source_location": { @@ -111,7 +111,7 @@ int tmain() { "display_name": "select(enum_a)", "full_name": "clanguml::t20024::A::select(enum_a)", - "id": "1200587047701031901", + "id": "9604696381608255214", "name": "select", "namespace": "", "source_location": { @@ -125,7 +125,7 @@ int tmain() { "display_name": "a0()", "full_name": "clanguml::t20024::A::a0()", - "id": "1859614580641799156", + "id": "14876916645134393248", "name": "a0", "namespace": "", "source_location": { @@ -139,7 +139,7 @@ int tmain() { "display_name": "a1()", "full_name": "clanguml::t20024::A::a1()", - "id": "501598940454911460", + "id": "4012791523639291685", "name": "a1", "namespace": "", "source_location": { @@ -153,7 +153,7 @@ int tmain() { "display_name": "a2()", "full_name": "clanguml::t20024::A::a2()", - "id": "1698866541173753340", + "id": "13590932329390026727", "name": "a2", "namespace": "", "source_location": { @@ -167,7 +167,7 @@ int tmain() { "display_name": "a3()", "full_name": "clanguml::t20024::A::a3()", - "id": "490376438551958259", + "id": "3923011508415666073", "name": "a3", "namespace": "", "source_location": { @@ -181,7 +181,7 @@ int tmain() ], "display_name": "A", "full_name": "clanguml::t20024::A", - "id": "40786919835708828", + "id": "326295358685670625", "name": "A", "namespace": "clanguml::t20024", "source_location": { @@ -197,7 +197,7 @@ int tmain() { "display_name": "select(colors)", "full_name": "clanguml::t20024::B::select(colors)", - "id": "286108218156977422", + "id": "2288865745255819378", "name": "select", "namespace": "", "source_location": { @@ -211,7 +211,7 @@ int tmain() { "display_name": "red()", "full_name": "clanguml::t20024::B::red()", - "id": "112014563206084467", + "id": "896116505648675742", "name": "red", "namespace": "", "source_location": { @@ -225,7 +225,7 @@ int tmain() { "display_name": "orange()", "full_name": "clanguml::t20024::B::orange()", - "id": "2222823236498505185", + "id": "17782585891988041480", "name": "orange", "namespace": "", "source_location": { @@ -239,7 +239,7 @@ int tmain() { "display_name": "green()", "full_name": "clanguml::t20024::B::green()", - "id": "519021723720658376", + "id": "4152173789765267015", "name": "green", "namespace": "", "source_location": { @@ -253,7 +253,7 @@ int tmain() { "display_name": "grey()", "full_name": "clanguml::t20024::B::grey()", - "id": "1813557671878544737", + "id": "14508461375028357896", "name": "grey", "namespace": "", "source_location": { @@ -267,7 +267,7 @@ int tmain() ], "display_name": "B", "full_name": "clanguml::t20024::B", - "id": "933287014626440872", + "id": "7466296117011526976", "name": "B", "namespace": "clanguml::t20024", "source_location": { @@ -284,8 +284,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "1919714441225983014", - "participant_id": "1919714441225983014" + "activity_id": "15357715529807864116", + "participant_id": "15357715529807864116" }, "name": "select(enum_a)", "return_type": "int", @@ -297,20 +297,20 @@ int tmain() "translation_unit": "t20024.cc" }, "to": { - "activity_id": "1200587047701031901", - "participant_id": "40786919835708828" + "activity_id": "9604696381608255214", + "participant_id": "326295358685670625" }, "type": "message" }, { - "activity_id": "1200587047701031901", + "activity_id": "9604696381608255214", "branches": [ { "messages": [ { "from": { - "activity_id": "1200587047701031901", - "participant_id": "40786919835708828" + "activity_id": "9604696381608255214", + "participant_id": "326295358685670625" }, "name": "a0()", "return_type": "int", @@ -322,8 +322,8 @@ int tmain() "translation_unit": "t20024.cc" }, "to": { - "activity_id": "1859614580641799156", - "participant_id": "40786919835708828" + "activity_id": "14876916645134393248", + "participant_id": "326295358685670625" }, "type": "message" } @@ -335,8 +335,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "1200587047701031901", - "participant_id": "40786919835708828" + "activity_id": "9604696381608255214", + "participant_id": "326295358685670625" }, "name": "a1()", "return_type": "int", @@ -348,8 +348,8 @@ int tmain() "translation_unit": "t20024.cc" }, "to": { - "activity_id": "501598940454911460", - "participant_id": "40786919835708828" + "activity_id": "4012791523639291685", + "participant_id": "326295358685670625" }, "type": "message" } @@ -361,8 +361,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "1200587047701031901", - "participant_id": "40786919835708828" + "activity_id": "9604696381608255214", + "participant_id": "326295358685670625" }, "name": "a2()", "return_type": "int", @@ -374,8 +374,8 @@ int tmain() "translation_unit": "t20024.cc" }, "to": { - "activity_id": "1698866541173753340", - "participant_id": "40786919835708828" + "activity_id": "13590932329390026727", + "participant_id": "326295358685670625" }, "type": "message" } @@ -387,8 +387,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "1200587047701031901", - "participant_id": "40786919835708828" + "activity_id": "9604696381608255214", + "participant_id": "326295358685670625" }, "name": "a3()", "return_type": "int", @@ -400,8 +400,8 @@ int tmain() "translation_unit": "t20024.cc" }, "to": { - "activity_id": "490376438551958259", - "participant_id": "40786919835708828" + "activity_id": "3923011508415666073", + "participant_id": "326295358685670625" }, "type": "message" } @@ -415,8 +415,8 @@ int tmain() }, { "from": { - "activity_id": "1919714441225983014", - "participant_id": "1919714441225983014" + "activity_id": "15357715529807864116", + "participant_id": "15357715529807864116" }, "name": "select(colors)", "return_type": "void", @@ -428,20 +428,20 @@ int tmain() "translation_unit": "t20024.cc" }, "to": { - "activity_id": "286108218156977422", - "participant_id": "933287014626440872" + "activity_id": "2288865745255819378", + "participant_id": "7466296117011526976" }, "type": "message" }, { - "activity_id": "286108218156977422", + "activity_id": "2288865745255819378", "branches": [ { "messages": [ { "from": { - "activity_id": "286108218156977422", - "participant_id": "933287014626440872" + "activity_id": "2288865745255819378", + "participant_id": "7466296117011526976" }, "name": "red()", "return_type": "void", @@ -453,8 +453,8 @@ int tmain() "translation_unit": "t20024.cc" }, "to": { - "activity_id": "112014563206084467", - "participant_id": "933287014626440872" + "activity_id": "896116505648675742", + "participant_id": "7466296117011526976" }, "type": "message" } @@ -466,8 +466,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "286108218156977422", - "participant_id": "933287014626440872" + "activity_id": "2288865745255819378", + "participant_id": "7466296117011526976" }, "name": "orange()", "return_type": "void", @@ -479,8 +479,8 @@ int tmain() "translation_unit": "t20024.cc" }, "to": { - "activity_id": "2222823236498505185", - "participant_id": "933287014626440872" + "activity_id": "17782585891988041480", + "participant_id": "7466296117011526976" }, "type": "message" } @@ -492,8 +492,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "286108218156977422", - "participant_id": "933287014626440872" + "activity_id": "2288865745255819378", + "participant_id": "7466296117011526976" }, "name": "green()", "return_type": "void", @@ -505,8 +505,8 @@ int tmain() "translation_unit": "t20024.cc" }, "to": { - "activity_id": "519021723720658376", - "participant_id": "933287014626440872" + "activity_id": "4152173789765267015", + "participant_id": "7466296117011526976" }, "type": "message" } @@ -518,8 +518,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "286108218156977422", - "participant_id": "933287014626440872" + "activity_id": "2288865745255819378", + "participant_id": "7466296117011526976" }, "name": "grey()", "return_type": "void", @@ -531,8 +531,8 @@ int tmain() "translation_unit": "t20024.cc" }, "to": { - "activity_id": "1813557671878544737", - "participant_id": "933287014626440872" + "activity_id": "14508461375028357896", + "participant_id": "7466296117011526976" }, "type": "message" } @@ -546,7 +546,7 @@ int tmain() } ], "start_from": { - "id": 1919714441225983014, + "id": "15357715529807864116", "location": "clanguml::t20024::tmain()" } } diff --git a/docs/test_cases/t20024_sequence.svg b/docs/test_cases/t20024_sequence.svg index 967cbcc9..7e0829d8 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 58d9263c..09dd532f 100644 --- a/docs/test_cases/t20025.md +++ b/docs/test_cases/t20025.md @@ -75,7 +75,7 @@ int tmain() { "display_name": "tmain()", "full_name": "clanguml::t20025::tmain()", - "id": "1268545806896171690", + "id": "10148366455169373526", "name": "tmain", "namespace": "clanguml::t20025", "source_location": { @@ -91,7 +91,7 @@ int tmain() { "display_name": "a()", "full_name": "clanguml::t20025::A::a()", - "id": "1119830104994271584", + "id": "8958640839954172672", "name": "a", "namespace": "", "source_location": { @@ -105,7 +105,7 @@ int tmain() ], "display_name": "A", "full_name": "clanguml::t20025::A", - "id": "2144852170258286289", + "id": "17158817362066290314", "name": "A", "namespace": "clanguml::t20025", "source_location": { @@ -119,7 +119,7 @@ int tmain() { "display_name": "add(int,int)", "full_name": "clanguml::t20025::add(int,int)", - "id": "228843323046630374", + "id": "1830746584373042997", "name": "add", "namespace": "clanguml::t20025", "source_location": { @@ -136,8 +136,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "1268545806896171690", - "participant_id": "1268545806896171690" + "activity_id": "10148366455169373526", + "participant_id": "10148366455169373526" }, "name": "a()", "return_type": "int", @@ -149,15 +149,15 @@ int tmain() "translation_unit": "t20025.cc" }, "to": { - "activity_id": "1119830104994271584", - "participant_id": "2144852170258286289" + "activity_id": "8958640839954172672", + "participant_id": "17158817362066290314" }, "type": "message" }, { "from": { - "activity_id": "1268545806896171690", - "participant_id": "1268545806896171690" + "activity_id": "10148366455169373526", + "participant_id": "10148366455169373526" }, "name": "", "return_type": "int", @@ -169,14 +169,14 @@ int tmain() "translation_unit": "t20025.cc" }, "to": { - "activity_id": "228843323046630374", - "participant_id": "228843323046630374" + "activity_id": "1830746584373042997", + "participant_id": "1830746584373042997" }, "type": "message" } ], "start_from": { - "id": 1268545806896171690, + "id": "10148366455169373526", "location": "clanguml::t20025::tmain()" } } diff --git a/docs/test_cases/t20025_sequence.svg b/docs/test_cases/t20025_sequence.svg index 2d87982f..8aac2f67 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 8f0091ce..e177a93a 100644 --- a/docs/test_cases/t20026.md +++ b/docs/test_cases/t20026.md @@ -55,7 +55,7 @@ int tmain() { "display_name": "tmain()", "full_name": "clanguml::t20026::tmain()", - "id": "2268697350307997040", + "id": "18149578802463976326", "name": "tmain", "namespace": "clanguml::t20026", "source_location": { @@ -71,7 +71,7 @@ int tmain() { "display_name": "a()", "full_name": "clanguml::t20026::A::a()", - "id": "600590770418147864", + "id": "4804726163345182918", "name": "a", "namespace": "", "source_location": { @@ -85,7 +85,7 @@ int tmain() ], "display_name": "A", "full_name": "clanguml::t20026::A", - "id": "1962121823853291899", + "id": "15696974590826335197", "name": "A", "namespace": "clanguml::t20026", "source_location": { @@ -102,8 +102,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "2268697350307997040", - "participant_id": "2268697350307997040" + "activity_id": "18149578802463976326", + "participant_id": "18149578802463976326" }, "name": "a()", "return_type": "void", @@ -115,14 +115,14 @@ int tmain() "translation_unit": "t20026.cc" }, "to": { - "activity_id": "600590770418147864", - "participant_id": "1962121823853291899" + "activity_id": "4804726163345182918", + "participant_id": "15696974590826335197" }, "type": "message" } ], "start_from": { - "id": 2268697350307997040, + "id": "18149578802463976326", "location": "clanguml::t20026::tmain()" } } diff --git a/docs/test_cases/t20026_sequence.svg b/docs/test_cases/t20026_sequence.svg index edc37c34..f75e4f8e 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 62a2af3e..08dc33a1 100644 --- a/docs/test_cases/t20027.md +++ b/docs/test_cases/t20027.md @@ -54,7 +54,7 @@ void tmain() { "display_name": "tmain()", "full_name": "clanguml::t20027::tmain()", - "id": "1581009482994430286", + "id": "12648075863955442291", "name": "tmain", "namespace": "clanguml::t20027", "source_location": { @@ -70,7 +70,7 @@ void tmain() { "display_name": "a()", "full_name": "clanguml::t20027::A::a()", - "id": "910514967786202717", + "id": "7284119742289621739", "name": "a", "namespace": "", "source_location": { @@ -84,7 +84,7 @@ void tmain() ], "display_name": "A", "full_name": "clanguml::t20027::A", - "id": "583525629936262089", + "id": "4668205039490096719", "name": "A", "namespace": "clanguml::t20027", "source_location": { @@ -101,8 +101,8 @@ void tmain() "messages": [ { "from": { - "activity_id": "1581009482994430286", - "participant_id": "1581009482994430286" + "activity_id": "12648075863955442291", + "participant_id": "12648075863955442291" }, "name": "a()", "return_type": "void", @@ -114,14 +114,14 @@ void tmain() "translation_unit": "t20027.cc" }, "to": { - "activity_id": "910514967786202717", - "participant_id": "583525629936262089" + "activity_id": "7284119742289621739", + "participant_id": "4668205039490096719" }, "type": "message" } ], "start_from": { - "id": 1581009482994430286, + "id": "12648075863955442291", "location": "clanguml::t20027::tmain()" } } diff --git a/docs/test_cases/t20027_sequence.svg b/docs/test_cases/t20027_sequence.svg index f2db60a5..22c82ecb 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 3d05d652..0d46d6ad 100644 --- a/docs/test_cases/t20028.md +++ b/docs/test_cases/t20028.md @@ -64,7 +64,7 @@ int tmain() { "display_name": "tmain()", "full_name": "clanguml::t20028::tmain()", - "id": "1347206662193933194", + "id": "10777653297551465558", "name": "tmain", "namespace": "clanguml::t20028", "source_location": { @@ -80,7 +80,7 @@ int tmain() { "display_name": "a()", "full_name": "clanguml::t20028::A::a()", - "id": "666210834901940781", + "id": "5329686679215526252", "name": "a", "namespace": "", "source_location": { @@ -94,7 +94,7 @@ int tmain() { "display_name": "b()", "full_name": "clanguml::t20028::A::b()", - "id": "793793464184037795", + "id": "6350347713472302364", "name": "b", "namespace": "", "source_location": { @@ -108,7 +108,7 @@ int tmain() { "display_name": "c()", "full_name": "clanguml::t20028::A::c()", - "id": "1582152567698110078", + "id": "12657220541584880625", "name": "c", "namespace": "", "source_location": { @@ -122,7 +122,7 @@ int tmain() { "display_name": "d()", "full_name": "clanguml::t20028::A::d()", - "id": "1178268687951492696", + "id": "9426149503611941573", "name": "d", "namespace": "", "source_location": { @@ -136,7 +136,7 @@ int tmain() ], "display_name": "A", "full_name": "clanguml::t20028::A", - "id": "2073479923903128898", + "id": "16587839391225031190", "name": "A", "namespace": "clanguml::t20028", "source_location": { @@ -152,14 +152,14 @@ int tmain() { "messages": [ { - "activity_id": "1347206662193933194", + "activity_id": "10777653297551465558", "branches": [ { "messages": [ { "from": { - "activity_id": "1347206662193933194", - "participant_id": "1347206662193933194" + "activity_id": "10777653297551465558", + "participant_id": "10777653297551465558" }, "name": "a()", "return_type": "int", @@ -171,15 +171,15 @@ int tmain() "translation_unit": "t20028.cc" }, "to": { - "activity_id": "666210834901940781", - "participant_id": "2073479923903128898" + "activity_id": "5329686679215526252", + "participant_id": "16587839391225031190" }, "type": "message" }, { "from": { - "activity_id": "1347206662193933194", - "participant_id": "1347206662193933194" + "activity_id": "10777653297551465558", + "participant_id": "10777653297551465558" }, "name": "b()", "return_type": "int", @@ -191,15 +191,15 @@ int tmain() "translation_unit": "t20028.cc" }, "to": { - "activity_id": "793793464184037795", - "participant_id": "2073479923903128898" + "activity_id": "6350347713472302364", + "participant_id": "16587839391225031190" }, "type": "message" }, { "from": { - "activity_id": "1347206662193933194", - "participant_id": "1347206662193933194" + "activity_id": "10777653297551465558", + "participant_id": "10777653297551465558" }, "name": "c()", "return_type": "int", @@ -211,8 +211,8 @@ int tmain() "translation_unit": "t20028.cc" }, "to": { - "activity_id": "1582152567698110078", - "participant_id": "2073479923903128898" + "activity_id": "12657220541584880625", + "participant_id": "16587839391225031190" }, "type": "message" } @@ -223,8 +223,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "1347206662193933194", - "participant_id": "1347206662193933194" + "activity_id": "10777653297551465558", + "participant_id": "10777653297551465558" }, "name": "d()", "return_type": "int", @@ -236,8 +236,8 @@ int tmain() "translation_unit": "t20028.cc" }, "to": { - "activity_id": "1178268687951492696", - "participant_id": "2073479923903128898" + "activity_id": "9426149503611941573", + "participant_id": "16587839391225031190" }, "type": "message" } @@ -250,7 +250,7 @@ int tmain() } ], "start_from": { - "id": 1347206662193933194, + "id": "10777653297551465558", "location": "clanguml::t20028::tmain()" } } diff --git a/docs/test_cases/t20028_sequence.svg b/docs/test_cases/t20028_sequence.svg index 18e0b721..8d6ec34a 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 de6b7136..1f83d5c1 100644 --- a/docs/test_cases/t20029.md +++ b/docs/test_cases/t20029.md @@ -117,7 +117,7 @@ int tmain() { "display_name": "tmain()", "full_name": "clanguml::t20029::tmain()", - "id": "2091374738808319642", + "id": "16730997910466557141", "name": "tmain", "namespace": "clanguml::t20029", "source_location": { @@ -133,7 +133,7 @@ int tmain() { "display_name": "send(std::string &&)", "full_name": "clanguml::t20029::Encoder>::send(std::string &&)", - "id": "2026763864005979273", + "id": "16214110912047834185", "name": "send", "namespace": "", "source_location": { @@ -147,7 +147,7 @@ int tmain() { "display_name": "encode(std::string &&)", "full_name": "clanguml::t20029::Encoder>::encode(std::string &&)", - "id": "1468258269466480773", + "id": "11746066155731846187", "name": "encode", "namespace": "", "source_location": { @@ -161,7 +161,7 @@ int tmain() ], "display_name": "Encoder>", "full_name": "clanguml::t20029::Encoder>", - "id": "1673261195873192383", + "id": "13386089566985539066", "name": "Encoder", "namespace": "clanguml::t20029", "source_location": { @@ -177,7 +177,7 @@ int tmain() { "display_name": "send(std::string &&)", "full_name": "clanguml::t20029::Retrier::send(std::string &&)", - "id": "30515971485361302", + "id": "244127771882890417", "name": "send", "namespace": "", "source_location": { @@ -191,7 +191,7 @@ int tmain() ], "display_name": "Retrier", "full_name": "clanguml::t20029::Retrier", - "id": "658058855590948094", + "id": "5264470844727584752", "name": "Retrier", "namespace": "clanguml::t20029", "source_location": { @@ -207,7 +207,7 @@ int tmain() { "display_name": "connect()", "full_name": "clanguml::t20029::ConnectionPool::connect()", - "id": "940428568182104530", + "id": "7523428545456836242", "name": "connect", "namespace": "", "source_location": { @@ -221,7 +221,7 @@ int tmain() { "display_name": "send(const std::string &)", "full_name": "clanguml::t20029::ConnectionPool::send(const std::string &)", - "id": "972625940114169157", + "id": "7781007520913353262", "name": "send", "namespace": "", "source_location": { @@ -235,7 +235,7 @@ int tmain() ], "display_name": "ConnectionPool", "full_name": "clanguml::t20029::ConnectionPool", - "id": "1896406205097618937", + "id": "15171249640780951499", "name": "ConnectionPool", "namespace": "clanguml::t20029", "source_location": { @@ -249,7 +249,7 @@ int tmain() { "display_name": "encode_b64(std::string &&)", "full_name": "clanguml::t20029::encode_b64(std::string &&)", - "id": "1362646431260879440", + "id": "10901171450087035525", "name": "encode_b64", "namespace": "clanguml::t20029", "source_location": { @@ -267,8 +267,8 @@ int tmain() { "comment": "Establish connection to the remote server synchronously", "from": { - "activity_id": "2091374738808319642", - "participant_id": "2091374738808319642" + "activity_id": "16730997910466557141", + "participant_id": "16730997910466557141" }, "name": "connect()", "return_type": "void", @@ -280,23 +280,23 @@ int tmain() "translation_unit": "t20029.cc" }, "to": { - "activity_id": "940428568182104530", - "participant_id": "1896406205097618937" + "activity_id": "7523428545456836242", + "participant_id": "15171249640780951499" }, "type": "message" }, { - "activity_id": "2091374738808319642", + "activity_id": "16730997910466557141", "messages": [ { - "activity_id": "2091374738808319642", + "activity_id": "16730997910466557141", "branches": [ { "messages": [ { "from": { - "activity_id": "2091374738808319642", - "participant_id": "2091374738808319642" + "activity_id": "16730997910466557141", + "participant_id": "16730997910466557141" }, "name": "send(std::string &&)", "return_type": "bool", @@ -308,16 +308,16 @@ int tmain() "translation_unit": "t20029.cc" }, "to": { - "activity_id": "2026763864005979273", - "participant_id": "1673261195873192383" + "activity_id": "16214110912047834185", + "participant_id": "13386089566985539066" }, "type": "message" }, { "comment": "Encode the message using Base64 encoding and pass it to the next\nlayer", "from": { - "activity_id": "2026763864005979273", - "participant_id": "1673261195873192383" + "activity_id": "16214110912047834185", + "participant_id": "13386089566985539066" }, "name": "encode(std::string &&)", "return_type": "std::string", @@ -329,15 +329,15 @@ int tmain() "translation_unit": "t20029.cc" }, "to": { - "activity_id": "1468258269466480773", - "participant_id": "1673261195873192383" + "activity_id": "11746066155731846187", + "participant_id": "13386089566985539066" }, "type": "message" }, { "from": { - "activity_id": "1468258269466480773", - "participant_id": "1673261195873192383" + "activity_id": "11746066155731846187", + "participant_id": "13386089566985539066" }, "name": "", "return_type": "std::string", @@ -349,15 +349,15 @@ int tmain() "translation_unit": "t20029.cc" }, "to": { - "activity_id": "1362646431260879440", - "participant_id": "1362646431260879440" + "activity_id": "10901171450087035525", + "participant_id": "10901171450087035525" }, "type": "message" }, { "from": { - "activity_id": "2026763864005979273", - "participant_id": "1673261195873192383" + "activity_id": "16214110912047834185", + "participant_id": "13386089566985539066" }, "name": "send(std::string &&)", "return_type": "bool", @@ -369,23 +369,23 @@ int tmain() "translation_unit": "t20029.cc" }, "to": { - "activity_id": "30515971485361302", - "participant_id": "658058855590948094" + "activity_id": "244127771882890417", + "participant_id": "5264470844727584752" }, "type": "message" }, { - "activity_id": "30515971485361302", + "activity_id": "244127771882890417", "messages": [ { - "activity_id": "30515971485361302", + "activity_id": "244127771882890417", "branches": [ { "messages": [ { "from": { - "activity_id": "30515971485361302", - "participant_id": "658058855590948094" + "activity_id": "244127771882890417", + "participant_id": "5264470844727584752" }, "name": "send(const std::string &)", "return_type": "bool", @@ -397,8 +397,8 @@ int tmain() "translation_unit": "t20029.cc" }, "to": { - "activity_id": "972625940114169157", - "participant_id": "1896406205097618937" + "activity_id": "7781007520913353262", + "participant_id": "15171249640780951499" }, "type": "message" } @@ -426,7 +426,7 @@ int tmain() } ], "start_from": { - "id": 2091374738808319642, + "id": "16730997910466557141", "location": "clanguml::t20029::tmain()" } } diff --git a/docs/test_cases/t20029_sequence.svg b/docs/test_cases/t20029_sequence.svg index 42fb6a7f..7c62ebb1 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 462dc69a..1a7faf36 100644 --- a/docs/test_cases/t20030.md +++ b/docs/test_cases/t20030.md @@ -82,7 +82,7 @@ int tmain(bool f, int a) { "display_name": "tmain(int)", "full_name": "clanguml::t20030::tmain(int)", - "id": "1264643561983920529", + "id": "10117148495871364237", "name": "tmain", "namespace": "clanguml::t20030", "source_location": { @@ -96,7 +96,7 @@ int tmain(bool f, int a) { "display_name": "magic()", "full_name": "clanguml::t20030::magic()", - "id": "1038740565367213967", + "id": "8309924522937711738", "name": "magic", "namespace": "clanguml::t20030", "source_location": { @@ -112,7 +112,7 @@ int tmain(bool f, int a) { "display_name": "A(int)", "full_name": "clanguml::t20030::A::A(int)", - "id": "2192298168642377389", + "id": "17538385349139019117", "name": "A", "namespace": "", "source_location": { @@ -126,7 +126,7 @@ int tmain(bool f, int a) { "display_name": "operator+=(int)", "full_name": "clanguml::t20030::A::operator+=(int)", - "id": "2032167997122548080", + "id": "16257343976980384640", "name": "operator+=", "namespace": "", "source_location": { @@ -140,7 +140,7 @@ int tmain(bool f, int a) { "display_name": "add(int)", "full_name": "clanguml::t20030::A::add(int)", - "id": "2174827432067616124", + "id": "17398619456540928995", "name": "add", "namespace": "", "source_location": { @@ -154,7 +154,7 @@ int tmain(bool f, int a) { "display_name": "A()", "full_name": "clanguml::t20030::A::A()", - "id": "32184916294885915", + "id": "257479330359087325", "name": "A", "namespace": "", "source_location": { @@ -168,7 +168,7 @@ int tmain(bool f, int a) { "display_name": "create()", "full_name": "clanguml::t20030::A::create()", - "id": "890578100069139188", + "id": "7124624800553113510", "name": "create", "namespace": "", "source_location": { @@ -182,7 +182,7 @@ int tmain(bool f, int a) { "display_name": "operator=(const A &)", "full_name": "clanguml::t20030::A::operator=(const A &)", - "id": "1796303685088700396", + "id": "14370429480709603169", "name": "operator=", "namespace": "", "source_location": { @@ -196,7 +196,7 @@ int tmain(bool f, int a) { "display_name": "set(int)", "full_name": "clanguml::t20030::A::set(int)", - "id": "2212978510776223413", + "id": "17703828086209787307", "name": "set", "namespace": "", "source_location": { @@ -210,7 +210,7 @@ int tmain(bool f, int a) { "display_name": "value() const", "full_name": "clanguml::t20030::A::value() const", - "id": "1754957340376276968", + "id": "14039658723010215747", "name": "value", "namespace": "", "source_location": { @@ -224,7 +224,7 @@ int tmain(bool f, int a) ], "display_name": "A", "full_name": "clanguml::t20030::A", - "id": "1081707114848460702", + "id": "8653656918787685622", "name": "A", "namespace": "clanguml::t20030", "source_location": { @@ -238,7 +238,7 @@ int tmain(bool f, int a) { "display_name": "tmain(bool,int)", "full_name": "clanguml::t20030::tmain(bool,int)", - "id": "36090614888670483", + "id": "288724919109363868", "name": "tmain", "namespace": "clanguml::t20030", "source_location": { @@ -255,8 +255,8 @@ int tmain(bool f, int a) "messages": [ { "from": { - "activity_id": "1264643561983920529", - "participant_id": "1264643561983920529" + "activity_id": "10117148495871364237", + "participant_id": "10117148495871364237" }, "name": "", "return_type": "int", @@ -268,15 +268,15 @@ int tmain(bool f, int a) "translation_unit": "t20030.cc" }, "to": { - "activity_id": "1038740565367213967", - "participant_id": "1038740565367213967" + "activity_id": "8309924522937711738", + "participant_id": "8309924522937711738" }, "type": "message" }, { "from": { - "activity_id": "1264643561983920529", - "participant_id": "1264643561983920529" + "activity_id": "10117148495871364237", + "participant_id": "10117148495871364237" }, "name": "A(int)", "return_type": "void", @@ -288,15 +288,15 @@ int tmain(bool f, int a) "translation_unit": "t20030.cc" }, "to": { - "activity_id": "2192298168642377389", - "participant_id": "1081707114848460702" + "activity_id": "17538385349139019117", + "participant_id": "8653656918787685622" }, "type": "message" }, { "from": { - "activity_id": "1264643561983920529", - "participant_id": "1264643561983920529" + "activity_id": "10117148495871364237", + "participant_id": "10117148495871364237" }, "name": "operator+=(int)", "return_type": "A &", @@ -308,15 +308,15 @@ int tmain(bool f, int a) "translation_unit": "t20030.cc" }, "to": { - "activity_id": "2032167997122548080", - "participant_id": "1081707114848460702" + "activity_id": "16257343976980384640", + "participant_id": "8653656918787685622" }, "type": "message" }, { "from": { - "activity_id": "2032167997122548080", - "participant_id": "1081707114848460702" + "activity_id": "16257343976980384640", + "participant_id": "8653656918787685622" }, "name": "add(int)", "return_type": "void", @@ -328,14 +328,14 @@ int tmain(bool f, int a) "translation_unit": "t20030.cc" }, "to": { - "activity_id": "2174827432067616124", - "participant_id": "1081707114848460702" + "activity_id": "17398619456540928995", + "participant_id": "8653656918787685622" }, "type": "message" } ], "start_from": { - "id": 1264643561983920529, + "id": "10117148495871364237", "location": "clanguml::t20030::tmain(int)" } }, @@ -343,8 +343,8 @@ int tmain(bool f, int a) "messages": [ { "from": { - "activity_id": "36090614888670483", - "participant_id": "36090614888670483" + "activity_id": "288724919109363868", + "participant_id": "288724919109363868" }, "name": "A()", "return_type": "void", @@ -356,15 +356,15 @@ int tmain(bool f, int a) "translation_unit": "t20030.cc" }, "to": { - "activity_id": "32184916294885915", - "participant_id": "1081707114848460702" + "activity_id": "257479330359087325", + "participant_id": "8653656918787685622" }, "type": "message" }, { "from": { - "activity_id": "32184916294885915", - "participant_id": "1081707114848460702" + "activity_id": "257479330359087325", + "participant_id": "8653656918787685622" }, "name": "create()", "return_type": "void", @@ -376,15 +376,15 @@ int tmain(bool f, int a) "translation_unit": "t20030.cc" }, "to": { - "activity_id": "890578100069139188", - "participant_id": "1081707114848460702" + "activity_id": "7124624800553113510", + "participant_id": "8653656918787685622" }, "type": "message" }, { "from": { - "activity_id": "36090614888670483", - "participant_id": "36090614888670483" + "activity_id": "288724919109363868", + "participant_id": "288724919109363868" }, "name": "A()", "return_type": "void", @@ -396,15 +396,15 @@ int tmain(bool f, int a) "translation_unit": "t20030.cc" }, "to": { - "activity_id": "32184916294885915", - "participant_id": "1081707114848460702" + "activity_id": "257479330359087325", + "participant_id": "8653656918787685622" }, "type": "message" }, { "from": { - "activity_id": "32184916294885915", - "participant_id": "1081707114848460702" + "activity_id": "257479330359087325", + "participant_id": "8653656918787685622" }, "name": "create()", "return_type": "void", @@ -416,15 +416,15 @@ int tmain(bool f, int a) "translation_unit": "t20030.cc" }, "to": { - "activity_id": "890578100069139188", - "participant_id": "1081707114848460702" + "activity_id": "7124624800553113510", + "participant_id": "8653656918787685622" }, "type": "message" }, { "from": { - "activity_id": "36090614888670483", - "participant_id": "36090614888670483" + "activity_id": "288724919109363868", + "participant_id": "288724919109363868" }, "name": "operator+=(int)", "return_type": "A &", @@ -436,15 +436,15 @@ int tmain(bool f, int a) "translation_unit": "t20030.cc" }, "to": { - "activity_id": "2032167997122548080", - "participant_id": "1081707114848460702" + "activity_id": "16257343976980384640", + "participant_id": "8653656918787685622" }, "type": "message" }, { "from": { - "activity_id": "2032167997122548080", - "participant_id": "1081707114848460702" + "activity_id": "16257343976980384640", + "participant_id": "8653656918787685622" }, "name": "add(int)", "return_type": "void", @@ -456,15 +456,15 @@ int tmain(bool f, int a) "translation_unit": "t20030.cc" }, "to": { - "activity_id": "2174827432067616124", - "participant_id": "1081707114848460702" + "activity_id": "17398619456540928995", + "participant_id": "8653656918787685622" }, "type": "message" }, { "from": { - "activity_id": "36090614888670483", - "participant_id": "36090614888670483" + "activity_id": "288724919109363868", + "participant_id": "288724919109363868" }, "name": "operator=(const A &)", "return_type": "A &", @@ -476,15 +476,15 @@ int tmain(bool f, int a) "translation_unit": "t20030.cc" }, "to": { - "activity_id": "1796303685088700396", - "participant_id": "1081707114848460702" + "activity_id": "14370429480709603169", + "participant_id": "8653656918787685622" }, "type": "message" }, { "from": { - "activity_id": "1796303685088700396", - "participant_id": "1081707114848460702" + "activity_id": "14370429480709603169", + "participant_id": "8653656918787685622" }, "name": "set(int)", "return_type": "void", @@ -496,15 +496,15 @@ int tmain(bool f, int a) "translation_unit": "t20030.cc" }, "to": { - "activity_id": "2212978510776223413", - "participant_id": "1081707114848460702" + "activity_id": "17703828086209787307", + "participant_id": "8653656918787685622" }, "type": "message" }, { "from": { - "activity_id": "36090614888670483", - "participant_id": "36090614888670483" + "activity_id": "288724919109363868", + "participant_id": "288724919109363868" }, "name": "value() const", "return_type": "int", @@ -516,14 +516,14 @@ int tmain(bool f, int a) "translation_unit": "t20030.cc" }, "to": { - "activity_id": "1754957340376276968", - "participant_id": "1081707114848460702" + "activity_id": "14039658723010215747", + "participant_id": "8653656918787685622" }, "type": "message" } ], "start_from": { - "id": 36090614888670483, + "id": "288724919109363868", "location": "clanguml::t20030::tmain(bool,int)" } } diff --git a/docs/test_cases/t20030_sequence.svg b/docs/test_cases/t20030_sequence.svg index e8cebb5d..fb3f1f0b 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 8122b515..b96e68cb 100644 --- a/docs/test_cases/t20031.md +++ b/docs/test_cases/t20031.md @@ -98,7 +98,7 @@ int tmain(bool f, int a) { "display_name": "tmain(int)", "full_name": "clanguml::t20031::tmain(int)", - "id": "1045973591033429178", + "id": "8367788728267433427", "name": "tmain", "namespace": "clanguml::t20031", "source_location": { @@ -112,7 +112,7 @@ int tmain(bool f, int a) { "display_name": "magic()", "full_name": "clanguml::t20031::magic()", - "id": "2265790048300959619", + "id": "18126320386407676956", "name": "magic", "namespace": "clanguml::t20031", "source_location": { @@ -126,7 +126,7 @@ int tmain(bool f, int a) { "display_name": "tmain(bool,int)", "full_name": "clanguml::t20031::tmain(bool,int)", - "id": "2189754495514350927", + "id": "17518035964114807420", "name": "tmain", "namespace": "clanguml::t20031", "source_location": { @@ -140,7 +140,7 @@ int tmain(bool f, int a) { "display_name": "execute(std::function)", "full_name": "clanguml::t20031::execute(std::function)", - "id": "2230160420908832598", + "id": "17841283367270660784", "name": "execute", "namespace": "clanguml::t20031", "source_location": { @@ -156,7 +156,7 @@ int tmain(bool f, int a) { "display_name": "value() const", "full_name": "clanguml::t20031::A::value() const", - "id": "1089278431155817348", + "id": "8714227449246538789", "name": "value", "namespace": "", "source_location": { @@ -170,7 +170,7 @@ int tmain(bool f, int a) ], "display_name": "A", "full_name": "clanguml::t20031::A", - "id": "1081580052625775404", + "id": "8652640421006203232", "name": "A", "namespace": "clanguml::t20031", "source_location": { @@ -187,8 +187,8 @@ int tmain(bool f, int a) "messages": [ { "from": { - "activity_id": "1045973591033429178", - "participant_id": "1045973591033429178" + "activity_id": "8367788728267433427", + "participant_id": "8367788728267433427" }, "name": "", "return_type": "int", @@ -200,14 +200,14 @@ int tmain(bool f, int a) "translation_unit": "t20031.cc" }, "to": { - "activity_id": "2265790048300959619", - "participant_id": "2265790048300959619" + "activity_id": "18126320386407676956", + "participant_id": "18126320386407676956" }, "type": "message" } ], "start_from": { - "id": 1045973591033429178, + "id": "8367788728267433427", "location": "clanguml::t20031::tmain(int)" } }, @@ -215,8 +215,8 @@ int tmain(bool f, int a) "messages": [ { "from": { - "activity_id": "2189754495514350927", - "participant_id": "2189754495514350927" + "activity_id": "17518035964114807420", + "participant_id": "17518035964114807420" }, "name": "", "return_type": "int", @@ -228,15 +228,15 @@ int tmain(bool f, int a) "translation_unit": "t20031.cc" }, "to": { - "activity_id": "2230160420908832598", - "participant_id": "2230160420908832598" + "activity_id": "17841283367270660784", + "participant_id": "17841283367270660784" }, "type": "message" }, { "from": { - "activity_id": "2189754495514350927", - "participant_id": "2189754495514350927" + "activity_id": "17518035964114807420", + "participant_id": "17518035964114807420" }, "name": "value() const", "return_type": "int", @@ -248,14 +248,14 @@ int tmain(bool f, int a) "translation_unit": "t20031.cc" }, "to": { - "activity_id": "1089278431155817348", - "participant_id": "1081580052625775404" + "activity_id": "8714227449246538789", + "participant_id": "8652640421006203232" }, "type": "message" } ], "start_from": { - "id": 2189754495514350927, + "id": "17518035964114807420", "location": "clanguml::t20031::tmain(bool,int)" } } diff --git a/docs/test_cases/t20031_sequence.svg b/docs/test_cases/t20031_sequence.svg index c22068d2..71b8aaff 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 fc54366c..b945485f 100644 --- a/docs/test_cases/t20032.md +++ b/docs/test_cases/t20032.md @@ -58,7 +58,7 @@ void tmain(int argc, char **argv) { "display_name": "tmain(int,char **)", "full_name": "clanguml::t20032::tmain(int,char **)", - "id": "2159371207846335450", + "id": "17274969662770683600", "name": "tmain", "namespace": "clanguml::t20032", "source_location": { @@ -74,7 +74,7 @@ void tmain(int argc, char **argv) { "display_name": "b(int)", "full_name": "clanguml::t20032::B::b(int)", - "id": "1775727925274471949", + "id": "14205823402195775593", "name": "b", "namespace": "", "source_location": { @@ -88,7 +88,7 @@ void tmain(int argc, char **argv) { "display_name": "b(double)", "full_name": "clanguml::t20032::B::b(double)", - "id": "404223226092650061", + "id": "3233785808741200494", "name": "b", "namespace": "", "source_location": { @@ -102,7 +102,7 @@ void tmain(int argc, char **argv) { "display_name": "b(const char *)", "full_name": "clanguml::t20032::B::b(const char *)", - "id": "1676684483397143166", + "id": "13413475867177145332", "name": "b", "namespace": "", "source_location": { @@ -116,7 +116,7 @@ void tmain(int argc, char **argv) ], "display_name": "B", "full_name": "clanguml::t20032::B", - "id": "775765108342558014", + "id": "6206120866740464113", "name": "B", "namespace": "clanguml::t20032", "source_location": { @@ -132,7 +132,7 @@ void tmain(int argc, char **argv) { "display_name": "a1(int)", "full_name": "clanguml::t20032::A::a1(int)", - "id": "913842443932719355", + "id": "7310739551461754840", "name": "a1", "namespace": "", "source_location": { @@ -146,7 +146,7 @@ void tmain(int argc, char **argv) { "display_name": "a2(double)", "full_name": "clanguml::t20032::A::a2(double)", - "id": "1293114170675037977", + "id": "10344913365400303821", "name": "a2", "namespace": "", "source_location": { @@ -160,7 +160,7 @@ void tmain(int argc, char **argv) { "display_name": "a3(const char *)", "full_name": "clanguml::t20032::A::a3(const char *)", - "id": "2099821524363509275", + "id": "16798572194908074206", "name": "a3", "namespace": "", "source_location": { @@ -174,7 +174,7 @@ void tmain(int argc, char **argv) ], "display_name": "A", "full_name": "clanguml::t20032::A", - "id": "1674177120713592616", + "id": "13393416965708740928", "name": "A", "namespace": "clanguml::t20032", "source_location": { @@ -191,8 +191,8 @@ void tmain(int argc, char **argv) "messages": [ { "from": { - "activity_id": "2159371207846335450", - "participant_id": "2159371207846335450" + "activity_id": "17274969662770683600", + "participant_id": "17274969662770683600" }, "name": "b(int)", "return_type": "int", @@ -204,15 +204,15 @@ void tmain(int argc, char **argv) "translation_unit": "t20032.cc" }, "to": { - "activity_id": "1775727925274471949", - "participant_id": "775765108342558014" + "activity_id": "14205823402195775593", + "participant_id": "6206120866740464113" }, "type": "message" }, { "from": { - "activity_id": "1775727925274471949", - "participant_id": "775765108342558014" + "activity_id": "14205823402195775593", + "participant_id": "6206120866740464113" }, "name": "a1(int)", "return_type": "int", @@ -224,15 +224,15 @@ void tmain(int argc, char **argv) "translation_unit": "t20032.cc" }, "to": { - "activity_id": "913842443932719355", - "participant_id": "1674177120713592616" + "activity_id": "7310739551461754840", + "participant_id": "13393416965708740928" }, "type": "message" }, { "from": { - "activity_id": "2159371207846335450", - "participant_id": "2159371207846335450" + "activity_id": "17274969662770683600", + "participant_id": "17274969662770683600" }, "name": "b(double)", "return_type": "double", @@ -244,15 +244,15 @@ void tmain(int argc, char **argv) "translation_unit": "t20032.cc" }, "to": { - "activity_id": "404223226092650061", - "participant_id": "775765108342558014" + "activity_id": "3233785808741200494", + "participant_id": "6206120866740464113" }, "type": "message" }, { "from": { - "activity_id": "404223226092650061", - "participant_id": "775765108342558014" + "activity_id": "3233785808741200494", + "participant_id": "6206120866740464113" }, "name": "a2(double)", "return_type": "double", @@ -264,15 +264,15 @@ void tmain(int argc, char **argv) "translation_unit": "t20032.cc" }, "to": { - "activity_id": "1293114170675037977", - "participant_id": "1674177120713592616" + "activity_id": "10344913365400303821", + "participant_id": "13393416965708740928" }, "type": "message" }, { "from": { - "activity_id": "2159371207846335450", - "participant_id": "2159371207846335450" + "activity_id": "17274969662770683600", + "participant_id": "17274969662770683600" }, "name": "b(const char *)", "return_type": "const char *", @@ -284,15 +284,15 @@ void tmain(int argc, char **argv) "translation_unit": "t20032.cc" }, "to": { - "activity_id": "1676684483397143166", - "participant_id": "775765108342558014" + "activity_id": "13413475867177145332", + "participant_id": "6206120866740464113" }, "type": "message" }, { "from": { - "activity_id": "1676684483397143166", - "participant_id": "775765108342558014" + "activity_id": "13413475867177145332", + "participant_id": "6206120866740464113" }, "name": "a3(const char *)", "return_type": "const char *", @@ -304,14 +304,14 @@ void tmain(int argc, char **argv) "translation_unit": "t20032.cc" }, "to": { - "activity_id": "2099821524363509275", - "participant_id": "1674177120713592616" + "activity_id": "16798572194908074206", + "participant_id": "13393416965708740928" }, "type": "message" } ], "start_from": { - "id": 2159371207846335450, + "id": "17274969662770683600", "location": "clanguml::t20032::tmain(int,char **)" } } diff --git a/docs/test_cases/t20032_sequence.svg b/docs/test_cases/t20032_sequence.svg index a85c1a98..54a8da91 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 5eb313af..293aad63 100644 --- a/docs/test_cases/t20033.md +++ b/docs/test_cases/t20033.md @@ -96,7 +96,7 @@ int tmain() { "display_name": "tmain()", "full_name": "clanguml::t20033::tmain()", - "id": "2284981553733959328", + "id": "18279852429871674624", "name": "tmain", "namespace": "clanguml::t20033", "source_location": { @@ -112,7 +112,7 @@ int tmain() { "display_name": "a1()", "full_name": "clanguml::t20033::A::a1()", - "id": "558885502745634115", + "id": "4471084021965072922", "name": "a1", "namespace": "", "source_location": { @@ -126,7 +126,7 @@ int tmain() { "display_name": "a2()", "full_name": "clanguml::t20033::A::a2()", - "id": "748502947476611794", + "id": "5988023579812894353", "name": "a2", "namespace": "", "source_location": { @@ -140,7 +140,7 @@ int tmain() { "display_name": "a3()", "full_name": "clanguml::t20033::A::a3()", - "id": "55903385814245839", + "id": "447227086513966713", "name": "a3", "namespace": "", "source_location": { @@ -154,7 +154,7 @@ int tmain() { "display_name": "a4()", "full_name": "clanguml::t20033::A::a4()", - "id": "1686426476339443579", + "id": "13491411810715548635", "name": "a4", "namespace": "", "source_location": { @@ -168,7 +168,7 @@ int tmain() ], "display_name": "A", "full_name": "clanguml::t20033::A", - "id": "615995652843962691", + "id": "4927965222751701533", "name": "A", "namespace": "clanguml::t20033", "source_location": { @@ -184,7 +184,7 @@ int tmain() { "messages": [ { - "activity_id": "2284981553733959328", + "activity_id": "18279852429871674624", "branches": [ { "type": "consequent" @@ -193,8 +193,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "2284981553733959328", - "participant_id": "2284981553733959328" + "activity_id": "18279852429871674624", + "participant_id": "18279852429871674624" }, "name": "a1()", "return_type": "int", @@ -206,8 +206,8 @@ int tmain() "translation_unit": "t20033.cc" }, "to": { - "activity_id": "558885502745634115", - "participant_id": "615995652843962691" + "activity_id": "4471084021965072922", + "participant_id": "4927965222751701533" }, "type": "message" } @@ -218,8 +218,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "2284981553733959328", - "participant_id": "2284981553733959328" + "activity_id": "18279852429871674624", + "participant_id": "18279852429871674624" }, "name": "a2()", "return_type": "int", @@ -231,8 +231,8 @@ int tmain() "translation_unit": "t20033.cc" }, "to": { - "activity_id": "748502947476611794", - "participant_id": "615995652843962691" + "activity_id": "5988023579812894353", + "participant_id": "4927965222751701533" }, "type": "message" } @@ -243,8 +243,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "2284981553733959328", - "participant_id": "2284981553733959328" + "activity_id": "18279852429871674624", + "participant_id": "18279852429871674624" }, "name": "a2()", "return_type": "int", @@ -256,15 +256,15 @@ int tmain() "translation_unit": "t20033.cc" }, "to": { - "activity_id": "748502947476611794", - "participant_id": "615995652843962691" + "activity_id": "5988023579812894353", + "participant_id": "4927965222751701533" }, "type": "message" }, { "from": { - "activity_id": "2284981553733959328", - "participant_id": "2284981553733959328" + "activity_id": "18279852429871674624", + "participant_id": "18279852429871674624" }, "name": "a3()", "return_type": "int", @@ -276,15 +276,15 @@ int tmain() "translation_unit": "t20033.cc" }, "to": { - "activity_id": "55903385814245839", - "participant_id": "615995652843962691" + "activity_id": "447227086513966713", + "participant_id": "4927965222751701533" }, "type": "message" }, { "from": { - "activity_id": "2284981553733959328", - "participant_id": "2284981553733959328" + "activity_id": "18279852429871674624", + "participant_id": "18279852429871674624" }, "name": "a3()", "return_type": "int", @@ -296,8 +296,8 @@ int tmain() "translation_unit": "t20033.cc" }, "to": { - "activity_id": "55903385814245839", - "participant_id": "615995652843962691" + "activity_id": "447227086513966713", + "participant_id": "4927965222751701533" }, "type": "message" } @@ -308,8 +308,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "2284981553733959328", - "participant_id": "2284981553733959328" + "activity_id": "18279852429871674624", + "participant_id": "18279852429871674624" }, "name": "a4()", "return_type": "int", @@ -321,8 +321,8 @@ int tmain() "translation_unit": "t20033.cc" }, "to": { - "activity_id": "1686426476339443579", - "participant_id": "615995652843962691" + "activity_id": "13491411810715548635", + "participant_id": "4927965222751701533" }, "type": "message" } @@ -335,14 +335,14 @@ int tmain() "type": "alt" }, { - "activity_id": "2284981553733959328", + "activity_id": "18279852429871674624", "branches": [ { "messages": [ { "from": { - "activity_id": "2284981553733959328", - "participant_id": "2284981553733959328" + "activity_id": "18279852429871674624", + "participant_id": "18279852429871674624" }, "name": "a2()", "return_type": "int", @@ -354,15 +354,15 @@ int tmain() "translation_unit": "t20033.cc" }, "to": { - "activity_id": "748502947476611794", - "participant_id": "615995652843962691" + "activity_id": "5988023579812894353", + "participant_id": "4927965222751701533" }, "type": "message" }, { "from": { - "activity_id": "2284981553733959328", - "participant_id": "2284981553733959328" + "activity_id": "18279852429871674624", + "participant_id": "18279852429871674624" }, "name": "a3()", "return_type": "int", @@ -374,8 +374,8 @@ int tmain() "translation_unit": "t20033.cc" }, "to": { - "activity_id": "55903385814245839", - "participant_id": "615995652843962691" + "activity_id": "447227086513966713", + "participant_id": "4927965222751701533" }, "type": "message" } @@ -388,13 +388,13 @@ int tmain() "type": "alt" }, { - "activity_id": "2284981553733959328", + "activity_id": "18279852429871674624", "condition_text": "int i = 0; i < a.a2(); i++", "messages": [ { "from": { - "activity_id": "2284981553733959328", - "participant_id": "2284981553733959328" + "activity_id": "18279852429871674624", + "participant_id": "18279852429871674624" }, "name": "a2()", "return_type": "int", @@ -406,15 +406,15 @@ int tmain() "translation_unit": "t20033.cc" }, "to": { - "activity_id": "748502947476611794", - "participant_id": "615995652843962691" + "activity_id": "5988023579812894353", + "participant_id": "4927965222751701533" }, "type": "message" }, { "from": { - "activity_id": "2284981553733959328", - "participant_id": "2284981553733959328" + "activity_id": "18279852429871674624", + "participant_id": "18279852429871674624" }, "name": "a3()", "return_type": "int", @@ -426,8 +426,8 @@ int tmain() "translation_unit": "t20033.cc" }, "to": { - "activity_id": "55903385814245839", - "participant_id": "615995652843962691" + "activity_id": "447227086513966713", + "participant_id": "4927965222751701533" }, "type": "message" } @@ -437,8 +437,8 @@ int tmain() }, { "from": { - "activity_id": "2284981553733959328", - "participant_id": "2284981553733959328" + "activity_id": "18279852429871674624", + "participant_id": "18279852429871674624" }, "name": "a3()", "return_type": "int", @@ -450,19 +450,19 @@ int tmain() "translation_unit": "t20033.cc" }, "to": { - "activity_id": "55903385814245839", - "participant_id": "615995652843962691" + "activity_id": "447227086513966713", + "participant_id": "4927965222751701533" }, "type": "message" }, { - "activity_id": "2284981553733959328", + "activity_id": "18279852429871674624", "condition_text": "retry_count--", "messages": [ { "from": { - "activity_id": "2284981553733959328", - "participant_id": "2284981553733959328" + "activity_id": "18279852429871674624", + "participant_id": "18279852429871674624" }, "name": "a2()", "return_type": "int", @@ -474,8 +474,8 @@ int tmain() "translation_unit": "t20033.cc" }, "to": { - "activity_id": "748502947476611794", - "participant_id": "615995652843962691" + "activity_id": "5988023579812894353", + "participant_id": "4927965222751701533" }, "type": "message" } @@ -484,13 +484,13 @@ int tmain() "type": "loop" }, { - "activity_id": "2284981553733959328", + "activity_id": "18279852429871674624", "condition_text": "retry_count++ < a.a3()", "messages": [ { "from": { - "activity_id": "2284981553733959328", - "participant_id": "2284981553733959328" + "activity_id": "18279852429871674624", + "participant_id": "18279852429871674624" }, "name": "a4()", "return_type": "int", @@ -502,15 +502,15 @@ int tmain() "translation_unit": "t20033.cc" }, "to": { - "activity_id": "1686426476339443579", - "participant_id": "615995652843962691" + "activity_id": "13491411810715548635", + "participant_id": "4927965222751701533" }, "type": "message" }, { "from": { - "activity_id": "2284981553733959328", - "participant_id": "2284981553733959328" + "activity_id": "18279852429871674624", + "participant_id": "18279852429871674624" }, "name": "a3()", "return_type": "int", @@ -522,8 +522,8 @@ int tmain() "translation_unit": "t20033.cc" }, "to": { - "activity_id": "55903385814245839", - "participant_id": "615995652843962691" + "activity_id": "447227086513966713", + "participant_id": "4927965222751701533" }, "type": "message" } @@ -532,14 +532,14 @@ int tmain() "type": "loop" }, { - "activity_id": "2284981553733959328", + "activity_id": "18279852429871674624", "branches": [ { "messages": [ { "from": { - "activity_id": "2284981553733959328", - "participant_id": "2284981553733959328" + "activity_id": "18279852429871674624", + "participant_id": "18279852429871674624" }, "name": "a4()", "return_type": "int", @@ -551,8 +551,8 @@ int tmain() "translation_unit": "t20033.cc" }, "to": { - "activity_id": "1686426476339443579", - "participant_id": "615995652843962691" + "activity_id": "13491411810715548635", + "participant_id": "4927965222751701533" }, "type": "message" } @@ -568,13 +568,13 @@ int tmain() "type": "alt" }, { - "activity_id": "2284981553733959328", + "activity_id": "18279852429871674624", "condition_text": "ints", "messages": [ { "from": { - "activity_id": "2284981553733959328", - "participant_id": "2284981553733959328" + "activity_id": "18279852429871674624", + "participant_id": "18279852429871674624" }, "name": "a4()", "return_type": "int", @@ -586,8 +586,8 @@ int tmain() "translation_unit": "t20033.cc" }, "to": { - "activity_id": "1686426476339443579", - "participant_id": "615995652843962691" + "activity_id": "13491411810715548635", + "participant_id": "4927965222751701533" }, "type": "message" } @@ -597,7 +597,7 @@ int tmain() } ], "start_from": { - "id": 2284981553733959328, + "id": "18279852429871674624", "location": "clanguml::t20033::tmain()" } } diff --git a/docs/test_cases/t20033_sequence.svg b/docs/test_cases/t20033_sequence.svg index 38056f84..970ca3a9 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 b31f8c94..8b3630de 100644 --- a/docs/test_cases/t20034.md +++ b/docs/test_cases/t20034.md @@ -104,7 +104,7 @@ void B::b4() { "display_name": "d2()", "full_name": "clanguml::t20034::D::d2()", - "id": "1707514178726476738", + "id": "13660113429811813907", "name": "d2", "namespace": "", "source_location": { @@ -118,7 +118,7 @@ void B::b4() ], "display_name": "D", "full_name": "clanguml::t20034::D", - "id": "272777525372220260", + "id": "2182220202977762083", "name": "D", "namespace": "clanguml::t20034", "source_location": { @@ -134,7 +134,7 @@ void B::b4() { "display_name": "c2()", "full_name": "clanguml::t20034::C::c2()", - "id": "472904899982022039", + "id": "3783239199856176312", "name": "c2", "namespace": "", "source_location": { @@ -148,7 +148,7 @@ void B::b4() { "display_name": "c4()", "full_name": "clanguml::t20034::C::c4()", - "id": "395720534444062628", + "id": "3165764275552501026", "name": "c4", "namespace": "", "source_location": { @@ -162,7 +162,7 @@ void B::b4() { "display_name": "c1()", "full_name": "clanguml::t20034::C::c1()", - "id": "148530508384958711", + "id": "1188244067079669689", "name": "c1", "namespace": "", "source_location": { @@ -176,7 +176,7 @@ void B::b4() { "display_name": "c3()", "full_name": "clanguml::t20034::C::c3()", - "id": "2116989777037608337", + "id": "16935918216300866700", "name": "c3", "namespace": "", "source_location": { @@ -190,7 +190,7 @@ void B::b4() ], "display_name": "C", "full_name": "clanguml::t20034::C", - "id": "2153793652884753477", + "id": "17230349223078027821", "name": "C", "namespace": "clanguml::t20034", "source_location": { @@ -206,7 +206,7 @@ void B::b4() { "display_name": "b2()", "full_name": "clanguml::t20034::B::b2()", - "id": "1034410188120190919", + "id": "8275281504961527352", "name": "b2", "namespace": "", "source_location": { @@ -220,7 +220,7 @@ void B::b4() { "display_name": "b4()", "full_name": "clanguml::t20034::B::b4()", - "id": "1774155279072101253", + "id": "14193242232576810025", "name": "b4", "namespace": "", "source_location": { @@ -234,7 +234,7 @@ void B::b4() { "display_name": "b1()", "full_name": "clanguml::t20034::B::b1()", - "id": "289899516984058785", + "id": "2319196135872470285", "name": "b1", "namespace": "", "source_location": { @@ -248,7 +248,7 @@ void B::b4() ], "display_name": "B", "full_name": "clanguml::t20034::B", - "id": "1214895773389400008", + "id": "9719166187115200065", "name": "B", "namespace": "clanguml::t20034", "source_location": { @@ -264,7 +264,7 @@ void B::b4() { "display_name": "a2()", "full_name": "clanguml::t20034::A::a2()", - "id": "1307188853155365430", + "id": "10457510825242923440", "name": "a2", "namespace": "", "source_location": { @@ -278,7 +278,7 @@ void B::b4() ], "display_name": "A", "full_name": "clanguml::t20034::A", - "id": "1029414747563549012", + "id": "8235317980508392101", "name": "A", "namespace": "clanguml::t20034", "source_location": { @@ -294,7 +294,7 @@ void B::b4() { "display_name": "operator()() const", "full_name": "clanguml::t20034::D::d2()::(lambda t20034.cc:56:18)::operator()() const", - "id": "1534431449322420953", + "id": "12275451594579367626", "name": "operator()", "namespace": "", "type": "method" @@ -302,7 +302,7 @@ void B::b4() ], "display_name": "D::d2()::(lambda t20034.cc:56:18)", "full_name": "clanguml::t20034::D::d2()::(lambda t20034.cc:56:18)", - "id": "1026588549514900751", + "id": "8212708396119206013", "name": "D::d2()::(lambda t20034.cc:56:18)", "namespace": "clanguml::t20034", "source_location": { @@ -318,11 +318,11 @@ void B::b4() { "from_to": { "from": { - "id": 1707514178726476738, + "id": "13660113429811813907", "location": "clanguml::t20034::D::d2()" }, "to": { - "id": 1307188853155365430, + "id": "10457510825242923440", "location": "clanguml::t20034::A::a2()" } }, @@ -331,8 +331,8 @@ void B::b4() "messages": [ { "from": { - "activity_id": "1707514178726476738", - "participant_id": "272777525372220260" + "activity_id": "13660113429811813907", + "participant_id": "2182220202977762083" }, "name": "c2()", "return_type": "void", @@ -344,15 +344,15 @@ void B::b4() "translation_unit": "t20034.cc" }, "to": { - "activity_id": "472904899982022039", - "participant_id": "2153793652884753477" + "activity_id": "3783239199856176312", + "participant_id": "17230349223078027821" }, "type": "message" }, { "from": { - "activity_id": "472904899982022039", - "participant_id": "2153793652884753477" + "activity_id": "3783239199856176312", + "participant_id": "17230349223078027821" }, "name": "b2()", "return_type": "void", @@ -364,15 +364,15 @@ void B::b4() "translation_unit": "t20034.cc" }, "to": { - "activity_id": "1034410188120190919", - "participant_id": "1214895773389400008" + "activity_id": "8275281504961527352", + "participant_id": "9719166187115200065" }, "type": "message" }, { "from": { - "activity_id": "1034410188120190919", - "participant_id": "1214895773389400008" + "activity_id": "8275281504961527352", + "participant_id": "9719166187115200065" }, "name": "a2()", "return_type": "void", @@ -384,8 +384,8 @@ void B::b4() "translation_unit": "t20034.cc" }, "to": { - "activity_id": "1307188853155365430", - "participant_id": "1029414747563549012" + "activity_id": "10457510825242923440", + "participant_id": "8235317980508392101" }, "type": "message" } @@ -395,8 +395,8 @@ void B::b4() "messages": [ { "from": { - "activity_id": "1707514178726476738", - "participant_id": "272777525372220260" + "activity_id": "13660113429811813907", + "participant_id": "2182220202977762083" }, "name": "operator()() const", "return_type": "void", @@ -408,15 +408,15 @@ void B::b4() "translation_unit": "t20034.cc" }, "to": { - "activity_id": "1534431449322420953", - "participant_id": "1026588549514900751" + "activity_id": "12275451594579367626", + "participant_id": "8212708396119206013" }, "type": "message" }, { "from": { - "activity_id": "1534431449322420953", - "participant_id": "1026588549514900751" + "activity_id": "12275451594579367626", + "participant_id": "8212708396119206013" }, "name": "a2()", "return_type": "void", @@ -428,8 +428,8 @@ void B::b4() "translation_unit": "t20034.cc" }, "to": { - "activity_id": "1307188853155365430", - "participant_id": "1029414747563549012" + "activity_id": "10457510825242923440", + "participant_id": "8235317980508392101" }, "type": "message" } @@ -439,8 +439,8 @@ void B::b4() "messages": [ { "from": { - "activity_id": "1707514178726476738", - "participant_id": "272777525372220260" + "activity_id": "13660113429811813907", + "participant_id": "2182220202977762083" }, "name": "a2()", "return_type": "void", @@ -452,8 +452,8 @@ void B::b4() "translation_unit": "t20034.cc" }, "to": { - "activity_id": "1307188853155365430", - "participant_id": "1029414747563549012" + "activity_id": "10457510825242923440", + "participant_id": "8235317980508392101" }, "type": "message" } @@ -463,8 +463,8 @@ void B::b4() "messages": [ { "from": { - "activity_id": "1707514178726476738", - "participant_id": "272777525372220260" + "activity_id": "13660113429811813907", + "participant_id": "2182220202977762083" }, "name": "c4()", "return_type": "void", @@ -476,15 +476,15 @@ void B::b4() "translation_unit": "t20034.cc" }, "to": { - "activity_id": "395720534444062628", - "participant_id": "2153793652884753477" + "activity_id": "3165764275552501026", + "participant_id": "17230349223078027821" }, "type": "message" }, { "from": { - "activity_id": "395720534444062628", - "participant_id": "2153793652884753477" + "activity_id": "3165764275552501026", + "participant_id": "17230349223078027821" }, "name": "b4()", "return_type": "void", @@ -496,15 +496,15 @@ void B::b4() "translation_unit": "t20034.cc" }, "to": { - "activity_id": "1774155279072101253", - "participant_id": "1214895773389400008" + "activity_id": "14193242232576810025", + "participant_id": "9719166187115200065" }, "type": "message" }, { "from": { - "activity_id": "1774155279072101253", - "participant_id": "1214895773389400008" + "activity_id": "14193242232576810025", + "participant_id": "9719166187115200065" }, "name": "b2()", "return_type": "void", @@ -516,15 +516,15 @@ void B::b4() "translation_unit": "t20034.cc" }, "to": { - "activity_id": "1034410188120190919", - "participant_id": "1214895773389400008" + "activity_id": "8275281504961527352", + "participant_id": "9719166187115200065" }, "type": "message" }, { "from": { - "activity_id": "1034410188120190919", - "participant_id": "1214895773389400008" + "activity_id": "8275281504961527352", + "participant_id": "9719166187115200065" }, "name": "a2()", "return_type": "void", @@ -536,8 +536,8 @@ void B::b4() "translation_unit": "t20034.cc" }, "to": { - "activity_id": "1307188853155365430", - "participant_id": "1029414747563549012" + "activity_id": "10457510825242923440", + "participant_id": "8235317980508392101" }, "type": "message" } @@ -547,8 +547,8 @@ void B::b4() "messages": [ { "from": { - "activity_id": "1707514178726476738", - "participant_id": "272777525372220260" + "activity_id": "13660113429811813907", + "participant_id": "2182220202977762083" }, "name": "c1()", "return_type": "void", @@ -560,15 +560,15 @@ void B::b4() "translation_unit": "t20034.cc" }, "to": { - "activity_id": "148530508384958711", - "participant_id": "2153793652884753477" + "activity_id": "1188244067079669689", + "participant_id": "17230349223078027821" }, "type": "message" }, { "from": { - "activity_id": "148530508384958711", - "participant_id": "2153793652884753477" + "activity_id": "1188244067079669689", + "participant_id": "17230349223078027821" }, "name": "b1()", "return_type": "void", @@ -580,15 +580,15 @@ void B::b4() "translation_unit": "t20034.cc" }, "to": { - "activity_id": "289899516984058785", - "participant_id": "1214895773389400008" + "activity_id": "2319196135872470285", + "participant_id": "9719166187115200065" }, "type": "message" }, { "from": { - "activity_id": "289899516984058785", - "participant_id": "1214895773389400008" + "activity_id": "2319196135872470285", + "participant_id": "9719166187115200065" }, "name": "a2()", "return_type": "void", @@ -600,8 +600,8 @@ void B::b4() "translation_unit": "t20034.cc" }, "to": { - "activity_id": "1307188853155365430", - "participant_id": "1029414747563549012" + "activity_id": "10457510825242923440", + "participant_id": "8235317980508392101" }, "type": "message" } @@ -611,8 +611,8 @@ void B::b4() "messages": [ { "from": { - "activity_id": "1707514178726476738", - "participant_id": "272777525372220260" + "activity_id": "13660113429811813907", + "participant_id": "2182220202977762083" }, "name": "c3()", "return_type": "void", @@ -624,15 +624,15 @@ void B::b4() "translation_unit": "t20034.cc" }, "to": { - "activity_id": "2116989777037608337", - "participant_id": "2153793652884753477" + "activity_id": "16935918216300866700", + "participant_id": "17230349223078027821" }, "type": "message" }, { "from": { - "activity_id": "2116989777037608337", - "participant_id": "2153793652884753477" + "activity_id": "16935918216300866700", + "participant_id": "17230349223078027821" }, "name": "c2()", "return_type": "void", @@ -644,15 +644,15 @@ void B::b4() "translation_unit": "t20034.cc" }, "to": { - "activity_id": "472904899982022039", - "participant_id": "2153793652884753477" + "activity_id": "3783239199856176312", + "participant_id": "17230349223078027821" }, "type": "message" }, { "from": { - "activity_id": "472904899982022039", - "participant_id": "2153793652884753477" + "activity_id": "3783239199856176312", + "participant_id": "17230349223078027821" }, "name": "b2()", "return_type": "void", @@ -664,15 +664,15 @@ void B::b4() "translation_unit": "t20034.cc" }, "to": { - "activity_id": "1034410188120190919", - "participant_id": "1214895773389400008" + "activity_id": "8275281504961527352", + "participant_id": "9719166187115200065" }, "type": "message" }, { "from": { - "activity_id": "1034410188120190919", - "participant_id": "1214895773389400008" + "activity_id": "8275281504961527352", + "participant_id": "9719166187115200065" }, "name": "a2()", "return_type": "void", @@ -684,8 +684,8 @@ void B::b4() "translation_unit": "t20034.cc" }, "to": { - "activity_id": "1307188853155365430", - "participant_id": "1029414747563549012" + "activity_id": "10457510825242923440", + "participant_id": "8235317980508392101" }, "type": "message" } diff --git a/docs/test_cases/t20034_sequence.svg b/docs/test_cases/t20034_sequence.svg index ab2dda91..ff021434 100644 --- a/docs/test_cases/t20034_sequence.svg +++ b/docs/test_cases/t20034_sequence.svg @@ -1,6 +1,6 @@ - + @@ -14,154 +14,154 @@ - - + + D - + D - - + + C - + C - - + + B - + B - - + + A - + A - - + + D::d2()::(lambda t20034.cc:56:18) - + D::d2()::(lambda t20034.cc:56:18) d2() - + c2() - + b2() - + a2() - + d2() - + operator()() const - + a2() - + d2() - + a2() - + d2() - + c4() - + b4() - + b2() - + a2() - + d2() - + c1() - + b1() - + a2() - + d2() - + c3() - + c2() - + b2() - + a2() diff --git a/docs/test_cases/t20035.md b/docs/test_cases/t20035.md index f1ad44a2..209248cf 100644 --- a/docs/test_cases/t20035.md +++ b/docs/test_cases/t20035.md @@ -45,7 +45,7 @@ int tmain(int argc, char **argv) { return a(argc); } { "display_name": "tmain(int,char **)", "full_name": "clanguml::t20035::tmain(int,char **)", - "id": "1380099746477810520", + "id": "11040797971822484165", "name": "tmain", "namespace": "clanguml::t20035", "source_location": { @@ -59,7 +59,7 @@ int tmain(int argc, char **argv) { return a(argc); } { "display_name": "a(int)", "full_name": "clanguml::t20035::a(int)", - "id": "1503144831959453736", + "id": "12025158655675629891", "name": "a", "namespace": "clanguml::t20035", "source_location": { @@ -73,7 +73,7 @@ int tmain(int argc, char **argv) { return a(argc); } { "display_name": "b1(int)", "full_name": "clanguml::t20035::b1(int)", - "id": "440199113909747659", + "id": "3521592911277981276", "name": "b1", "namespace": "clanguml::t20035", "source_location": { @@ -87,7 +87,7 @@ int tmain(int argc, char **argv) { return a(argc); } { "display_name": "c(int)", "full_name": "clanguml::t20035::c(int)", - "id": "709102392181022891", + "id": "5672819137448183130", "name": "c", "namespace": "clanguml::t20035", "source_location": { @@ -103,11 +103,11 @@ int tmain(int argc, char **argv) { return a(argc); } { "from_to": { "from": { - "id": 1380099746477810520, + "id": "11040797971822484165", "location": "clanguml::t20035::tmain(int,char **)" }, "to": { - "id": 709102392181022891, + "id": "5672819137448183130", "location": "clanguml::t20035::c(int)" } }, @@ -116,8 +116,8 @@ int tmain(int argc, char **argv) { return a(argc); } "messages": [ { "from": { - "activity_id": "1380099746477810520", - "participant_id": "1380099746477810520" + "activity_id": "11040797971822484165", + "participant_id": "11040797971822484165" }, "name": "", "return_type": "int", @@ -129,15 +129,15 @@ int tmain(int argc, char **argv) { return a(argc); } "translation_unit": "t20035.cc" }, "to": { - "activity_id": "1503144831959453736", - "participant_id": "1503144831959453736" + "activity_id": "12025158655675629891", + "participant_id": "12025158655675629891" }, "type": "message" }, { "from": { - "activity_id": "1503144831959453736", - "participant_id": "1503144831959453736" + "activity_id": "12025158655675629891", + "participant_id": "12025158655675629891" }, "name": "", "return_type": "int", @@ -149,15 +149,15 @@ int tmain(int argc, char **argv) { return a(argc); } "translation_unit": "t20035.cc" }, "to": { - "activity_id": "440199113909747659", - "participant_id": "440199113909747659" + "activity_id": "3521592911277981276", + "participant_id": "3521592911277981276" }, "type": "message" }, { "from": { - "activity_id": "440199113909747659", - "participant_id": "440199113909747659" + "activity_id": "3521592911277981276", + "participant_id": "3521592911277981276" }, "name": "", "return_type": "int", @@ -169,8 +169,8 @@ int tmain(int argc, char **argv) { return a(argc); } "translation_unit": "t20035.cc" }, "to": { - "activity_id": "709102392181022891", - "participant_id": "709102392181022891" + "activity_id": "5672819137448183130", + "participant_id": "5672819137448183130" }, "type": "message" } diff --git a/docs/test_cases/t20035_sequence.svg b/docs/test_cases/t20035_sequence.svg index c90e2781..5ffca85e 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 5f24bb5e..967cd52d 100644 --- a/docs/test_cases/t20036.md +++ b/docs/test_cases/t20036.md @@ -76,7 +76,7 @@ struct D { { "display_name": "c1()", "full_name": "clanguml::t20036::C::c1()", - "id": "1742507735898803374", + "id": "13940061887190426992", "name": "c1", "namespace": "", "source_location": { @@ -90,7 +90,7 @@ struct D { { "display_name": "c2()", "full_name": "clanguml::t20036::C::c2()", - "id": "128745191811378037", + "id": "1029961534491024303", "name": "c2", "namespace": "", "source_location": { @@ -104,7 +104,7 @@ struct D { { "display_name": "c4()", "full_name": "clanguml::t20036::C::c4()", - "id": "1735839766717973272", + "id": "13886718133743786177", "name": "c4", "namespace": "", "source_location": { @@ -118,7 +118,7 @@ struct D { { "display_name": "c3()", "full_name": "clanguml::t20036::C::c3()", - "id": "1523531372012294984", + "id": "12188250976098359876", "name": "c3", "namespace": "", "source_location": { @@ -132,7 +132,7 @@ struct D { ], "display_name": "C", "full_name": "clanguml::t20036::C", - "id": "589458700000736705", + "id": "4715669600005893642", "name": "C", "namespace": "clanguml::t20036", "source_location": { @@ -148,7 +148,7 @@ struct D { { "display_name": "b1()", "full_name": "clanguml::t20036::B::b1()", - "id": "203660950902052846", + "id": "1629287607216422771", "name": "b1", "namespace": "", "source_location": { @@ -162,7 +162,7 @@ struct D { { "display_name": "b2()", "full_name": "clanguml::t20036::B::b2()", - "id": "1726094580455938498", + "id": "13808756643647507988", "name": "b2", "namespace": "", "source_location": { @@ -176,7 +176,7 @@ struct D { ], "display_name": "B", "full_name": "clanguml::t20036::B", - "id": "607147607288902300", + "id": "4857180858311218405", "name": "B", "namespace": "clanguml::t20036", "source_location": { @@ -192,7 +192,7 @@ struct D { { "display_name": "a2()", "full_name": "clanguml::t20036::A::a2()", - "id": "2124074228514438863", + "id": "16992593828115510908", "name": "a2", "namespace": "", "source_location": { @@ -206,7 +206,7 @@ struct D { ], "display_name": "A", "full_name": "clanguml::t20036::A", - "id": "399722216848214287", + "id": "3197777734785714296", "name": "A", "namespace": "clanguml::t20036", "source_location": { @@ -222,7 +222,7 @@ struct D { { "display_name": "d1()", "full_name": "clanguml::t20036::D::d1()", - "id": "701488875613014930", + "id": "5611911004904119444", "name": "d1", "namespace": "", "source_location": { @@ -236,7 +236,7 @@ struct D { { "display_name": "d3()", "full_name": "clanguml::t20036::D::d3()", - "id": "1897648539724183065", + "id": "15181188317793464520", "name": "d3", "namespace": "", "source_location": { @@ -250,7 +250,7 @@ struct D { { "display_name": "d2()", "full_name": "clanguml::t20036::D::d2()", - "id": "1534436779969087203", + "id": "12275494239752697631", "name": "d2", "namespace": "", "source_location": { @@ -264,7 +264,7 @@ struct D { ], "display_name": "D", "full_name": "clanguml::t20036::D", - "id": "847434467114564641", + "id": "6779475736916517133", "name": "D", "namespace": "clanguml::t20036", "source_location": { @@ -283,8 +283,8 @@ struct D { "messages": [ { "from": { - "activity_id": "1742507735898803374", - "participant_id": "589458700000736705" + "activity_id": "13940061887190426992", + "participant_id": "4715669600005893642" }, "name": "b1()", "return_type": "void", @@ -296,15 +296,15 @@ struct D { "translation_unit": "t20036.cc" }, "to": { - "activity_id": "203660950902052846", - "participant_id": "607147607288902300" + "activity_id": "1629287607216422771", + "participant_id": "4857180858311218405" }, "type": "message" }, { "from": { - "activity_id": "203660950902052846", - "participant_id": "607147607288902300" + "activity_id": "1629287607216422771", + "participant_id": "4857180858311218405" }, "name": "a2()", "return_type": "void", @@ -316,8 +316,8 @@ struct D { "translation_unit": "t20036.cc" }, "to": { - "activity_id": "2124074228514438863", - "participant_id": "399722216848214287" + "activity_id": "16992593828115510908", + "participant_id": "3197777734785714296" }, "type": "message" } @@ -327,8 +327,8 @@ struct D { "messages": [ { "from": { - "activity_id": "701488875613014930", - "participant_id": "847434467114564641" + "activity_id": "5611911004904119444", + "participant_id": "6779475736916517133" }, "name": "c2()", "return_type": "void", @@ -340,15 +340,15 @@ struct D { "translation_unit": "t20036.cc" }, "to": { - "activity_id": "128745191811378037", - "participant_id": "589458700000736705" + "activity_id": "1029961534491024303", + "participant_id": "4715669600005893642" }, "type": "message" }, { "from": { - "activity_id": "128745191811378037", - "participant_id": "589458700000736705" + "activity_id": "1029961534491024303", + "participant_id": "4715669600005893642" }, "name": "b2()", "return_type": "void", @@ -360,15 +360,15 @@ struct D { "translation_unit": "t20036.cc" }, "to": { - "activity_id": "1726094580455938498", - "participant_id": "607147607288902300" + "activity_id": "13808756643647507988", + "participant_id": "4857180858311218405" }, "type": "message" }, { "from": { - "activity_id": "1726094580455938498", - "participant_id": "607147607288902300" + "activity_id": "13808756643647507988", + "participant_id": "4857180858311218405" }, "name": "a2()", "return_type": "void", @@ -380,8 +380,8 @@ struct D { "translation_unit": "t20036.cc" }, "to": { - "activity_id": "2124074228514438863", - "participant_id": "399722216848214287" + "activity_id": "16992593828115510908", + "participant_id": "3197777734785714296" }, "type": "message" } @@ -391,8 +391,8 @@ struct D { "messages": [ { "from": { - "activity_id": "1897648539724183065", - "participant_id": "847434467114564641" + "activity_id": "15181188317793464520", + "participant_id": "6779475736916517133" }, "name": "a2()", "return_type": "void", @@ -404,8 +404,8 @@ struct D { "translation_unit": "t20036.cc" }, "to": { - "activity_id": "2124074228514438863", - "participant_id": "399722216848214287" + "activity_id": "16992593828115510908", + "participant_id": "3197777734785714296" }, "type": "message" } @@ -415,8 +415,8 @@ struct D { "messages": [ { "from": { - "activity_id": "1735839766717973272", - "participant_id": "589458700000736705" + "activity_id": "13886718133743786177", + "participant_id": "4715669600005893642" }, "name": "b2()", "return_type": "void", @@ -428,15 +428,15 @@ struct D { "translation_unit": "t20036.cc" }, "to": { - "activity_id": "1726094580455938498", - "participant_id": "607147607288902300" + "activity_id": "13808756643647507988", + "participant_id": "4857180858311218405" }, "type": "message" }, { "from": { - "activity_id": "1726094580455938498", - "participant_id": "607147607288902300" + "activity_id": "13808756643647507988", + "participant_id": "4857180858311218405" }, "name": "a2()", "return_type": "void", @@ -448,8 +448,8 @@ struct D { "translation_unit": "t20036.cc" }, "to": { - "activity_id": "2124074228514438863", - "participant_id": "399722216848214287" + "activity_id": "16992593828115510908", + "participant_id": "3197777734785714296" }, "type": "message" } @@ -459,8 +459,8 @@ struct D { "messages": [ { "from": { - "activity_id": "1523531372012294984", - "participant_id": "589458700000736705" + "activity_id": "12188250976098359876", + "participant_id": "4715669600005893642" }, "name": "c2()", "return_type": "void", @@ -472,15 +472,15 @@ struct D { "translation_unit": "t20036.cc" }, "to": { - "activity_id": "128745191811378037", - "participant_id": "589458700000736705" + "activity_id": "1029961534491024303", + "participant_id": "4715669600005893642" }, "type": "message" }, { "from": { - "activity_id": "128745191811378037", - "participant_id": "589458700000736705" + "activity_id": "1029961534491024303", + "participant_id": "4715669600005893642" }, "name": "b2()", "return_type": "void", @@ -492,15 +492,15 @@ struct D { "translation_unit": "t20036.cc" }, "to": { - "activity_id": "1726094580455938498", - "participant_id": "607147607288902300" + "activity_id": "13808756643647507988", + "participant_id": "4857180858311218405" }, "type": "message" }, { "from": { - "activity_id": "1726094580455938498", - "participant_id": "607147607288902300" + "activity_id": "13808756643647507988", + "participant_id": "4857180858311218405" }, "name": "a2()", "return_type": "void", @@ -512,8 +512,8 @@ struct D { "translation_unit": "t20036.cc" }, "to": { - "activity_id": "2124074228514438863", - "participant_id": "399722216848214287" + "activity_id": "16992593828115510908", + "participant_id": "3197777734785714296" }, "type": "message" } @@ -523,8 +523,8 @@ struct D { "messages": [ { "from": { - "activity_id": "1534436779969087203", - "participant_id": "847434467114564641" + "activity_id": "12275494239752697631", + "participant_id": "6779475736916517133" }, "name": "c2()", "return_type": "void", @@ -536,15 +536,15 @@ struct D { "translation_unit": "t20036.cc" }, "to": { - "activity_id": "128745191811378037", - "participant_id": "589458700000736705" + "activity_id": "1029961534491024303", + "participant_id": "4715669600005893642" }, "type": "message" }, { "from": { - "activity_id": "128745191811378037", - "participant_id": "589458700000736705" + "activity_id": "1029961534491024303", + "participant_id": "4715669600005893642" }, "name": "b2()", "return_type": "void", @@ -556,15 +556,15 @@ struct D { "translation_unit": "t20036.cc" }, "to": { - "activity_id": "1726094580455938498", - "participant_id": "607147607288902300" + "activity_id": "13808756643647507988", + "participant_id": "4857180858311218405" }, "type": "message" }, { "from": { - "activity_id": "1726094580455938498", - "participant_id": "607147607288902300" + "activity_id": "13808756643647507988", + "participant_id": "4857180858311218405" }, "name": "a2()", "return_type": "void", @@ -576,8 +576,8 @@ struct D { "translation_unit": "t20036.cc" }, "to": { - "activity_id": "2124074228514438863", - "participant_id": "399722216848214287" + "activity_id": "16992593828115510908", + "participant_id": "3197777734785714296" }, "type": "message" } @@ -585,7 +585,7 @@ struct D { } ], "to": { - "id": 2124074228514438863, + "id": "16992593828115510908", "location": "clanguml::t20036::A::a2()" } } diff --git a/docs/test_cases/t20036_sequence.svg b/docs/test_cases/t20036_sequence.svg index 5645f85c..df8a5d87 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 40b13c62..1a112952 100644 --- a/docs/test_cases/t20037.md +++ b/docs/test_cases/t20037.md @@ -68,7 +68,7 @@ void tmain(int argc, char **argv) { "display_name": "tmain(int,char **)", "full_name": "clanguml::t20037::tmain(int,char **)", - "id": "1676651465274088148", + "id": "13413211722192705187", "name": "tmain", "namespace": "clanguml::t20037", "source_location": { @@ -82,7 +82,7 @@ void tmain(int argc, char **argv) { "display_name": "a()", "full_name": "clanguml::t20037::a()", - "id": "150460916850164805", + "id": "1203687334801318447", "name": "a", "namespace": "clanguml::t20037", "source_location": { @@ -98,7 +98,7 @@ void tmain(int argc, char **argv) { "display_name": "A()", "full_name": "clanguml::t20037::A::A()", - "id": "1135451191676888496", + "id": "9083609533415107973", "name": "A", "namespace": "", "source_location": { @@ -112,7 +112,7 @@ void tmain(int argc, char **argv) ], "display_name": "A", "full_name": "clanguml::t20037::A", - "id": "1329920824155530080", + "id": "10639366593244240647", "name": "A", "namespace": "clanguml::t20037", "source_location": { @@ -126,7 +126,7 @@ void tmain(int argc, char **argv) { "display_name": "initb()", "full_name": "clanguml::t20037::initb()", - "id": "1303264946914255327", + "id": "10426119575314042616", "name": "initb", "namespace": "clanguml::t20037", "source_location": { @@ -142,7 +142,7 @@ void tmain(int argc, char **argv) { "display_name": "get()", "full_name": "clanguml::t20037::B::get()", - "id": "107877908217538137", + "id": "863023265740305101", "name": "get", "namespace": "", "source_location": { @@ -156,7 +156,7 @@ void tmain(int argc, char **argv) ], "display_name": "B", "full_name": "clanguml::t20037::B", - "id": "1746900845528413124", + "id": "13975206764227304997", "name": "B", "namespace": "clanguml::t20037", "source_location": { @@ -170,7 +170,7 @@ void tmain(int argc, char **argv) { "display_name": "c()", "full_name": "clanguml::t20037::c()", - "id": "1349992361928784583", + "id": "10799938895430276666", "name": "c", "namespace": "clanguml::t20037", "source_location": { @@ -187,8 +187,8 @@ void tmain(int argc, char **argv) "messages": [ { "from": { - "activity_id": "1676651465274088148", - "participant_id": "1676651465274088148" + "activity_id": "13413211722192705187", + "participant_id": "13413211722192705187" }, "name": "", "return_type": "int", @@ -200,15 +200,15 @@ void tmain(int argc, char **argv) "translation_unit": "t20037.cc" }, "to": { - "activity_id": "150460916850164805", - "participant_id": "150460916850164805" + "activity_id": "1203687334801318447", + "participant_id": "1203687334801318447" }, "type": "message" }, { "from": { - "activity_id": "150460916850164805", - "participant_id": "150460916850164805" + "activity_id": "1203687334801318447", + "participant_id": "1203687334801318447" }, "name": "A()", "return_type": "void", @@ -220,15 +220,15 @@ void tmain(int argc, char **argv) "translation_unit": "t20037.cc" }, "to": { - "activity_id": "1135451191676888496", - "participant_id": "1329920824155530080" + "activity_id": "9083609533415107973", + "participant_id": "10639366593244240647" }, "type": "message" }, { "from": { - "activity_id": "150460916850164805", - "participant_id": "150460916850164805" + "activity_id": "1203687334801318447", + "participant_id": "1203687334801318447" }, "name": "", "return_type": "B", @@ -240,15 +240,15 @@ void tmain(int argc, char **argv) "translation_unit": "t20037.cc" }, "to": { - "activity_id": "1303264946914255327", - "participant_id": "1303264946914255327" + "activity_id": "10426119575314042616", + "participant_id": "10426119575314042616" }, "type": "message" }, { "from": { - "activity_id": "150460916850164805", - "participant_id": "150460916850164805" + "activity_id": "1203687334801318447", + "participant_id": "1203687334801318447" }, "name": "get()", "return_type": "int", @@ -260,15 +260,15 @@ void tmain(int argc, char **argv) "translation_unit": "t20037.cc" }, "to": { - "activity_id": "107877908217538137", - "participant_id": "1746900845528413124" + "activity_id": "863023265740305101", + "participant_id": "13975206764227304997" }, "type": "message" }, { "from": { - "activity_id": "150460916850164805", - "participant_id": "150460916850164805" + "activity_id": "1203687334801318447", + "participant_id": "1203687334801318447" }, "name": "", "return_type": "int", @@ -280,15 +280,15 @@ void tmain(int argc, char **argv) "translation_unit": "t20037.cc" }, "to": { - "activity_id": "1349992361928784583", - "participant_id": "1349992361928784583" + "activity_id": "10799938895430276666", + "participant_id": "10799938895430276666" }, "type": "message" }, { "from": { - "activity_id": "1676651465274088148", - "participant_id": "1676651465274088148" + "activity_id": "13413211722192705187", + "participant_id": "13413211722192705187" }, "name": "", "return_type": "int", @@ -300,15 +300,15 @@ void tmain(int argc, char **argv) "translation_unit": "t20037.cc" }, "to": { - "activity_id": "150460916850164805", - "participant_id": "150460916850164805" + "activity_id": "1203687334801318447", + "participant_id": "1203687334801318447" }, "type": "message" }, { "from": { - "activity_id": "150460916850164805", - "participant_id": "150460916850164805" + "activity_id": "1203687334801318447", + "participant_id": "1203687334801318447" }, "name": "get()", "return_type": "int", @@ -320,15 +320,15 @@ void tmain(int argc, char **argv) "translation_unit": "t20037.cc" }, "to": { - "activity_id": "107877908217538137", - "participant_id": "1746900845528413124" + "activity_id": "863023265740305101", + "participant_id": "13975206764227304997" }, "type": "message" }, { "from": { - "activity_id": "150460916850164805", - "participant_id": "150460916850164805" + "activity_id": "1203687334801318447", + "participant_id": "1203687334801318447" }, "name": "", "return_type": "int", @@ -340,15 +340,15 @@ void tmain(int argc, char **argv) "translation_unit": "t20037.cc" }, "to": { - "activity_id": "1349992361928784583", - "participant_id": "1349992361928784583" + "activity_id": "10799938895430276666", + "participant_id": "10799938895430276666" }, "type": "message" }, { "from": { - "activity_id": "1676651465274088148", - "participant_id": "1676651465274088148" + "activity_id": "13413211722192705187", + "participant_id": "13413211722192705187" }, "name": "", "return_type": "int", @@ -360,15 +360,15 @@ void tmain(int argc, char **argv) "translation_unit": "t20037.cc" }, "to": { - "activity_id": "150460916850164805", - "participant_id": "150460916850164805" + "activity_id": "1203687334801318447", + "participant_id": "1203687334801318447" }, "type": "message" }, { "from": { - "activity_id": "150460916850164805", - "participant_id": "150460916850164805" + "activity_id": "1203687334801318447", + "participant_id": "1203687334801318447" }, "name": "get()", "return_type": "int", @@ -380,15 +380,15 @@ void tmain(int argc, char **argv) "translation_unit": "t20037.cc" }, "to": { - "activity_id": "107877908217538137", - "participant_id": "1746900845528413124" + "activity_id": "863023265740305101", + "participant_id": "13975206764227304997" }, "type": "message" }, { "from": { - "activity_id": "150460916850164805", - "participant_id": "150460916850164805" + "activity_id": "1203687334801318447", + "participant_id": "1203687334801318447" }, "name": "", "return_type": "int", @@ -400,14 +400,14 @@ void tmain(int argc, char **argv) "translation_unit": "t20037.cc" }, "to": { - "activity_id": "1349992361928784583", - "participant_id": "1349992361928784583" + "activity_id": "10799938895430276666", + "participant_id": "10799938895430276666" }, "type": "message" } ], "start_from": { - "id": 1676651465274088148, + "id": "13413211722192705187", "location": "clanguml::t20037::tmain(int,char **)" } } diff --git a/docs/test_cases/t20037_sequence.svg b/docs/test_cases/t20037_sequence.svg index b73a2ce6..24739e32 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 30bc51d2..7233f33a 100644 --- a/docs/test_cases/t20038.md +++ b/docs/test_cases/t20038.md @@ -142,7 +142,7 @@ template T add(T a, T b) { "display_name": "tmain()", "full_name": "clanguml::t20038::tmain()", - "id": "1013610625329227974", + "id": "8108885002633823792", "name": "tmain", "namespace": "clanguml::t20038", "source_location": { @@ -158,7 +158,7 @@ template T add(T a, T b) { "display_name": "b()", "full_name": "clanguml::t20038::B::b()", - "id": "690314603725772987", + "id": "5522516829806183901", "name": "b", "namespace": "", "source_location": { @@ -172,7 +172,7 @@ template T add(T a, T b) { "display_name": "bbb()", "full_name": "clanguml::t20038::B::bbb()", - "id": "1902331999195245434", + "id": "15218655993561963475", "name": "bbb", "namespace": "", "source_location": { @@ -186,7 +186,7 @@ template T add(T a, T b) { "display_name": "bbbb()", "full_name": "clanguml::t20038::B::bbbb()", - "id": "57189865474209187", + "id": "457518923793673502", "name": "bbbb", "namespace": "", "source_location": { @@ -200,7 +200,7 @@ template T add(T a, T b) { "display_name": "wrap(int)", "full_name": "clanguml::t20038::B::wrap(int)", - "id": "732774941205637034", + "id": "5862199529645096278", "name": "wrap", "namespace": "", "source_location": { @@ -214,7 +214,7 @@ template T add(T a, T b) { "display_name": "bbbbb()", "full_name": "clanguml::t20038::B::bbbbb()", - "id": "726295067786650864", + "id": "5810360542293206912", "name": "bbbbb", "namespace": "", "source_location": { @@ -228,7 +228,7 @@ template T add(T a, T b) ], "display_name": "B", "full_name": "clanguml::t20038::B", - "id": "1040787777721396414", + "id": "8326302221771171317", "name": "B", "namespace": "clanguml::t20038", "source_location": { @@ -244,7 +244,7 @@ template T add(T a, T b) { "display_name": "a()", "full_name": "clanguml::t20038::A::a()", - "id": "1311298747919334371", + "id": "10490389983354674971", "name": "a", "namespace": "", "source_location": { @@ -258,7 +258,7 @@ template T add(T a, T b) { "display_name": "aaa()", "full_name": "clanguml::t20038::A::aaa()", - "id": "2157208254318041144", + "id": "17257666034544329159", "name": "aaa", "namespace": "", "source_location": { @@ -272,7 +272,7 @@ template T add(T a, T b) { "display_name": "aaaa()", "full_name": "clanguml::t20038::A::aaaa()", - "id": "1370854824770046153", + "id": "10966838598160369228", "name": "aaaa", "namespace": "", "source_location": { @@ -286,7 +286,7 @@ template T add(T a, T b) ], "display_name": "A", "full_name": "clanguml::t20038::A", - "id": "2022724814881480995", + "id": "16181798519051847963", "name": "A", "namespace": "clanguml::t20038", "source_location": { @@ -300,7 +300,7 @@ template T add(T a, T b) { "display_name": "add(int,int)", "full_name": "clanguml::t20038::add(int,int)", - "id": "2008308445790932614", + "id": "16066467566327460914", "name": "add", "namespace": "clanguml::t20038", "source_location": { @@ -314,7 +314,7 @@ template T add(T a, T b) { "display_name": "add_impl(int,int)", "full_name": "clanguml::t20038::add_impl(int,int)", - "id": "1863007445376981099", + "id": "14904059563015848795", "name": "add_impl", "namespace": "clanguml::t20038", "source_location": { @@ -328,7 +328,7 @@ template T add(T a, T b) { "display_name": "add_impl(double,double)", "full_name": "clanguml::t20038::add_impl(double,double)", - "id": "1722521509166427875", + "id": "13780172073331423003", "name": "add_impl", "namespace": "clanguml::t20038", "source_location": { @@ -344,17 +344,17 @@ template T add(T a, T b) { "messages": [ { - "activity_id": "1013610625329227974", + "activity_id": "8108885002633823792", "branches": [ { "messages": [ { - "activity_id": "1013610625329227974", + "activity_id": "8108885002633823792", "messages": [ { "from": { - "activity_id": "1013610625329227974", - "participant_id": "1013610625329227974" + "activity_id": "8108885002633823792", + "participant_id": "8108885002633823792" }, "name": "b()", "return_type": "int", @@ -366,15 +366,15 @@ template T add(T a, T b) "translation_unit": "t20038.cc" }, "to": { - "activity_id": "690314603725772987", - "participant_id": "1040787777721396414" + "activity_id": "5522516829806183901", + "participant_id": "8326302221771171317" }, "type": "message" }, { "from": { - "activity_id": "690314603725772987", - "participant_id": "1040787777721396414" + "activity_id": "5522516829806183901", + "participant_id": "8326302221771171317" }, "name": "a()", "return_type": "int", @@ -386,8 +386,8 @@ template T add(T a, T b) "translation_unit": "t20038.cc" }, "to": { - "activity_id": "1311298747919334371", - "participant_id": "2022724814881480995" + "activity_id": "10490389983354674971", + "participant_id": "16181798519051847963" }, "type": "message" } @@ -403,8 +403,8 @@ template T add(T a, T b) { "comment": "... or just once", "from": { - "activity_id": "1013610625329227974", - "participant_id": "1013610625329227974" + "activity_id": "8108885002633823792", + "participant_id": "8108885002633823792" }, "name": "b()", "return_type": "int", @@ -416,15 +416,15 @@ template T add(T a, T b) "translation_unit": "t20038.cc" }, "to": { - "activity_id": "690314603725772987", - "participant_id": "1040787777721396414" + "activity_id": "5522516829806183901", + "participant_id": "8326302221771171317" }, "type": "message" }, { "from": { - "activity_id": "690314603725772987", - "participant_id": "1040787777721396414" + "activity_id": "5522516829806183901", + "participant_id": "8326302221771171317" }, "name": "a()", "return_type": "int", @@ -436,8 +436,8 @@ template T add(T a, T b) "translation_unit": "t20038.cc" }, "to": { - "activity_id": "1311298747919334371", - "participant_id": "2022724814881480995" + "activity_id": "10490389983354674971", + "participant_id": "16181798519051847963" }, "type": "message" } @@ -450,8 +450,8 @@ template T add(T a, T b) }, { "from": { - "activity_id": "1013610625329227974", - "participant_id": "1013610625329227974" + "activity_id": "8108885002633823792", + "participant_id": "8108885002633823792" }, "name": "bbb()", "return_type": "int", @@ -463,15 +463,15 @@ template T add(T a, T b) "translation_unit": "t20038.cc" }, "to": { - "activity_id": "1902331999195245434", - "participant_id": "1040787777721396414" + "activity_id": "15218655993561963475", + "participant_id": "8326302221771171317" }, "type": "message" }, { "from": { - "activity_id": "1902331999195245434", - "participant_id": "1040787777721396414" + "activity_id": "15218655993561963475", + "participant_id": "8326302221771171317" }, "name": "aaa()", "return_type": "int", @@ -483,15 +483,15 @@ template T add(T a, T b) "translation_unit": "t20038.cc" }, "to": { - "activity_id": "2157208254318041144", - "participant_id": "2022724814881480995" + "activity_id": "17257666034544329159", + "participant_id": "16181798519051847963" }, "type": "message" }, { "from": { - "activity_id": "1013610625329227974", - "participant_id": "1013610625329227974" + "activity_id": "8108885002633823792", + "participant_id": "8108885002633823792" }, "name": "bbbb()", "return_type": "int", @@ -503,15 +503,15 @@ template T add(T a, T b) "translation_unit": "t20038.cc" }, "to": { - "activity_id": "57189865474209187", - "participant_id": "1040787777721396414" + "activity_id": "457518923793673502", + "participant_id": "8326302221771171317" }, "type": "message" }, { "from": { - "activity_id": "57189865474209187", - "participant_id": "1040787777721396414" + "activity_id": "457518923793673502", + "participant_id": "8326302221771171317" }, "name": "aaaa()", "return_type": "int", @@ -523,15 +523,15 @@ template T add(T a, T b) "translation_unit": "t20038.cc" }, "to": { - "activity_id": "1370854824770046153", - "participant_id": "2022724814881480995" + "activity_id": "10966838598160369228", + "participant_id": "16181798519051847963" }, "type": "message" }, { "from": { - "activity_id": "1370854824770046153", - "participant_id": "2022724814881480995" + "activity_id": "10966838598160369228", + "participant_id": "16181798519051847963" }, "name": "", "return_type": "", @@ -543,15 +543,15 @@ template T add(T a, T b) "translation_unit": "t20038.cc" }, "to": { - "activity_id": "2008308445790932614", - "participant_id": "2008308445790932614" + "activity_id": "16066467566327460914", + "participant_id": "16066467566327460914" }, "type": "message" }, { "from": { - "activity_id": "2008308445790932614", - "participant_id": "2008308445790932614" + "activity_id": "16066467566327460914", + "participant_id": "16066467566327460914" }, "name": "", "return_type": "", @@ -563,16 +563,16 @@ template T add(T a, T b) "translation_unit": "t20038.cc" }, "to": { - "activity_id": "1863007445376981099", - "participant_id": "1863007445376981099" + "activity_id": "14904059563015848795", + "participant_id": "14904059563015848795" }, "type": "message" }, { "comment": "This comment should be rendered only once", "from": { - "activity_id": "1013610625329227974", - "participant_id": "1013610625329227974" + "activity_id": "8108885002633823792", + "participant_id": "8108885002633823792" }, "name": "wrap(int)", "return_type": "int", @@ -584,16 +584,16 @@ template T add(T a, T b) "translation_unit": "t20038.cc" }, "to": { - "activity_id": "732774941205637034", - "participant_id": "1040787777721396414" + "activity_id": "5862199529645096278", + "participant_id": "8326302221771171317" }, "type": "message" }, { "comment": "What is 2 + 2?", "from": { - "activity_id": "1013610625329227974", - "participant_id": "1013610625329227974" + "activity_id": "8108885002633823792", + "participant_id": "8108885002633823792" }, "name": "", "return_type": "", @@ -605,16 +605,16 @@ template T add(T a, T b) "translation_unit": "t20038.cc" }, "to": { - "activity_id": "1722521509166427875", - "participant_id": "1722521509166427875" + "activity_id": "13780172073331423003", + "participant_id": "13780172073331423003" }, "type": "message" }, { "comment": "This is a generic comment about calling bbbbb()", "from": { - "activity_id": "1013610625329227974", - "participant_id": "1013610625329227974" + "activity_id": "8108885002633823792", + "participant_id": "8108885002633823792" }, "name": "bbbbb()", "return_type": "int", @@ -626,15 +626,15 @@ template T add(T a, T b) "translation_unit": "t20038.cc" }, "to": { - "activity_id": "726295067786650864", - "participant_id": "1040787777721396414" + "activity_id": "5810360542293206912", + "participant_id": "8326302221771171317" }, "type": "message" }, { "from": { - "activity_id": "726295067786650864", - "participant_id": "1040787777721396414" + "activity_id": "5810360542293206912", + "participant_id": "8326302221771171317" }, "name": "aaaa()", "return_type": "int", @@ -646,15 +646,15 @@ template T add(T a, T b) "translation_unit": "t20038.cc" }, "to": { - "activity_id": "1370854824770046153", - "participant_id": "2022724814881480995" + "activity_id": "10966838598160369228", + "participant_id": "16181798519051847963" }, "type": "message" }, { "from": { - "activity_id": "1370854824770046153", - "participant_id": "2022724814881480995" + "activity_id": "10966838598160369228", + "participant_id": "16181798519051847963" }, "name": "", "return_type": "", @@ -666,15 +666,15 @@ template T add(T a, T b) "translation_unit": "t20038.cc" }, "to": { - "activity_id": "2008308445790932614", - "participant_id": "2008308445790932614" + "activity_id": "16066467566327460914", + "participant_id": "16066467566327460914" }, "type": "message" }, { "from": { - "activity_id": "2008308445790932614", - "participant_id": "2008308445790932614" + "activity_id": "16066467566327460914", + "participant_id": "16066467566327460914" }, "name": "", "return_type": "", @@ -686,21 +686,21 @@ template T add(T a, T b) "translation_unit": "t20038.cc" }, "to": { - "activity_id": "1863007445376981099", - "participant_id": "1863007445376981099" + "activity_id": "14904059563015848795", + "participant_id": "14904059563015848795" }, "type": "message" }, { - "activity_id": "1013610625329227974", + "activity_id": "8108885002633823792", "branches": [ { "messages": [ { "comment": "This is a conditional operator", "from": { - "activity_id": "1013610625329227974", - "participant_id": "1013610625329227974" + "activity_id": "8108885002633823792", + "participant_id": "8108885002633823792" }, "name": "bbb()", "return_type": "int", @@ -712,15 +712,15 @@ template T add(T a, T b) "translation_unit": "t20038.cc" }, "to": { - "activity_id": "1902331999195245434", - "participant_id": "1040787777721396414" + "activity_id": "15218655993561963475", + "participant_id": "8326302221771171317" }, "type": "message" }, { "from": { - "activity_id": "1902331999195245434", - "participant_id": "1040787777721396414" + "activity_id": "15218655993561963475", + "participant_id": "8326302221771171317" }, "name": "aaa()", "return_type": "int", @@ -732,8 +732,8 @@ template T add(T a, T b) "translation_unit": "t20038.cc" }, "to": { - "activity_id": "2157208254318041144", - "participant_id": "2022724814881480995" + "activity_id": "17257666034544329159", + "participant_id": "16181798519051847963" }, "type": "message" } @@ -749,7 +749,7 @@ template T add(T a, T b) } ], "start_from": { - "id": 1013610625329227974, + "id": "8108885002633823792", "location": "clanguml::t20038::tmain()" } } diff --git a/docs/test_cases/t20038_sequence.svg b/docs/test_cases/t20038_sequence.svg index b4282e63..9152cfb3 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,21 +163,21 @@ - + bbbb() - + aaaa() - + - + @@ -189,44 +189,44 @@ - + This comment should be rendered only once - + wrap(int) - + What is 2 + 2? - + - + Calling B::bbbbb() - + bbbbb() - + aaaa() - + - + @@ -238,23 +238,23 @@ - + This is a conditional operator alt - + This is a conditional operator - + [ bbb() ] - + aaa() diff --git a/docs/test_cases/t20039.md b/docs/test_cases/t20039.md index a6b9e2a4..2e452ae0 100644 --- a/docs/test_cases/t20039.md +++ b/docs/test_cases/t20039.md @@ -73,7 +73,7 @@ int tmain() { "display_name": "tmain()", "full_name": "clanguml::t20039::tmain()", - "id": "2148451609276010605", + "id": "17187612874208084846", "name": "tmain", "namespace": "clanguml::t20039", "source_location": { @@ -89,7 +89,7 @@ int tmain() { "display_name": "run()", "full_name": "clanguml::t20039::R::run()", - "id": "743095879760855186", + "id": "5944767038086841495", "name": "run", "namespace": "", "source_location": { @@ -103,7 +103,7 @@ int tmain() ], "display_name": "R", "full_name": "clanguml::t20039::R", - "id": "911510236910860394", + "id": "7292081895286883155", "name": "R", "namespace": "clanguml::t20039", "source_location": { @@ -119,7 +119,7 @@ int tmain() { "display_name": "a(int)", "full_name": "clanguml::t20039::A::a(int)", - "id": "1669283381205253105", + "id": "13354267049642024843", "name": "a", "namespace": "", "source_location": { @@ -133,7 +133,7 @@ int tmain() ], "display_name": "A", "full_name": "clanguml::t20039::A", - "id": "1909240382008619079", + "id": "15273923056068952633", "name": "A", "namespace": "clanguml::t20039", "source_location": { @@ -149,7 +149,7 @@ int tmain() { "display_name": "a(int_vec_t)", "full_name": "clanguml::t20039::A::a(int_vec_t)", - "id": "102043386959871430", + "id": "816347095678971446", "name": "a", "namespace": "", "source_location": { @@ -163,7 +163,7 @@ int tmain() ], "display_name": "A", "full_name": "clanguml::t20039::A", - "id": "2044714081517303079", + "id": "16357712652138424637", "name": "A", "namespace": "clanguml::t20039", "source_location": { @@ -179,7 +179,7 @@ int tmain() { "display_name": "a(string_vec_t)", "full_name": "clanguml::t20039::A::a(string_vec_t)", - "id": "877375915521239216", + "id": "7019007324169913734", "name": "a", "namespace": "", "source_location": { @@ -193,7 +193,7 @@ int tmain() ], "display_name": "A", "full_name": "clanguml::t20039::A", - "id": "985421674263139595", + "id": "7883373394105116761", "name": "A", "namespace": "clanguml::t20039", "source_location": { @@ -209,7 +209,7 @@ int tmain() { "display_name": "a(int_map_t)", "full_name": "clanguml::t20039::A::a(int_map_t)", - "id": "720393008985738554", + "id": "5763144071885908438", "name": "a", "namespace": "", "source_location": { @@ -223,7 +223,7 @@ int tmain() ], "display_name": "A", "full_name": "clanguml::t20039::A", - "id": "1577435969137543418", + "id": "12619487753100347345", "name": "A", "namespace": "clanguml::t20039", "source_location": { @@ -239,7 +239,7 @@ int tmain() { "display_name": "a(string_map_t)", "full_name": "clanguml::t20039::A::a(string_map_t)", - "id": "1228686762653429102", + "id": "9829494101227432821", "name": "a", "namespace": "", "source_location": { @@ -253,7 +253,7 @@ int tmain() ], "display_name": "A", "full_name": "clanguml::t20039::A", - "id": "1410668113085504962", + "id": "11285344904684039703", "name": "A", "namespace": "clanguml::t20039", "source_location": { @@ -270,8 +270,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "2148451609276010605", - "participant_id": "2148451609276010605" + "activity_id": "17187612874208084846", + "participant_id": "17187612874208084846" }, "name": "run()", "return_type": "void", @@ -283,15 +283,15 @@ int tmain() "translation_unit": "t20039.cc" }, "to": { - "activity_id": "743095879760855186", - "participant_id": "911510236910860394" + "activity_id": "5944767038086841495", + "participant_id": "7292081895286883155" }, "type": "message" }, { "from": { - "activity_id": "743095879760855186", - "participant_id": "911510236910860394" + "activity_id": "5944767038086841495", + "participant_id": "7292081895286883155" }, "name": "a(int)", "return_type": "std::vector", @@ -303,15 +303,15 @@ int tmain() "translation_unit": "t20039.cc" }, "to": { - "activity_id": "1669283381205253105", - "participant_id": "1909240382008619079" + "activity_id": "13354267049642024843", + "participant_id": "15273923056068952633" }, "type": "message" }, { "from": { - "activity_id": "743095879760855186", - "participant_id": "911510236910860394" + "activity_id": "5944767038086841495", + "participant_id": "7292081895286883155" }, "name": "a(int_vec_t)", "return_type": "std::vector>>>", @@ -323,15 +323,15 @@ int tmain() "translation_unit": "t20039.cc" }, "to": { - "activity_id": "102043386959871430", - "participant_id": "2044714081517303079" + "activity_id": "816347095678971446", + "participant_id": "16357712652138424637" }, "type": "message" }, { "from": { - "activity_id": "743095879760855186", - "participant_id": "911510236910860394" + "activity_id": "5944767038086841495", + "participant_id": "7292081895286883155" }, "name": "a(string_vec_t)", "return_type": "std::vector,allocator>,allocator,allocator>>>>>", @@ -343,15 +343,15 @@ int tmain() "translation_unit": "t20039.cc" }, "to": { - "activity_id": "877375915521239216", - "participant_id": "985421674263139595" + "activity_id": "7019007324169913734", + "participant_id": "7883373394105116761" }, "type": "message" }, { "from": { - "activity_id": "743095879760855186", - "participant_id": "911510236910860394" + "activity_id": "5944767038086841495", + "participant_id": "7292081895286883155" }, "name": "a(int_map_t)", "return_type": "std::vector,allocator>>>>", @@ -363,15 +363,15 @@ int tmain() "translation_unit": "t20039.cc" }, "to": { - "activity_id": "720393008985738554", - "participant_id": "1577435969137543418" + "activity_id": "5763144071885908438", + "participant_id": "12619487753100347345" }, "type": "message" }, { "from": { - "activity_id": "743095879760855186", - "participant_id": "911510236910860394" + "activity_id": "5944767038086841495", + "participant_id": "7292081895286883155" }, "name": "a(string_map_t)", "return_type": "std::vector,allocator>,basic_string,allocator>,less,allocator>>,allocator,allocator>,basic_string,allocator>>>>>>", @@ -383,14 +383,14 @@ int tmain() "translation_unit": "t20039.cc" }, "to": { - "activity_id": "1228686762653429102", - "participant_id": "1410668113085504962" + "activity_id": "9829494101227432821", + "participant_id": "11285344904684039703" }, "type": "message" } ], "start_from": { - "id": 2148451609276010605, + "id": "17187612874208084846", "location": "clanguml::t20039::tmain()" } } diff --git a/docs/test_cases/t20039_sequence.svg b/docs/test_cases/t20039_sequence.svg index bea03fa5..bdf06fc4 100644 --- a/docs/test_cases/t20039_sequence.svg +++ b/docs/test_cases/t20039_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,13 +9,13 @@ - - - - - - - + + + + + + + @@ -23,89 +23,89 @@ - - + + tmain() - + tmain() - - + + R - + R - - + + A<int> - + A<int> - - + + A<int_vec_t> - + A<int_vec_t> - - + + A<string_vec_t> - + A<string_vec_t> - - + + A<int_map_t> - + A<int_map_t> - - + + A<string_map_t> - + A<string_map_t> - - - - - - - - + + + + + + + + run() - + a(int) - + a(int_vec_t) - + a(string_vec_t) - + a(int_map_t) - + a(string_map_t) diff --git a/docs/test_cases/t20040.md b/docs/test_cases/t20040.md index 65ed54af..87926417 100644 --- a/docs/test_cases/t20040.md +++ b/docs/test_cases/t20040.md @@ -58,7 +58,7 @@ void tmain() { "display_name": "tmain()", "full_name": "clanguml::t20040::tmain()", - "id": "998622560147459663", + "id": "7988980481179677306", "name": "tmain", "namespace": "clanguml::t20040", "source_location": { @@ -72,7 +72,7 @@ void tmain() { "display_name": "print(int,double,std::string)", "full_name": "clanguml::t20040::print(int,double,std::basic_string)", - "id": "466846361794024298", + "id": "3734770894352194386", "name": "print", "namespace": "clanguml::t20040", "source_location": { @@ -86,7 +86,7 @@ void tmain() { "display_name": "print(double,std::string)", "full_name": "clanguml::t20040::print(double,std::basic_string)", - "id": "1387681712381484036", + "id": "11101453699051872291", "name": "print", "namespace": "clanguml::t20040", "source_location": { @@ -100,7 +100,7 @@ void tmain() { "display_name": "print(std::string)", "full_name": "clanguml::t20040::print(std::basic_string)", - "id": "1353926867284821849", + "id": "10831414938278574793", "name": "print", "namespace": "clanguml::t20040", "source_location": { @@ -114,7 +114,7 @@ void tmain() { "display_name": "print()", "full_name": "clanguml::t20040::print()", - "id": "245418438894072749", + "id": "1963347511152581998", "name": "print", "namespace": "clanguml::t20040", "source_location": { @@ -128,7 +128,7 @@ void tmain() { "display_name": "doublePrint(std::string,int)", "full_name": "clanguml::t20040::doublePrint(std::basic_string,int)", - "id": "2024126405552345351", + "id": "16193011244418762811", "name": "doublePrint", "namespace": "clanguml::t20040", "source_location": { @@ -142,7 +142,7 @@ void tmain() { "display_name": "print(std::string,int)", "full_name": "clanguml::t20040::print(std::basic_string,int)", - "id": "1349996183789322606", + "id": "10799969470314580850", "name": "print", "namespace": "clanguml::t20040", "source_location": { @@ -156,7 +156,7 @@ void tmain() { "display_name": "print(int)", "full_name": "clanguml::t20040::print(int)", - "id": "1189427464789523930", + "id": "9515419718316191441", "name": "print", "namespace": "clanguml::t20040", "source_location": { @@ -173,8 +173,8 @@ void tmain() "messages": [ { "from": { - "activity_id": "998622560147459663", - "participant_id": "998622560147459663" + "activity_id": "7988980481179677306", + "participant_id": "7988980481179677306" }, "name": "", "return_type": "", @@ -186,15 +186,15 @@ void tmain() "translation_unit": "t20040.cc" }, "to": { - "activity_id": "466846361794024298", - "participant_id": "466846361794024298" + "activity_id": "3734770894352194386", + "participant_id": "3734770894352194386" }, "type": "message" }, { "from": { - "activity_id": "466846361794024298", - "participant_id": "466846361794024298" + "activity_id": "3734770894352194386", + "participant_id": "3734770894352194386" }, "name": "", "return_type": "", @@ -206,15 +206,15 @@ void tmain() "translation_unit": "t20040.cc" }, "to": { - "activity_id": "1387681712381484036", - "participant_id": "1387681712381484036" + "activity_id": "11101453699051872291", + "participant_id": "11101453699051872291" }, "type": "message" }, { "from": { - "activity_id": "1387681712381484036", - "participant_id": "1387681712381484036" + "activity_id": "11101453699051872291", + "participant_id": "11101453699051872291" }, "name": "", "return_type": "", @@ -226,15 +226,15 @@ void tmain() "translation_unit": "t20040.cc" }, "to": { - "activity_id": "1353926867284821849", - "participant_id": "1353926867284821849" + "activity_id": "10831414938278574793", + "participant_id": "10831414938278574793" }, "type": "message" }, { "from": { - "activity_id": "1353926867284821849", - "participant_id": "1353926867284821849" + "activity_id": "10831414938278574793", + "participant_id": "10831414938278574793" }, "name": "", "return_type": "void", @@ -246,15 +246,15 @@ void tmain() "translation_unit": "t20040.cc" }, "to": { - "activity_id": "245418438894072749", - "participant_id": "245418438894072749" + "activity_id": "1963347511152581998", + "participant_id": "1963347511152581998" }, "type": "message" }, { "from": { - "activity_id": "998622560147459663", - "participant_id": "998622560147459663" + "activity_id": "7988980481179677306", + "participant_id": "7988980481179677306" }, "name": "", "return_type": "", @@ -266,15 +266,15 @@ void tmain() "translation_unit": "t20040.cc" }, "to": { - "activity_id": "2024126405552345351", - "participant_id": "2024126405552345351" + "activity_id": "16193011244418762811", + "participant_id": "16193011244418762811" }, "type": "message" }, { "from": { - "activity_id": "2024126405552345351", - "participant_id": "2024126405552345351" + "activity_id": "16193011244418762811", + "participant_id": "16193011244418762811" }, "name": "", "return_type": "", @@ -286,15 +286,15 @@ void tmain() "translation_unit": "t20040.cc" }, "to": { - "activity_id": "1349996183789322606", - "participant_id": "1349996183789322606" + "activity_id": "10799969470314580850", + "participant_id": "10799969470314580850" }, "type": "message" }, { "from": { - "activity_id": "1349996183789322606", - "participant_id": "1349996183789322606" + "activity_id": "10799969470314580850", + "participant_id": "10799969470314580850" }, "name": "", "return_type": "", @@ -306,15 +306,15 @@ void tmain() "translation_unit": "t20040.cc" }, "to": { - "activity_id": "1189427464789523930", - "participant_id": "1189427464789523930" + "activity_id": "9515419718316191441", + "participant_id": "9515419718316191441" }, "type": "message" }, { "from": { - "activity_id": "1189427464789523930", - "participant_id": "1189427464789523930" + "activity_id": "9515419718316191441", + "participant_id": "9515419718316191441" }, "name": "", "return_type": "void", @@ -326,14 +326,14 @@ void tmain() "translation_unit": "t20040.cc" }, "to": { - "activity_id": "245418438894072749", - "participant_id": "245418438894072749" + "activity_id": "1963347511152581998", + "participant_id": "1963347511152581998" }, "type": "message" } ], "start_from": { - "id": 998622560147459663, + "id": "7988980481179677306", "location": "clanguml::t20040::tmain()" } } diff --git a/docs/test_cases/t20040_sequence.svg b/docs/test_cases/t20040_sequence.svg index 29b0d86d..3e7d80b2 100644 --- a/docs/test_cases/t20040_sequence.svg +++ b/docs/test_cases/t20040_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,15 +9,15 @@ - - - - - - - - - + + + + + + + + + @@ -26,92 +26,92 @@ - - + + tmain() - + tmain() - - + + print<int,double,std::string>(int,double,std::string) - + print<int,double,std::string>(int,double,std::string) - - + + print<double,std::string>(double,std::string) - + print<double,std::string>(double,std::string) - - + + print<std::string>(std::string) - + print<std::string>(std::string) - - + + print() - + print() - - + + doublePrint<std::string,int>(std::string,int) - + doublePrint<std::string,int>(std::string,int) - - + + print<std::string,int>(std::string,int) - + print<std::string,int>(std::string,int) - - + + print<int>(int) - + print<int>(int) - - - - - - - - - - + + + + + + + + + + - + - + - + - + - + - + - + diff --git a/docs/test_cases/t20041.md b/docs/test_cases/t20041.md index a1a81c1e..2a9733e0 100644 --- a/docs/test_cases/t20041.md +++ b/docs/test_cases/t20041.md @@ -61,7 +61,7 @@ void tmain() { "display_name": "tmain()", "full_name": "clanguml::t20041::tmain()", - "id": "1389566400082670258", + "id": "11116531200661362065", "name": "tmain", "namespace": "clanguml::t20041", "source_location": { @@ -77,7 +77,7 @@ void tmain() { "display_name": "print(int,double,std::string)", "full_name": "clanguml::t20041::A::print(int,double,std::string)", - "id": "532000038063429229", + "id": "4256000304507433832", "name": "print", "namespace": "", "source_location": { @@ -91,7 +91,7 @@ void tmain() ], "display_name": "A", "full_name": "clanguml::t20041::A", - "id": "832678750316145968", + "id": "6661430002529167748", "name": "A", "namespace": "clanguml::t20041", "source_location": { @@ -107,7 +107,7 @@ void tmain() { "display_name": "print(double,std::string)", "full_name": "clanguml::t20041::A::print(double,std::string)", - "id": "1403962403457522629", + "id": "11231699227660181036", "name": "print", "namespace": "", "source_location": { @@ -121,7 +121,7 @@ void tmain() ], "display_name": "A", "full_name": "clanguml::t20041::A", - "id": "942399465509044163", + "id": "7539195724072353305", "name": "A", "namespace": "clanguml::t20041", "source_location": { @@ -137,7 +137,7 @@ void tmain() { "display_name": "print(std::string)", "full_name": "clanguml::t20041::A::print(std::string)", - "id": "1658479415048358058", + "id": "13267835320386864470", "name": "print", "namespace": "", "source_location": { @@ -151,7 +151,7 @@ void tmain() ], "display_name": "A", "full_name": "clanguml::t20041::A", - "id": "1390965848075226081", + "id": "11127726784601808651", "name": "A", "namespace": "clanguml::t20041", "source_location": { @@ -167,7 +167,7 @@ void tmain() { "display_name": "print()", "full_name": "clanguml::t20041::A::print()", - "id": "1295142493768214222", + "id": "10361139950145713778", "name": "print", "namespace": "", "source_location": { @@ -181,7 +181,7 @@ void tmain() ], "display_name": "A", "full_name": "clanguml::t20041::A", - "id": "1052108783247143031", + "id": "8416870265977144249", "name": "A", "namespace": "clanguml::t20041", "source_location": { @@ -198,8 +198,8 @@ void tmain() "messages": [ { "from": { - "activity_id": "1389566400082670258", - "participant_id": "1389566400082670258" + "activity_id": "11116531200661362065", + "participant_id": "11116531200661362065" }, "name": "print(int,double,std::string)", "return_type": "void", @@ -211,15 +211,15 @@ void tmain() "translation_unit": "t20041.cc" }, "to": { - "activity_id": "532000038063429229", - "participant_id": "832678750316145968" + "activity_id": "4256000304507433832", + "participant_id": "6661430002529167748" }, "type": "message" }, { "from": { - "activity_id": "532000038063429229", - "participant_id": "832678750316145968" + "activity_id": "4256000304507433832", + "participant_id": "6661430002529167748" }, "name": "print(double,std::string)", "return_type": "void", @@ -231,15 +231,15 @@ void tmain() "translation_unit": "t20041.cc" }, "to": { - "activity_id": "1403962403457522629", - "participant_id": "942399465509044163" + "activity_id": "11231699227660181036", + "participant_id": "7539195724072353305" }, "type": "message" }, { "from": { - "activity_id": "1403962403457522629", - "participant_id": "942399465509044163" + "activity_id": "11231699227660181036", + "participant_id": "7539195724072353305" }, "name": "print(std::string)", "return_type": "void", @@ -251,15 +251,15 @@ void tmain() "translation_unit": "t20041.cc" }, "to": { - "activity_id": "1658479415048358058", - "participant_id": "1390965848075226081" + "activity_id": "13267835320386864470", + "participant_id": "11127726784601808651" }, "type": "message" }, { "from": { - "activity_id": "1658479415048358058", - "participant_id": "1390965848075226081" + "activity_id": "13267835320386864470", + "participant_id": "11127726784601808651" }, "name": "print()", "return_type": "void", @@ -271,14 +271,14 @@ void tmain() "translation_unit": "t20041.cc" }, "to": { - "activity_id": "1295142493768214222", - "participant_id": "1052108783247143031" + "activity_id": "10361139950145713778", + "participant_id": "8416870265977144249" }, "type": "message" } ], "start_from": { - "id": 1389566400082670258, + "id": "11116531200661362065", "location": "clanguml::t20041::tmain()" } } diff --git a/docs/test_cases/t20041_sequence.svg b/docs/test_cases/t20041_sequence.svg index 7a15ce51..cff691e2 100644 --- a/docs/test_cases/t20041_sequence.svg +++ b/docs/test_cases/t20041_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,67 +9,67 @@ - - - - - + + + + + - - + + tmain() - + tmain() - - + + A<int,double,std::string> - + A<int,double,std::string> - - + + A<double,std::string> - + A<double,std::string> - - + + A<std::string> - + A<std::string> - - + + A - + A - - - - - - + + + + + + print(int,double,std::string) - + print(double,std::string) - + print(std::string) - + print() diff --git a/docs/test_cases/t20042.md b/docs/test_cases/t20042.md index 3ee6b46f..777ed1e0 100644 --- a/docs/test_cases/t20042.md +++ b/docs/test_cases/t20042.md @@ -60,7 +60,7 @@ void tmain() { "display_name": "tmain()", "full_name": "clanguml::t20042::tmain()", - "id": "609011973422503266", + "id": "4872095787380026130", "name": "tmain", "namespace": "clanguml::t20042", "source_location": { @@ -76,7 +76,7 @@ void tmain() { "display_name": "operator()(A &) const", "full_name": "clanguml::t20042::AHandler::operator()(A &) const", - "id": "1803150869170812951", + "id": "14425206953366503609", "name": "operator()", "namespace": "", "source_location": { @@ -90,7 +90,7 @@ void tmain() { "display_name": "handle(A &) const", "full_name": "clanguml::t20042::AHandler::handle(A &) const", - "id": "505918958102707204", + "id": "4047351664821657638", "name": "handle", "namespace": "", "source_location": { @@ -104,7 +104,7 @@ void tmain() ], "display_name": "AHandler", "full_name": "clanguml::t20042::AHandler", - "id": "169029708750481998", + "id": "1352237670003855986", "name": "AHandler", "namespace": "clanguml::t20042", "source_location": { @@ -120,7 +120,7 @@ void tmain() { "display_name": "operator()(B &) const", "full_name": "clanguml::t20042::BHandler::operator()(B &) const", - "id": "1635511505447928279", + "id": "13084092043583426233", "name": "operator()", "namespace": "", "source_location": { @@ -134,7 +134,7 @@ void tmain() { "display_name": "handle(B &) const", "full_name": "clanguml::t20042::BHandler::handle(B &) const", - "id": "869419286648646110", + "id": "6955354293189168883", "name": "handle", "namespace": "", "source_location": { @@ -148,7 +148,7 @@ void tmain() ], "display_name": "BHandler", "full_name": "clanguml::t20042::BHandler", - "id": "1969158228859108037", + "id": "15753265830872864301", "name": "BHandler", "namespace": "clanguml::t20042", "source_location": { @@ -165,8 +165,8 @@ void tmain() "messages": [ { "from": { - "activity_id": "609011973422503266", - "participant_id": "609011973422503266" + "activity_id": "4872095787380026130", + "participant_id": "4872095787380026130" }, "name": "operator()(A &) const", "return_type": "void", @@ -178,15 +178,15 @@ void tmain() "translation_unit": "t20042.cc" }, "to": { - "activity_id": "1803150869170812951", - "participant_id": "169029708750481998" + "activity_id": "14425206953366503609", + "participant_id": "1352237670003855986" }, "type": "message" }, { "from": { - "activity_id": "1803150869170812951", - "participant_id": "169029708750481998" + "activity_id": "14425206953366503609", + "participant_id": "1352237670003855986" }, "name": "handle(A &) const", "return_type": "void", @@ -198,15 +198,15 @@ void tmain() "translation_unit": "t20042.cc" }, "to": { - "activity_id": "505918958102707204", - "participant_id": "169029708750481998" + "activity_id": "4047351664821657638", + "participant_id": "1352237670003855986" }, "type": "message" }, { "from": { - "activity_id": "609011973422503266", - "participant_id": "609011973422503266" + "activity_id": "4872095787380026130", + "participant_id": "4872095787380026130" }, "name": "operator()(B &) const", "return_type": "void", @@ -218,15 +218,15 @@ void tmain() "translation_unit": "t20042.cc" }, "to": { - "activity_id": "1635511505447928279", - "participant_id": "1969158228859108037" + "activity_id": "13084092043583426233", + "participant_id": "15753265830872864301" }, "type": "message" }, { "from": { - "activity_id": "1635511505447928279", - "participant_id": "1969158228859108037" + "activity_id": "13084092043583426233", + "participant_id": "15753265830872864301" }, "name": "handle(B &) const", "return_type": "void", @@ -238,14 +238,14 @@ void tmain() "translation_unit": "t20042.cc" }, "to": { - "activity_id": "869419286648646110", - "participant_id": "1969158228859108037" + "activity_id": "6955354293189168883", + "participant_id": "15753265830872864301" }, "type": "message" } ], "start_from": { - "id": 609011973422503266, + "id": "4872095787380026130", "location": "clanguml::t20042::tmain()" } } diff --git a/docs/test_cases/t20042_sequence.svg b/docs/test_cases/t20042_sequence.svg index 9fdd5b58..486ff6cc 100644 --- a/docs/test_cases/t20042_sequence.svg +++ b/docs/test_cases/t20042_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,55 +9,55 @@ - - - - - + + + + + - - + + tmain() - + tmain() - - + + AHandler - + AHandler - - + + BHandler - + BHandler - - - - - - + + + + + + operator()(A &) const - + handle(A &) const - + operator()(B &) const - + diff --git a/docs/test_cases/t20043.md b/docs/test_cases/t20043.md index 6c420471..24708a30 100644 --- a/docs/test_cases/t20043.md +++ b/docs/test_cases/t20043.md @@ -84,7 +84,7 @@ int tmain() { "display_name": "tmain()", "full_name": "clanguml::t20043::tmain()", - "id": "1396184337601679046", + "id": "11169474700813432371", "name": "tmain", "namespace": "clanguml::t20043", "source_location": { @@ -100,7 +100,7 @@ int tmain() { "display_name": "d()", "full_name": "clanguml::t20043::D::d()", - "id": "60379393461478854", + "id": "483035147691830839", "name": "d", "namespace": "", "source_location": { @@ -114,7 +114,7 @@ int tmain() ], "display_name": "D", "full_name": "clanguml::t20043::D", - "id": "1632049250551188852", + "id": "13056394004409510818", "name": "D", "namespace": "clanguml::t20043", "source_location": { @@ -130,7 +130,7 @@ int tmain() { "display_name": "c()", "full_name": "clanguml::t20043::C::c()", - "id": "998868776840486830", + "id": "7990950214723894643", "name": "c", "namespace": "", "source_location": { @@ -144,7 +144,7 @@ int tmain() ], "display_name": "C", "full_name": "clanguml::t20043::C", - "id": "605388621050971304", + "id": "4843108968407770439", "name": "C", "namespace": "clanguml::t20043", "source_location": { @@ -161,8 +161,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "1396184337601679046", - "participant_id": "1396184337601679046" + "activity_id": "11169474700813432371", + "participant_id": "11169474700813432371" }, "name": "d()", "return_type": "int", @@ -174,15 +174,15 @@ int tmain() "translation_unit": "t20043.cc" }, "to": { - "activity_id": "60379393461478854", - "participant_id": "1632049250551188852" + "activity_id": "483035147691830839", + "participant_id": "13056394004409510818" }, "type": "message" }, { "from": { - "activity_id": "60379393461478854", - "participant_id": "1632049250551188852" + "activity_id": "483035147691830839", + "participant_id": "13056394004409510818" }, "name": "c()", "return_type": "int", @@ -194,14 +194,14 @@ int tmain() "translation_unit": "t20043.cc" }, "to": { - "activity_id": "998868776840486830", - "participant_id": "605388621050971304" + "activity_id": "7990950214723894643", + "participant_id": "4843108968407770439" }, "type": "message" } ], "start_from": { - "id": 1396184337601679046, + "id": "11169474700813432371", "location": "clanguml::t20043::tmain()" } } diff --git a/docs/test_cases/t20043_sequence.svg b/docs/test_cases/t20043_sequence.svg index ba5c358a..c7c53d63 100644 --- a/docs/test_cases/t20043_sequence.svg +++ b/docs/test_cases/t20043_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,39 +9,39 @@ - - - + + + - - + + tmain() - + tmain() - - + + D - + D - - + + C - + C - - - - + + + + d() - + c() diff --git a/docs/test_cases/t20044.md b/docs/test_cases/t20044.md index 4a7d6d5b..5b41d1af 100644 --- a/docs/test_cases/t20044.md +++ b/docs/test_cases/t20044.md @@ -138,7 +138,7 @@ int tmain() { "display_name": "tmain()", "full_name": "clanguml::t20044::tmain()", - "id": "252888248193934644", + "id": "2023105985551477155", "name": "tmain", "namespace": "clanguml::t20044", "source_location": { @@ -154,7 +154,7 @@ int tmain() { "display_name": "R((lambda at t20044.cc:74:9) &&)", "full_name": "clanguml::t20044::R::R((lambda at t20044.cc:74:9) &&)", - "id": "2121949343931231437", + "id": "16975594751449851498", "name": "R", "namespace": "", "source_location": { @@ -168,7 +168,7 @@ int tmain() ], "display_name": "R", "full_name": "clanguml::t20044::R", - "id": "1556111147598935846", + "id": "12448889180791486772", "name": "R", "namespace": "clanguml::t20044", "source_location": { @@ -184,7 +184,7 @@ int tmain() { "display_name": "operator()() const", "full_name": "clanguml::t20044::tmain()::(lambda t20044.cc:74:9)::operator()() const", - "id": "818357152220364831", + "id": "6546857217762918655", "name": "operator()", "namespace": "", "type": "method" @@ -192,7 +192,7 @@ int tmain() ], "display_name": "tmain()::(lambda t20044.cc:74:9)", "full_name": "clanguml::t20044::tmain()::(lambda t20044.cc:74:9)", - "id": "731168008522991712", + "id": "5849344068183933696", "name": "tmain()::(lambda t20044.cc:74:9)", "namespace": "clanguml::t20044", "source_location": { @@ -208,7 +208,7 @@ int tmain() { "display_name": "a() const", "full_name": "clanguml::t20044::A::a() const", - "id": "853950074322224524", + "id": "6831600594577796197", "name": "a", "namespace": "", "source_location": { @@ -222,7 +222,7 @@ int tmain() { "display_name": "a5()", "full_name": "clanguml::t20044::A::a5()", - "id": "1743691164520385657", + "id": "13949529316163085262", "name": "a5", "namespace": "", "source_location": { @@ -236,7 +236,7 @@ int tmain() { "display_name": "a1() const", "full_name": "clanguml::t20044::A::a1() const", - "id": "701399225037526851", + "id": "5611193800300214809", "name": "a1", "namespace": "", "source_location": { @@ -250,7 +250,7 @@ int tmain() { "display_name": "a2(int) const", "full_name": "clanguml::t20044::A::a2(int) const", - "id": "85144570008244024", + "id": "681156560065952195", "name": "a2", "namespace": "", "source_location": { @@ -264,7 +264,7 @@ int tmain() ], "display_name": "A", "full_name": "clanguml::t20044::A", - "id": "1026615617828083132", + "id": "8212924942624665062", "name": "A", "namespace": "clanguml::t20044", "source_location": { @@ -280,7 +280,7 @@ int tmain() { "display_name": "operator()() const", "full_name": "clanguml::t20044::tmain()::(lambda t20044.cc:84:18)::operator()() const", - "id": "436096372302626180", + "id": "3488770978421009441", "name": "operator()", "namespace": "", "type": "method" @@ -288,7 +288,7 @@ int tmain() ], "display_name": "tmain()::(lambda t20044.cc:84:18)", "full_name": "clanguml::t20044::tmain()::(lambda t20044.cc:84:18)", - "id": "1462639563075674191", + "id": "11701116504605393532", "name": "tmain()::(lambda t20044.cc:84:18)", "namespace": "clanguml::t20044", "source_location": { @@ -304,7 +304,7 @@ int tmain() { "display_name": "expected(int)", "full_name": "clanguml::t20044::detail::expected::expected(int)", - "id": "1539466150622485129", + "id": "12315729204979881038", "name": "expected", "namespace": "", "source_location": { @@ -318,7 +318,7 @@ int tmain() { "display_name": "and_then((lambda at t20044.cc:90:19) &&)", "full_name": "clanguml::t20044::detail::expected::and_then((lambda at t20044.cc:90:19) &&)", - "id": "377073498530267347", + "id": "3016587988242138783", "name": "and_then", "namespace": "", "source_location": { @@ -332,7 +332,7 @@ int tmain() { "display_name": "and_then(result_t (&)(int))", "full_name": "clanguml::t20044::detail::expected::and_then(result_t (&)(int))", - "id": "1974891758151777473", + "id": "15799134065214219790", "name": "and_then", "namespace": "", "source_location": { @@ -346,7 +346,7 @@ int tmain() { "display_name": "and_then(std::function &)", "full_name": "clanguml::t20044::detail::expected::and_then(std::function &)", - "id": "1228620055083656606", + "id": "9828960440669252853", "name": "and_then", "namespace": "", "source_location": { @@ -360,7 +360,7 @@ int tmain() { "display_name": "value() const", "full_name": "clanguml::t20044::detail::expected::value() const", - "id": "954804726969205606", + "id": "7638437815753644849", "name": "value", "namespace": "", "source_location": { @@ -374,7 +374,7 @@ int tmain() ], "display_name": "result_t", "full_name": "clanguml::t20044::detail::expected", - "id": "109801426773060225", + "id": "878411414184481802", "name": "expected", "namespace": "clanguml::t20044::detail", "source_location": { @@ -390,7 +390,7 @@ int tmain() { "display_name": "operator()(auto &&) const", "full_name": "clanguml::t20044::tmain()::(lambda t20044.cc:90:19)::operator()(auto &&) const", - "id": "1768106129901104346", + "id": "14144849039208834774", "name": "operator()", "namespace": "", "type": "method" @@ -398,7 +398,7 @@ int tmain() ], "display_name": "tmain()::(lambda t20044.cc:90:19)", "full_name": "clanguml::t20044::tmain()::(lambda t20044.cc:90:19)", - "id": "929315761786829928", + "id": "7434526094294639429", "name": "tmain()::(lambda t20044.cc:90:19)", "namespace": "clanguml::t20044", "source_location": { @@ -415,8 +415,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "252888248193934644", - "participant_id": "252888248193934644" + "activity_id": "2023105985551477155", + "participant_id": "2023105985551477155" }, "name": "R((lambda at t20044.cc:74:9) &&)", "return_type": "void", @@ -428,15 +428,15 @@ int tmain() "translation_unit": "t20044.cc" }, "to": { - "activity_id": "2121949343931231437", - "participant_id": "1556111147598935846" + "activity_id": "16975594751449851498", + "participant_id": "12448889180791486772" }, "type": "message" }, { "from": { - "activity_id": "2121949343931231437", - "participant_id": "1556111147598935846" + "activity_id": "16975594751449851498", + "participant_id": "12448889180791486772" }, "name": "operator()() const", "return_type": "void", @@ -448,16 +448,16 @@ int tmain() "translation_unit": "t20044.cc" }, "to": { - "activity_id": "818357152220364831", - "participant_id": "731168008522991712" + "activity_id": "6546857217762918655", + "participant_id": "5849344068183933696" }, "type": "message" }, { "comment": "Call to template constructor with callable parameter and lambda\nexpression as argument", "from": { - "activity_id": "818357152220364831", - "participant_id": "731168008522991712" + "activity_id": "6546857217762918655", + "participant_id": "5849344068183933696" }, "name": "a() const", "return_type": "void", @@ -469,15 +469,15 @@ int tmain() "translation_unit": "t20044.cc" }, "to": { - "activity_id": "853950074322224524", - "participant_id": "1026615617828083132" + "activity_id": "6831600594577796197", + "participant_id": "8212924942624665062" }, "type": "message" }, { "from": { - "activity_id": "252888248193934644", - "participant_id": "252888248193934644" + "activity_id": "2023105985551477155", + "participant_id": "2023105985551477155" }, "name": "operator()() const", "return_type": "void", @@ -489,16 +489,16 @@ int tmain() "translation_unit": "t20044.cc" }, "to": { - "activity_id": "436096372302626180", - "participant_id": "1462639563075674191" + "activity_id": "3488770978421009441", + "participant_id": "11701116504605393532" }, "type": "message" }, { "comment": "The message to detail2::run() is skipped due to exclude filter, however\nthe call to lambda and A::a5() is rendered\nTODO: Add some marker to highlight that this is not a direct call", "from": { - "activity_id": "436096372302626180", - "participant_id": "1462639563075674191" + "activity_id": "3488770978421009441", + "participant_id": "11701116504605393532" }, "name": "a5()", "return_type": "void", @@ -510,15 +510,15 @@ int tmain() "translation_unit": "t20044.cc" }, "to": { - "activity_id": "1743691164520385657", - "participant_id": "1026615617828083132" + "activity_id": "13949529316163085262", + "participant_id": "8212924942624665062" }, "type": "message" }, { "from": { - "activity_id": "252888248193934644", - "participant_id": "252888248193934644" + "activity_id": "2023105985551477155", + "participant_id": "2023105985551477155" }, "name": "a1() const", "return_type": "result_t", @@ -530,15 +530,15 @@ int tmain() "translation_unit": "t20044.cc" }, "to": { - "activity_id": "701399225037526851", - "participant_id": "1026615617828083132" + "activity_id": "5611193800300214809", + "participant_id": "8212924942624665062" }, "type": "message" }, { "from": { - "activity_id": "701399225037526851", - "participant_id": "1026615617828083132" + "activity_id": "5611193800300214809", + "participant_id": "8212924942624665062" }, "name": "expected(int)", "return_type": "void", @@ -550,15 +550,15 @@ int tmain() "translation_unit": "t20044.cc" }, "to": { - "activity_id": "1539466150622485129", - "participant_id": "109801426773060225" + "activity_id": "12315729204979881038", + "participant_id": "878411414184481802" }, "type": "message" }, { "from": { - "activity_id": "252888248193934644", - "participant_id": "252888248193934644" + "activity_id": "2023105985551477155", + "participant_id": "2023105985551477155" }, "name": "and_then((lambda at t20044.cc:90:19) &&)", "return_type": "result_t", @@ -570,20 +570,20 @@ int tmain() "translation_unit": "t20044.cc" }, "to": { - "activity_id": "377073498530267347", - "participant_id": "109801426773060225" + "activity_id": "3016587988242138783", + "participant_id": "878411414184481802" }, "type": "message" }, { - "activity_id": "377073498530267347", + "activity_id": "3016587988242138783", "branches": [ { "messages": [ { "from": { - "activity_id": "377073498530267347", - "participant_id": "109801426773060225" + "activity_id": "3016587988242138783", + "participant_id": "878411414184481802" }, "name": "operator()(auto &&) const", "return_type": "auto", @@ -595,16 +595,16 @@ int tmain() "translation_unit": "t20044.cc" }, "to": { - "activity_id": "1768106129901104346", - "participant_id": "929315761786829928" + "activity_id": "14144849039208834774", + "participant_id": "7434526094294639429" }, "type": "message" }, { "comment": "Call to a template method accepting a callable with lambda expression\nas argument, fully tracked showing method's activity and", "from": { - "activity_id": "1768106129901104346", - "participant_id": "929315761786829928" + "activity_id": "14144849039208834774", + "participant_id": "7434526094294639429" }, "name": "a2(int) const", "return_type": "result_t", @@ -616,15 +616,15 @@ int tmain() "translation_unit": "t20044.cc" }, "to": { - "activity_id": "85144570008244024", - "participant_id": "1026615617828083132" + "activity_id": "681156560065952195", + "participant_id": "8212924942624665062" }, "type": "message" }, { "from": { - "activity_id": "85144570008244024", - "participant_id": "1026615617828083132" + "activity_id": "681156560065952195", + "participant_id": "8212924942624665062" }, "name": "expected(int)", "return_type": "void", @@ -636,8 +636,8 @@ int tmain() "translation_unit": "t20044.cc" }, "to": { - "activity_id": "1539466150622485129", - "participant_id": "109801426773060225" + "activity_id": "12315729204979881038", + "participant_id": "878411414184481802" }, "type": "message" } @@ -650,8 +650,8 @@ int tmain() }, { "from": { - "activity_id": "252888248193934644", - "participant_id": "252888248193934644" + "activity_id": "2023105985551477155", + "participant_id": "2023105985551477155" }, "name": "and_then(result_t (&)(int))", "return_type": "result_t", @@ -663,15 +663,15 @@ int tmain() "translation_unit": "t20044.cc" }, "to": { - "activity_id": "1974891758151777473", - "participant_id": "109801426773060225" + "activity_id": "15799134065214219790", + "participant_id": "878411414184481802" }, "type": "message" }, { "from": { - "activity_id": "252888248193934644", - "participant_id": "252888248193934644" + "activity_id": "2023105985551477155", + "participant_id": "2023105985551477155" }, "name": "and_then(std::function &)", "return_type": "result_t", @@ -683,15 +683,15 @@ int tmain() "translation_unit": "t20044.cc" }, "to": { - "activity_id": "1228620055083656606", - "participant_id": "109801426773060225" + "activity_id": "9828960440669252853", + "participant_id": "878411414184481802" }, "type": "message" }, { "from": { - "activity_id": "252888248193934644", - "participant_id": "252888248193934644" + "activity_id": "2023105985551477155", + "participant_id": "2023105985551477155" }, "name": "value() const", "return_type": "int const &", @@ -703,14 +703,14 @@ int tmain() "translation_unit": "t20044.cc" }, "to": { - "activity_id": "954804726969205606", - "participant_id": "109801426773060225" + "activity_id": "7638437815753644849", + "participant_id": "878411414184481802" }, "type": "message" } ], "start_from": { - "id": 252888248193934644, + "id": "2023105985551477155", "location": "clanguml::t20044::tmain()" } } diff --git a/docs/test_cases/t20044_sequence.svg b/docs/test_cases/t20044_sequence.svg index 05d9f693..690ce3f7 100644 --- a/docs/test_cases/t20044_sequence.svg +++ b/docs/test_cases/t20044_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,22 +9,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -32,89 +32,89 @@ - - + + tmain() - + tmain() - - + + R - + R - - + + tmain()::(lambda t20044.cc:74:9) - + tmain()::(lambda t20044.cc:74:9) - - + + A - + A - - + + tmain()::(lambda t20044.cc:84:18) - + tmain()::(lambda t20044.cc:84:18) - - + + result_t - + result_t - - + + tmain()::(lambda t20044.cc:90:19) - + tmain()::(lambda t20044.cc:90:19) - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + R((lambda at t20044.cc:74:9) &&) - + operator()() const - + Call to template constructor with callable parameter and lambda expression as argument - + a() const - + operator()() const - + The message to detail2::run() is skipped due to exclude @@ -123,24 +123,24 @@ rendered TODO: Add some marker to highlight that this is not a direct call - + a5() - + a1() const - + expected(int) - + and_then((lambda at t20044.cc:90:19) &&) @@ -148,24 +148,24 @@ alt - + operator()(auto &&) const - + Call to a template method accepting a callable with lambda expression as argument, fully tracked showing method's activity and - + a2(int) const - + expected(int) @@ -176,21 +176,21 @@ - + and_then(result_t (&)(int)) - + and_then(std::function<result_t (int)> &) - + value() const diff --git a/docs/test_cases/t20045.md b/docs/test_cases/t20045.md index 9941a857..4a5de42f 100644 --- a/docs/test_cases/t20045.md +++ b/docs/test_cases/t20045.md @@ -79,7 +79,7 @@ int tmain() { "display_name": "tmain()", "full_name": "clanguml::t20045::tmain()", - "id": "2117440102058621189", + "id": "16939520816468969515", "name": "tmain", "namespace": "clanguml::t20045", "source_location": { @@ -93,7 +93,7 @@ int tmain() { "display_name": "a2(int)", "full_name": "clanguml::t20045::a2(int)", - "id": "422137031007650421", + "id": "3377096248061203375", "name": "a2", "namespace": "clanguml::t20045", "source_location": { @@ -107,7 +107,7 @@ int tmain() { "display_name": "a1<(lambda at t20045.cc:35:18)>((lambda at t20045.cc:35:18) &&)", "full_name": "clanguml::t20045::a1<(lambda at t20045.cc:35:18)>((lambda at /home/bartek/devel/clang-uml/tests/t20045/t20045.cc:35:18) &&)", - "id": "771242326042389239", + "id": "6169938608339113919", "name": "a1", "namespace": "clanguml::t20045", "source_location": { @@ -123,7 +123,7 @@ int tmain() { "display_name": "operator()(auto &&) const", "full_name": "clanguml::t20045::tmain()::(lambda t20045.cc:35:18)::operator()(auto &&) const", - "id": "1420491111902448188", + "id": "11363928895219585509", "name": "operator()", "namespace": "", "type": "method" @@ -131,7 +131,7 @@ int tmain() ], "display_name": "tmain()::(lambda t20045.cc:35:18)", "full_name": "clanguml::t20045::tmain()::(lambda t20045.cc:35:18)", - "id": "36644484176793235", + "id": "293155873414345883", "name": "tmain()::(lambda t20045.cc:35:18)", "namespace": "clanguml::t20045", "source_location": { @@ -145,7 +145,7 @@ int tmain() { "display_name": "a3(int)", "full_name": "clanguml::t20045::a3(int)", - "id": "399307921304660486", + "id": "3194463370437283893", "name": "a3", "namespace": "clanguml::t20045", "source_location": { @@ -159,7 +159,7 @@ int tmain() { "display_name": "a1<(lambda at t20045.cc:37:18)>((lambda at t20045.cc:37:18) &&)", "full_name": "clanguml::t20045::a1<(lambda at t20045.cc:37:18)>((lambda at /home/bartek/devel/clang-uml/tests/t20045/t20045.cc:37:18) &&)", - "id": "708264873048728082", + "id": "5666118984389824659", "name": "a1", "namespace": "clanguml::t20045", "source_location": { @@ -175,7 +175,7 @@ int tmain() { "display_name": "operator()(auto &&) const", "full_name": "clanguml::t20045::tmain()::(lambda t20045.cc:37:18)::operator()(auto &&) const", - "id": "1995217387134011144", + "id": "15961739097072089156", "name": "operator()", "namespace": "", "type": "method" @@ -183,7 +183,7 @@ int tmain() ], "display_name": "tmain()::(lambda t20045.cc:37:18)", "full_name": "clanguml::t20045::tmain()::(lambda t20045.cc:37:18)", - "id": "1556269922572504148", + "id": "12450159380580033187", "name": "tmain()::(lambda t20045.cc:37:18)", "namespace": "clanguml::t20045", "source_location": { @@ -199,7 +199,7 @@ int tmain() { "display_name": "b1(int)", "full_name": "clanguml::t20045::B::b1(int)", - "id": "820437645998690739", + "id": "6563501167989525913", "name": "b1", "namespace": "", "source_location": { @@ -213,7 +213,7 @@ int tmain() ], "display_name": "B", "full_name": "clanguml::t20045::B", - "id": "1737887355752592935", + "id": "13903098846020743486", "name": "B", "namespace": "clanguml::t20045", "source_location": { @@ -227,7 +227,7 @@ int tmain() { "display_name": "a1<(lambda at t20045.cc:39:18)>((lambda at t20045.cc:39:18) &&)", "full_name": "clanguml::t20045::a1<(lambda at t20045.cc:39:18)>((lambda at /home/bartek/devel/clang-uml/tests/t20045/t20045.cc:39:18) &&)", - "id": "1935046237572139126", + "id": "15480369900577113009", "name": "a1", "namespace": "clanguml::t20045", "source_location": { @@ -243,7 +243,7 @@ int tmain() { "display_name": "operator()(auto &&) const", "full_name": "clanguml::t20045::tmain()::(lambda t20045.cc:39:18)::operator()(auto &&) const", - "id": "786866346046560964", + "id": "6294930768372487717", "name": "operator()", "namespace": "", "type": "method" @@ -251,7 +251,7 @@ int tmain() ], "display_name": "tmain()::(lambda t20045.cc:39:18)", "full_name": "clanguml::t20045::tmain()::(lambda t20045.cc:39:18)", - "id": "132403781431240789", + "id": "1059230251449926314", "name": "tmain()::(lambda t20045.cc:39:18)", "namespace": "clanguml::t20045", "source_location": { @@ -267,7 +267,7 @@ int tmain() { "display_name": "get_x() const", "full_name": "clanguml::t20045::C::get_x() const", - "id": "570815384165305751", + "id": "4566523073322446011", "name": "get_x", "namespace": "", "source_location": { @@ -281,7 +281,7 @@ int tmain() ], "display_name": "C", "full_name": "clanguml::t20045::C", - "id": "1812199014066862625", + "id": "14497592112534901001", "name": "C", "namespace": "clanguml::t20045", "source_location": { @@ -298,8 +298,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "2117440102058621189", - "participant_id": "2117440102058621189" + "activity_id": "16939520816468969515", + "participant_id": "16939520816468969515" }, "name": "", "return_type": "int", @@ -311,15 +311,15 @@ int tmain() "translation_unit": "t20045.cc" }, "to": { - "activity_id": "422137031007650421", - "participant_id": "422137031007650421" + "activity_id": "3377096248061203375", + "participant_id": "3377096248061203375" }, "type": "message" }, { "from": { - "activity_id": "2117440102058621189", - "participant_id": "2117440102058621189" + "activity_id": "16939520816468969515", + "participant_id": "16939520816468969515" }, "name": "", "return_type": "", @@ -331,15 +331,15 @@ int tmain() "translation_unit": "t20045.cc" }, "to": { - "activity_id": "771242326042389239", - "participant_id": "771242326042389239" + "activity_id": "6169938608339113919", + "participant_id": "6169938608339113919" }, "type": "message" }, { "from": { - "activity_id": "771242326042389239", - "participant_id": "771242326042389239" + "activity_id": "6169938608339113919", + "participant_id": "6169938608339113919" }, "name": "operator()(auto &&) const", "return_type": "auto", @@ -351,15 +351,15 @@ int tmain() "translation_unit": "t20045.cc" }, "to": { - "activity_id": "1420491111902448188", - "participant_id": "36644484176793235" + "activity_id": "11363928895219585509", + "participant_id": "293155873414345883" }, "type": "message" }, { "from": { - "activity_id": "1420491111902448188", - "participant_id": "36644484176793235" + "activity_id": "11363928895219585509", + "participant_id": "293155873414345883" }, "name": "", "return_type": "int", @@ -371,15 +371,15 @@ int tmain() "translation_unit": "t20045.cc" }, "to": { - "activity_id": "399307921304660486", - "participant_id": "399307921304660486" + "activity_id": "3194463370437283893", + "participant_id": "3194463370437283893" }, "type": "message" }, { "from": { - "activity_id": "2117440102058621189", - "participant_id": "2117440102058621189" + "activity_id": "16939520816468969515", + "participant_id": "16939520816468969515" }, "name": "", "return_type": "", @@ -391,15 +391,15 @@ int tmain() "translation_unit": "t20045.cc" }, "to": { - "activity_id": "708264873048728082", - "participant_id": "708264873048728082" + "activity_id": "5666118984389824659", + "participant_id": "5666118984389824659" }, "type": "message" }, { "from": { - "activity_id": "708264873048728082", - "participant_id": "708264873048728082" + "activity_id": "5666118984389824659", + "participant_id": "5666118984389824659" }, "name": "operator()(auto &&) const", "return_type": "auto", @@ -411,15 +411,15 @@ int tmain() "translation_unit": "t20045.cc" }, "to": { - "activity_id": "1995217387134011144", - "participant_id": "1556269922572504148" + "activity_id": "15961739097072089156", + "participant_id": "12450159380580033187" }, "type": "message" }, { "from": { - "activity_id": "1995217387134011144", - "participant_id": "1556269922572504148" + "activity_id": "15961739097072089156", + "participant_id": "12450159380580033187" }, "name": "b1(int)", "return_type": "int", @@ -431,15 +431,15 @@ int tmain() "translation_unit": "t20045.cc" }, "to": { - "activity_id": "820437645998690739", - "participant_id": "1737887355752592935" + "activity_id": "6563501167989525913", + "participant_id": "13903098846020743486" }, "type": "message" }, { "from": { - "activity_id": "2117440102058621189", - "participant_id": "2117440102058621189" + "activity_id": "16939520816468969515", + "participant_id": "16939520816468969515" }, "name": "", "return_type": "", @@ -451,15 +451,15 @@ int tmain() "translation_unit": "t20045.cc" }, "to": { - "activity_id": "1935046237572139126", - "participant_id": "1935046237572139126" + "activity_id": "15480369900577113009", + "participant_id": "15480369900577113009" }, "type": "message" }, { "from": { - "activity_id": "1935046237572139126", - "participant_id": "1935046237572139126" + "activity_id": "15480369900577113009", + "participant_id": "15480369900577113009" }, "name": "operator()(auto &&) const", "return_type": "auto", @@ -471,15 +471,15 @@ int tmain() "translation_unit": "t20045.cc" }, "to": { - "activity_id": "786866346046560964", - "participant_id": "132403781431240789" + "activity_id": "6294930768372487717", + "participant_id": "1059230251449926314" }, "type": "message" }, { "from": { - "activity_id": "786866346046560964", - "participant_id": "132403781431240789" + "activity_id": "6294930768372487717", + "participant_id": "1059230251449926314" }, "name": "get_x() const", "return_type": "int", @@ -491,14 +491,14 @@ int tmain() "translation_unit": "t20045.cc" }, "to": { - "activity_id": "570815384165305751", - "participant_id": "1812199014066862625" + "activity_id": "4566523073322446011", + "participant_id": "14497592112534901001" }, "type": "message" } ], "start_from": { - "id": 2117440102058621189, + "id": "16939520816468969515", "location": "clanguml::t20045::tmain()" } } diff --git a/docs/test_cases/t20045_sequence.svg b/docs/test_cases/t20045_sequence.svg index d381f3fb..81238c31 100644 --- a/docs/test_cases/t20045_sequence.svg +++ b/docs/test_cases/t20045_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,17 +9,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -31,99 +31,99 @@ - - + + tmain() - + tmain() - - + + a2(int) - + a2(int) - - + + a1<(lambda at t20045.cc:35:18)>((lambda at t20045.cc:35:18) &&) - + a1<(lambda at t20045.cc:35:18)>((lambda at t20045.cc:35:18) &&) - - + + tmain()::(lambda t20045.cc:35:18) - + tmain()::(lambda t20045.cc:35:18) - - + + a3(int) - + a3(int) - - + + a1<(lambda at t20045.cc:37:18)>((lambda at t20045.cc:37:18) &&) - + a1<(lambda at t20045.cc:37:18)>((lambda at t20045.cc:37:18) &&) - - + + tmain()::(lambda t20045.cc:37:18) - + tmain()::(lambda t20045.cc:37:18) - - + + B - + B - - + + a1<(lambda at t20045.cc:39:18)>((lambda at t20045.cc:39:18) &&) - + a1<(lambda at t20045.cc:39:18)>((lambda at t20045.cc:39:18) &&) - - + + tmain()::(lambda t20045.cc:39:18) - + tmain()::(lambda t20045.cc:39:18) - - + + C - + C - - - - - - - - - - - - + + + + + + + + + + + + - + - + operator()(auto &&) const - + @@ -133,16 +133,16 @@ - + - + operator()(auto &&) const - + b1(int) @@ -153,16 +153,16 @@ - + - + operator()(auto &&) const - + get_x() const diff --git a/docs/test_cases/t20046.md b/docs/test_cases/t20046.md index 1ca17487..a71159fa 100644 --- a/docs/test_cases/t20046.md +++ b/docs/test_cases/t20046.md @@ -56,7 +56,7 @@ int tmain() { "display_name": "tmain()", "full_name": "clanguml::t20046::tmain()", - "id": "1092597347191364515", + "id": "8740778777530916121", "name": "tmain", "namespace": "clanguml::t20046", "source_location": { @@ -72,7 +72,7 @@ int tmain() { "display_name": "operator()(auto &&) const", "full_name": "clanguml::t20046::tmain()::(lambda t20046.cc:13:15)::operator()(auto &&) const", - "id": "174997669781821772", + "id": "1399981358254574182", "name": "operator()", "namespace": "", "type": "method" @@ -80,7 +80,7 @@ int tmain() ], "display_name": "tmain()::(lambda t20046.cc:13:15)", "full_name": "clanguml::t20046::tmain()::(lambda t20046.cc:13:15)", - "id": "1868201491114557068", + "id": "14945611928916456551", "name": "tmain()::(lambda t20046.cc:13:15)", "namespace": "clanguml::t20046", "source_location": { @@ -96,7 +96,7 @@ int tmain() { "display_name": "operator()(auto &&) const", "full_name": "clanguml::t20046::clanguml::t20046::tmain()::(lambda t20046.cc:13:15)::(lambda t20046.cc:14:16)::operator()(auto &&) const", - "id": "771372907204554082", + "id": "6170983257636432660", "name": "operator()", "namespace": "", "type": "method" @@ -104,7 +104,7 @@ int tmain() ], "display_name": "tmain()::(lambda t20046.cc:13:15)::(lambda t20046.cc:14:16)", "full_name": "clanguml::t20046::clanguml::t20046::tmain()::(lambda t20046.cc:13:15)::(lambda t20046.cc:14:16)", - "id": "163480314503646451", + "id": "1307842516029171611", "name": "clanguml::t20046::tmain()::(lambda t20046.cc:13:15)::(lambda t20046.cc:14:16)", "namespace": "clanguml::t20046", "source_location": { @@ -118,7 +118,7 @@ int tmain() { "display_name": "a2(int)", "full_name": "clanguml::t20046::a2(int)", - "id": "267222823829967475", + "id": "2137782590639739804", "name": "a2", "namespace": "clanguml::t20046", "source_location": { @@ -132,7 +132,7 @@ int tmain() { "display_name": "a1<(lambda at t20046.cc:19:9)>((lambda at t20046.cc:19:9) &&)", "full_name": "clanguml::t20046::a1<(lambda at t20046.cc:19:9)>((lambda at /home/bartek/devel/clang-uml/tests/t20046/t20046.cc:19:9) &&)", - "id": "404852580994337987", + "id": "3238820647954703898", "name": "a1", "namespace": "clanguml::t20046", "source_location": { @@ -148,7 +148,7 @@ int tmain() { "display_name": "operator()(auto &&) const", "full_name": "clanguml::t20046::tmain()::(lambda t20046.cc:19:9)::operator()(auto &&) const", - "id": "326496579896748789", + "id": "2611972639173990319", "name": "operator()", "namespace": "", "type": "method" @@ -156,7 +156,7 @@ int tmain() ], "display_name": "tmain()::(lambda t20046.cc:19:9)", "full_name": "clanguml::t20046::tmain()::(lambda t20046.cc:19:9)", - "id": "1833526997995356163", + "id": "14668215983962849304", "name": "tmain()::(lambda t20046.cc:19:9)", "namespace": "clanguml::t20046", "source_location": { @@ -172,7 +172,7 @@ int tmain() { "display_name": "operator()(auto &&) const", "full_name": "clanguml::t20046::clanguml::t20046::tmain()::(lambda t20046.cc:19:9)::(lambda t20046.cc:19:34)::operator()(auto &&) const", - "id": "1093593470536515636", + "id": "8748747764292125090", "name": "operator()", "namespace": "", "type": "method" @@ -180,7 +180,7 @@ int tmain() ], "display_name": "tmain()::(lambda t20046.cc:19:9)::(lambda t20046.cc:19:34)", "full_name": "clanguml::t20046::clanguml::t20046::tmain()::(lambda t20046.cc:19:9)::(lambda t20046.cc:19:34)", - "id": "2177951153338850159", + "id": "17423609226710801275", "name": "clanguml::t20046::tmain()::(lambda t20046.cc:19:9)::(lambda t20046.cc:19:34)", "namespace": "clanguml::t20046", "source_location": { @@ -194,7 +194,7 @@ int tmain() { "display_name": "a3(int)", "full_name": "clanguml::t20046::a3(int)", - "id": "1043774975066033521", + "id": "8350199800528268175", "name": "a3", "namespace": "clanguml::t20046", "source_location": { @@ -212,8 +212,8 @@ int tmain() { "comment": "Call expression in a nested lambda", "from": { - "activity_id": "1092597347191364515", - "participant_id": "1092597347191364515" + "activity_id": "8740778777530916121", + "participant_id": "8740778777530916121" }, "name": "operator()(auto &&) const", "return_type": "auto", @@ -225,15 +225,15 @@ int tmain() "translation_unit": "t20046.cc" }, "to": { - "activity_id": "174997669781821772", - "participant_id": "1868201491114557068" + "activity_id": "1399981358254574182", + "participant_id": "14945611928916456551" }, "type": "message" }, { "from": { - "activity_id": "174997669781821772", - "participant_id": "1868201491114557068" + "activity_id": "1399981358254574182", + "participant_id": "14945611928916456551" }, "name": "operator()(auto &&) const", "return_type": "auto", @@ -245,15 +245,15 @@ int tmain() "translation_unit": "t20046.cc" }, "to": { - "activity_id": "771372907204554082", - "participant_id": "163480314503646451" + "activity_id": "6170983257636432660", + "participant_id": "1307842516029171611" }, "type": "message" }, { "from": { - "activity_id": "771372907204554082", - "participant_id": "163480314503646451" + "activity_id": "6170983257636432660", + "participant_id": "1307842516029171611" }, "name": "", "return_type": "int", @@ -265,16 +265,16 @@ int tmain() "translation_unit": "t20046.cc" }, "to": { - "activity_id": "267222823829967475", - "participant_id": "267222823829967475" + "activity_id": "2137782590639739804", + "participant_id": "2137782590639739804" }, "type": "message" }, { "comment": "Call expression in a nested lambda in call expression", "from": { - "activity_id": "1092597347191364515", - "participant_id": "1092597347191364515" + "activity_id": "8740778777530916121", + "participant_id": "8740778777530916121" }, "name": "", "return_type": "", @@ -286,15 +286,15 @@ int tmain() "translation_unit": "t20046.cc" }, "to": { - "activity_id": "404852580994337987", - "participant_id": "404852580994337987" + "activity_id": "3238820647954703898", + "participant_id": "3238820647954703898" }, "type": "message" }, { "from": { - "activity_id": "404852580994337987", - "participant_id": "404852580994337987" + "activity_id": "3238820647954703898", + "participant_id": "3238820647954703898" }, "name": "operator()(auto &&) const", "return_type": "auto", @@ -306,15 +306,15 @@ int tmain() "translation_unit": "t20046.cc" }, "to": { - "activity_id": "326496579896748789", - "participant_id": "1833526997995356163" + "activity_id": "2611972639173990319", + "participant_id": "14668215983962849304" }, "type": "message" }, { "from": { - "activity_id": "326496579896748789", - "participant_id": "1833526997995356163" + "activity_id": "2611972639173990319", + "participant_id": "14668215983962849304" }, "name": "operator()(auto &&) const", "return_type": "auto", @@ -326,15 +326,15 @@ int tmain() "translation_unit": "t20046.cc" }, "to": { - "activity_id": "1093593470536515636", - "participant_id": "2177951153338850159" + "activity_id": "8748747764292125090", + "participant_id": "17423609226710801275" }, "type": "message" }, { "from": { - "activity_id": "1093593470536515636", - "participant_id": "2177951153338850159" + "activity_id": "8748747764292125090", + "participant_id": "17423609226710801275" }, "name": "", "return_type": "int", @@ -346,14 +346,14 @@ int tmain() "translation_unit": "t20046.cc" }, "to": { - "activity_id": "1043774975066033521", - "participant_id": "1043774975066033521" + "activity_id": "8350199800528268175", + "participant_id": "8350199800528268175" }, "type": "message" } ], "start_from": { - "id": 1092597347191364515, + "id": "8740778777530916121", "location": "clanguml::t20046::tmain()" } } diff --git a/docs/test_cases/t20046_sequence.svg b/docs/test_cases/t20046_sequence.svg index f8430dc4..f4764bb8 100644 --- a/docs/test_cases/t20046_sequence.svg +++ b/docs/test_cases/t20046_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,14 +9,14 @@ - - - - - - - - + + + + + + + + @@ -25,73 +25,73 @@ - - + + tmain() - + tmain() - - + + tmain()::(lambda t20046.cc:13:15) - + tmain()::(lambda t20046.cc:13:15) - - + + tmain()::(lambda t20046.cc:13:15)::(lambda t20046.cc:14:16) - + tmain()::(lambda t20046.cc:13:15)::(lambda t20046.cc:14:16) - - + + a2(int) - + a2(int) - - + + a1<(lambda at t20046.cc:19:9)>((lambda at t20046.cc:19:9) &&) - + a1<(lambda at t20046.cc:19:9)>((lambda at t20046.cc:19:9) &&) - - + + tmain()::(lambda t20046.cc:19:9) - + tmain()::(lambda t20046.cc:19:9) - - + + tmain()::(lambda t20046.cc:19:9)::(lambda t20046.cc:19:34) - + tmain()::(lambda t20046.cc:19:9)::(lambda t20046.cc:19:34) - - + + a3(int) - + a3(int) - - - - - - - - - + + + + + + + + + operator()(auto &&) const - + operator()(auto &&) const - + @@ -101,21 +101,21 @@ - + - + operator()(auto &&) const - + operator()(auto &&) const - + diff --git a/docs/test_cases/t20047.md b/docs/test_cases/t20047.md index 6c620c45..f05ac692 100644 --- a/docs/test_cases/t20047.md +++ b/docs/test_cases/t20047.md @@ -74,7 +74,7 @@ int tmain() { "display_name": "tmain()", "full_name": "clanguml::t20047::tmain()", - "id": "395335809944376006", + "id": "3162686479555008053", "name": "tmain", "namespace": "clanguml::t20047", "source_location": { @@ -88,7 +88,7 @@ int tmain() { "display_name": "a1(int)", "full_name": "clanguml::t20047::a1(int)", - "id": "1143426315383292679", + "id": "9147410523066341435", "name": "a1", "namespace": "clanguml::t20047", "source_location": { @@ -102,7 +102,7 @@ int tmain() { "display_name": "a2(int)", "full_name": "clanguml::t20047::a2(int)", - "id": "642420844675776100", + "id": "5139366757406208800", "name": "a2", "namespace": "clanguml::t20047", "source_location": { @@ -116,7 +116,7 @@ int tmain() { "display_name": "a3(int)", "full_name": "clanguml::t20047::a3(int)", - "id": "270462331062298387", + "id": "2163698648498387098", "name": "a3", "namespace": "clanguml::t20047", "source_location": { @@ -130,7 +130,7 @@ int tmain() { "display_name": "a4(int)", "full_name": "clanguml::t20047::a4(int)", - "id": "128784832900379603", + "id": "1030278663203036825", "name": "a4", "namespace": "clanguml::t20047", "source_location": { @@ -144,7 +144,7 @@ int tmain() { "display_name": "a5(int)", "full_name": "clanguml::t20047::a5(int)", - "id": "2182660880755444870", + "id": "17461287046043558961", "name": "a5", "namespace": "clanguml::t20047", "source_location": { @@ -158,7 +158,7 @@ int tmain() { "display_name": "a6(int)", "full_name": "clanguml::t20047::a6(int)", - "id": "1272350614275781124", + "id": "10178804914206248997", "name": "a6", "namespace": "clanguml::t20047", "source_location": { @@ -175,8 +175,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "395335809944376006", - "participant_id": "395335809944376006" + "activity_id": "3162686479555008053", + "participant_id": "3162686479555008053" }, "name": "", "return_type": "int", @@ -188,15 +188,15 @@ int tmain() "translation_unit": "t20047.cc" }, "to": { - "activity_id": "1143426315383292679", - "participant_id": "1143426315383292679" + "activity_id": "9147410523066341435", + "participant_id": "9147410523066341435" }, "type": "message" }, { "from": { - "activity_id": "395335809944376006", - "participant_id": "395335809944376006" + "activity_id": "3162686479555008053", + "participant_id": "3162686479555008053" }, "name": "", "return_type": "int", @@ -208,15 +208,15 @@ int tmain() "translation_unit": "t20047.cc" }, "to": { - "activity_id": "642420844675776100", - "participant_id": "642420844675776100" + "activity_id": "5139366757406208800", + "participant_id": "5139366757406208800" }, "type": "message" }, { "from": { - "activity_id": "395335809944376006", - "participant_id": "395335809944376006" + "activity_id": "3162686479555008053", + "participant_id": "3162686479555008053" }, "name": "", "return_type": "int", @@ -228,15 +228,15 @@ int tmain() "translation_unit": "t20047.cc" }, "to": { - "activity_id": "270462331062298387", - "participant_id": "270462331062298387" + "activity_id": "2163698648498387098", + "participant_id": "2163698648498387098" }, "type": "message" }, { "from": { - "activity_id": "395335809944376006", - "participant_id": "395335809944376006" + "activity_id": "3162686479555008053", + "participant_id": "3162686479555008053" }, "name": "", "return_type": "int", @@ -248,15 +248,15 @@ int tmain() "translation_unit": "t20047.cc" }, "to": { - "activity_id": "128784832900379603", - "participant_id": "128784832900379603" + "activity_id": "1030278663203036825", + "participant_id": "1030278663203036825" }, "type": "message" }, { "from": { - "activity_id": "395335809944376006", - "participant_id": "395335809944376006" + "activity_id": "3162686479555008053", + "participant_id": "3162686479555008053" }, "name": "", "return_type": "int", @@ -268,15 +268,15 @@ int tmain() "translation_unit": "t20047.cc" }, "to": { - "activity_id": "2182660880755444870", - "participant_id": "2182660880755444870" + "activity_id": "17461287046043558961", + "participant_id": "17461287046043558961" }, "type": "message" }, { "from": { - "activity_id": "395335809944376006", - "participant_id": "395335809944376006" + "activity_id": "3162686479555008053", + "participant_id": "3162686479555008053" }, "name": "", "return_type": "int", @@ -288,14 +288,14 @@ int tmain() "translation_unit": "t20047.cc" }, "to": { - "activity_id": "1272350614275781124", - "participant_id": "1272350614275781124" + "activity_id": "10178804914206248997", + "participant_id": "10178804914206248997" }, "type": "message" } ], "start_from": { - "id": 395335809944376006, + "id": "3162686479555008053", "location": "clanguml::t20047::tmain()" } } diff --git a/docs/test_cases/t20047_sequence.svg b/docs/test_cases/t20047_sequence.svg index ae4c3439..5e3c8b4f 100644 --- a/docs/test_cases/t20047_sequence.svg +++ b/docs/test_cases/t20047_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,13 +9,13 @@ - - - - - - - + + + + + + + @@ -23,86 +23,86 @@ - - + + tmain() - + tmain() - - + + a1(int) - + a1(int) - - + + a2(int) - + a2(int) - - + + a3(int) - + a3(int) - - + + a4(int) - + a4(int) - - + + a5(int) - + a5(int) - - + + a6(int) - + a6(int) - - - - - - - - + + + + + + + + - + - + - + - + - + diff --git a/docs/test_cases/t20048.md b/docs/test_cases/t20048.md index 69e475ab..d50755b3 100644 --- a/docs/test_cases/t20048.md +++ b/docs/test_cases/t20048.md @@ -73,7 +73,7 @@ int tmain() { "display_name": "tmain()", "full_name": "clanguml::t20048::tmain()", - "id": "1438172520221545830", + "id": "11505380161772366646", "name": "tmain", "namespace": "clanguml::t20048", "source_location": { @@ -87,7 +87,7 @@ int tmain() { "display_name": "a3(int)", "full_name": "clanguml::t20048::a3(int)", - "id": "1592723040639512239", + "id": "12741784325116097917", "name": "a3", "namespace": "clanguml::t20048", "source_location": { @@ -101,7 +101,7 @@ int tmain() { "display_name": "a2(int)", "full_name": "clanguml::t20048::a2(int)", - "id": "1494883525267049301", + "id": "11959068202136394413", "name": "a2", "namespace": "clanguml::t20048", "source_location": { @@ -115,7 +115,7 @@ int tmain() { "display_name": "a1(int)", "full_name": "clanguml::t20048::a1(int)", - "id": "1139681416936587734", + "id": "9117451335492701873", "name": "a1", "namespace": "clanguml::t20048", "source_location": { @@ -131,7 +131,7 @@ int tmain() { "display_name": "operator()(auto &&) const", "full_name": "clanguml::t20048::tmain()::(lambda t20048.cc:26:11)::operator()(auto &&) const", - "id": "1272214062049882942", + "id": "10177712496399063540", "name": "operator()", "namespace": "", "type": "method" @@ -139,7 +139,7 @@ int tmain() ], "display_name": "tmain()::(lambda t20048.cc:26:11)", "full_name": "clanguml::t20048::tmain()::(lambda t20048.cc:26:11)", - "id": "794500632550538124", + "id": "6356005060404304996", "name": "tmain()::(lambda t20048.cc:26:11)", "namespace": "clanguml::t20048", "source_location": { @@ -153,7 +153,7 @@ int tmain() { "display_name": "a4(int)", "full_name": "clanguml::t20048::a4(int)", - "id": "986710377344543262", + "id": "7893683018756346101", "name": "a4", "namespace": "clanguml::t20048", "source_location": { @@ -167,7 +167,7 @@ int tmain() { "display_name": "a6(int)", "full_name": "clanguml::t20048::a6(int)", - "id": "372194568810958399", + "id": "2977556550487667195", "name": "a6", "namespace": "clanguml::t20048", "source_location": { @@ -181,7 +181,7 @@ int tmain() { "display_name": "a5(int)", "full_name": "clanguml::t20048::a5(int)", - "id": "473170110460301705", + "id": "3785360883682413647", "name": "a5", "namespace": "clanguml::t20048", "source_location": { @@ -195,7 +195,7 @@ int tmain() { "display_name": "a7(int)", "full_name": "clanguml::t20048::a7(int)", - "id": "156504678810211848", + "id": "1252037430481694786", "name": "a7", "namespace": "clanguml::t20048", "source_location": { @@ -212,8 +212,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "1438172520221545830", - "participant_id": "1438172520221545830" + "activity_id": "11505380161772366646", + "participant_id": "11505380161772366646" }, "name": "", "return_type": "int", @@ -225,15 +225,15 @@ int tmain() "translation_unit": "t20048.cc" }, "to": { - "activity_id": "1592723040639512239", - "participant_id": "1592723040639512239" + "activity_id": "12741784325116097917", + "participant_id": "12741784325116097917" }, "type": "message" }, { "from": { - "activity_id": "1438172520221545830", - "participant_id": "1438172520221545830" + "activity_id": "11505380161772366646", + "participant_id": "11505380161772366646" }, "name": "", "return_type": "int", @@ -245,16 +245,16 @@ int tmain() "translation_unit": "t20048.cc" }, "to": { - "activity_id": "1494883525267049301", - "participant_id": "1494883525267049301" + "activity_id": "11959068202136394413", + "participant_id": "11959068202136394413" }, "type": "message" }, { "comment": "a1() adds `1` to the result of a2()", "from": { - "activity_id": "1438172520221545830", - "participant_id": "1438172520221545830" + "activity_id": "11505380161772366646", + "participant_id": "11505380161772366646" }, "name": "", "return_type": "int", @@ -266,16 +266,16 @@ int tmain() "translation_unit": "t20048.cc" }, "to": { - "activity_id": "1139681416936587734", - "participant_id": "1139681416936587734" + "activity_id": "9117451335492701873", + "participant_id": "9117451335492701873" }, "type": "message" }, { "comment": "This lambda calls a4() which adds `4` to it's argument", "from": { - "activity_id": "1438172520221545830", - "participant_id": "1438172520221545830" + "activity_id": "11505380161772366646", + "participant_id": "11505380161772366646" }, "name": "operator()(auto &&) const", "return_type": "auto", @@ -287,15 +287,15 @@ int tmain() "translation_unit": "t20048.cc" }, "to": { - "activity_id": "1272214062049882942", - "participant_id": "794500632550538124" + "activity_id": "10177712496399063540", + "participant_id": "6356005060404304996" }, "type": "message" }, { "from": { - "activity_id": "1272214062049882942", - "participant_id": "794500632550538124" + "activity_id": "10177712496399063540", + "participant_id": "6356005060404304996" }, "name": "", "return_type": "int", @@ -307,16 +307,16 @@ int tmain() "translation_unit": "t20048.cc" }, "to": { - "activity_id": "986710377344543262", - "participant_id": "986710377344543262" + "activity_id": "7893683018756346101", + "participant_id": "7893683018756346101" }, "type": "message" }, { "comment": "a6() adds `1` to its argument", "from": { - "activity_id": "1438172520221545830", - "participant_id": "1438172520221545830" + "activity_id": "11505380161772366646", + "participant_id": "11505380161772366646" }, "name": "", "return_type": "int", @@ -328,16 +328,16 @@ int tmain() "translation_unit": "t20048.cc" }, "to": { - "activity_id": "372194568810958399", - "participant_id": "372194568810958399" + "activity_id": "2977556550487667195", + "participant_id": "2977556550487667195" }, "type": "message" }, { "comment": "a5() adds `1` to the result of a6()", "from": { - "activity_id": "1438172520221545830", - "participant_id": "1438172520221545830" + "activity_id": "11505380161772366646", + "participant_id": "11505380161772366646" }, "name": "", "return_type": "int", @@ -349,16 +349,16 @@ int tmain() "translation_unit": "t20048.cc" }, "to": { - "activity_id": "473170110460301705", - "participant_id": "473170110460301705" + "activity_id": "3785360883682413647", + "participant_id": "3785360883682413647" }, "type": "message" }, { "comment": "a7() is called via add std::async", "from": { - "activity_id": "1438172520221545830", - "participant_id": "1438172520221545830" + "activity_id": "11505380161772366646", + "participant_id": "11505380161772366646" }, "name": "", "return_type": "int", @@ -370,14 +370,14 @@ int tmain() "translation_unit": "t20048.cc" }, "to": { - "activity_id": "156504678810211848", - "participant_id": "156504678810211848" + "activity_id": "1252037430481694786", + "participant_id": "1252037430481694786" }, "type": "message" } ], "start_from": { - "id": 1438172520221545830, + "id": "11505380161772366646", "location": "clanguml::t20048::tmain()" } } diff --git a/docs/test_cases/t20048_sequence.svg b/docs/test_cases/t20048_sequence.svg index f30fd202..137a8ec2 100644 --- a/docs/test_cases/t20048_sequence.svg +++ b/docs/test_cases/t20048_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,15 +9,15 @@ - - - - - - - - - + + + + + + + + + @@ -27,101 +27,101 @@ - - + + tmain() - + tmain() - - + + a3(int) - + a3(int) - - + + a2(int) - + a2(int) - - + + a1(int) - + a1(int) - - + + tmain()::(lambda t20048.cc:26:11) - + tmain()::(lambda t20048.cc:26:11) - - + + a4(int) - + a4(int) - - + + a6(int) - + a6(int) - - + + a5(int) - + a5(int) - - + + a7(int) - + a7(int) - - - - - - - - - - + + + + + + + + + + - + - + a1() adds `1` to the result of a2() - + - + This lambda calls a4() which adds `4` to it's argument - + operator()(auto &&) const - + @@ -129,29 +129,29 @@ - + a6() adds `1` to its argument - + - + a5() adds `1` to the result of a6() - + - + a7() is called via add std::async - + diff --git a/docs/test_cases/t20049.md b/docs/test_cases/t20049.md index ec5e04eb..142b6cf5 100644 --- a/docs/test_cases/t20049.md +++ b/docs/test_cases/t20049.md @@ -81,7 +81,7 @@ int tmain() { "display_name": "tmain()", "full_name": "clanguml::t20049::tmain()", - "id": "1498198764898287853", + "id": "11985590119186302825", "name": "tmain", "namespace": "clanguml::t20049", "source_location": { @@ -95,7 +95,7 @@ int tmain() { "display_name": "vector_square_add(float *,float *,float *,int)", "full_name": "clanguml::t20049::vector_square_add(float *,float *,float *,int)", - "id": "1998596618150288680", + "id": "15988772945202309445", "is_cuda_kernel": true, "name": "vector_square_add", "namespace": "clanguml::t20049", @@ -110,7 +110,7 @@ int tmain() { "display_name": "square(float)", "full_name": "clanguml::t20049::square(float)", - "id": "817124001270348685", + "id": "6536992010162789483", "is_cuda_device": true, "name": "square", "namespace": "clanguml::t20049", @@ -125,7 +125,7 @@ int tmain() { "display_name": "add(float,float)", "full_name": "clanguml::t20049::add(float,float)", - "id": "1897367040611447556", + "id": "15178936324891580453", "is_cuda_device": true, "name": "add", "namespace": "clanguml::t20049", @@ -143,8 +143,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "1498198764898287853", - "participant_id": "1498198764898287853" + "activity_id": "11985590119186302825", + "participant_id": "11985590119186302825" }, "name": "", "return_type": "void", @@ -156,18 +156,18 @@ int tmain() "translation_unit": "t20049.cu" }, "to": { - "activity_id": "1998596618150288680", - "participant_id": "1998596618150288680" + "activity_id": "15988772945202309445", + "participant_id": "15988772945202309445" }, "type": "message" }, { - "activity_id": "1998596618150288680", + "activity_id": "15988772945202309445", "messages": [ { "from": { - "activity_id": "1998596618150288680", - "participant_id": "1998596618150288680" + "activity_id": "15988772945202309445", + "participant_id": "15988772945202309445" }, "name": "", "return_type": "float", @@ -179,15 +179,15 @@ int tmain() "translation_unit": "t20049.cu" }, "to": { - "activity_id": "817124001270348685", - "participant_id": "817124001270348685" + "activity_id": "6536992010162789483", + "participant_id": "6536992010162789483" }, "type": "message" }, { "from": { - "activity_id": "1998596618150288680", - "participant_id": "1998596618150288680" + "activity_id": "15988772945202309445", + "participant_id": "15988772945202309445" }, "name": "", "return_type": "float", @@ -199,15 +199,15 @@ int tmain() "translation_unit": "t20049.cu" }, "to": { - "activity_id": "817124001270348685", - "participant_id": "817124001270348685" + "activity_id": "6536992010162789483", + "participant_id": "6536992010162789483" }, "type": "message" }, { "from": { - "activity_id": "1998596618150288680", - "participant_id": "1998596618150288680" + "activity_id": "15988772945202309445", + "participant_id": "15988772945202309445" }, "name": "", "return_type": "", @@ -219,8 +219,8 @@ int tmain() "translation_unit": "t20049.cu" }, "to": { - "activity_id": "1897367040611447556", - "participant_id": "1897367040611447556" + "activity_id": "15178936324891580453", + "participant_id": "15178936324891580453" }, "type": "message" } @@ -230,7 +230,7 @@ int tmain() } ], "start_from": { - "id": 1498198764898287853, + "id": "11985590119186302825", "location": "clanguml::t20049::tmain()" } } diff --git a/docs/test_cases/t20049_sequence.svg b/docs/test_cases/t20049_sequence.svg index f11acb25..1bd798e8 100644 --- a/docs/test_cases/t20049_sequence.svg +++ b/docs/test_cases/t20049_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,71 +9,71 @@ - - - - - - + + + + + + - - + + tmain() - + tmain() - - + + «CUDA Kernel» vector_square_add(float *,float *,float *,int) - + «CUDA Kernel» vector_square_add(float *,float *,float *,int) - - + + «CUDA Device» square(float) - + «CUDA Device» square(float) - - + + «CUDA Device» add<float>(float,float) - + «CUDA Device» add<float>(float,float) - - - - - - + + + + + + loop - + - + - + diff --git a/docs/test_cases/t20050.md b/docs/test_cases/t20050.md index 3cc25418..296bc91f 100644 --- a/docs/test_cases/t20050.md +++ b/docs/test_cases/t20050.md @@ -83,7 +83,7 @@ int tmain() { "display_name": "tmain()", "full_name": "clanguml::t20050::tmain()", - "id": "1047834785038011964", + "id": "8382678280304095716", "name": "tmain", "namespace": "clanguml::t20050", "source_location": { @@ -97,7 +97,7 @@ int tmain() { "display_name": "vector_square_add(float *,float *,float *,int)", "full_name": "clanguml::t20050::vector_square_add(float *,float *,float *,int)", - "id": "100545266160871109", + "id": "804362129286968876", "is_cuda_kernel": true, "name": "vector_square_add", "namespace": "clanguml::t20050", @@ -112,7 +112,7 @@ int tmain() { "display_name": "square(float)", "full_name": "clanguml::t20050::square(float)", - "id": "193263048716247783", + "id": "1546104389729982271", "is_cuda_device": true, "name": "square", "namespace": "clanguml::t20050", @@ -127,7 +127,7 @@ int tmain() { "display_name": "add(float,float)", "full_name": "clanguml::t20050::add(float,float)", - "id": "60344909513106774", + "id": "482759276104854199", "is_cuda_device": true, "name": "add", "namespace": "clanguml::t20050", @@ -142,7 +142,7 @@ int tmain() ], "display_name": "t20050.cu", "full_name": "clanguml::t20050::tmain()", - "id": "551473340136355806", + "id": "4411786721090846451", "name": "t20050.cu", "namespace": "clanguml::t20050", "type": "file" @@ -153,8 +153,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "1047834785038011964", - "participant_id": "551473340136355806" + "activity_id": "8382678280304095716", + "participant_id": "4411786721090846451" }, "name": "vector_square_add(float *,float *,float *,int)", "return_type": "void", @@ -166,18 +166,18 @@ int tmain() "translation_unit": "t20050.cu" }, "to": { - "activity_id": "100545266160871109", - "participant_id": "551473340136355806" + "activity_id": "804362129286968876", + "participant_id": "4411786721090846451" }, "type": "message" }, { - "activity_id": "100545266160871109", + "activity_id": "804362129286968876", "messages": [ { "from": { - "activity_id": "100545266160871109", - "participant_id": "551473340136355806" + "activity_id": "804362129286968876", + "participant_id": "4411786721090846451" }, "name": "square(float)", "return_type": "float", @@ -189,15 +189,15 @@ int tmain() "translation_unit": "t20050.cu" }, "to": { - "activity_id": "193263048716247783", - "participant_id": "551473340136355806" + "activity_id": "1546104389729982271", + "participant_id": "4411786721090846451" }, "type": "message" }, { "from": { - "activity_id": "100545266160871109", - "participant_id": "551473340136355806" + "activity_id": "804362129286968876", + "participant_id": "4411786721090846451" }, "name": "square(float)", "return_type": "float", @@ -209,15 +209,15 @@ int tmain() "translation_unit": "t20050.cu" }, "to": { - "activity_id": "193263048716247783", - "participant_id": "551473340136355806" + "activity_id": "1546104389729982271", + "participant_id": "4411786721090846451" }, "type": "message" }, { "from": { - "activity_id": "100545266160871109", - "participant_id": "551473340136355806" + "activity_id": "804362129286968876", + "participant_id": "4411786721090846451" }, "name": "add(float,float)", "return_type": "", @@ -229,8 +229,8 @@ int tmain() "translation_unit": "t20050.cu" }, "to": { - "activity_id": "60344909513106774", - "participant_id": "551473340136355806" + "activity_id": "482759276104854199", + "participant_id": "4411786721090846451" }, "type": "message" } @@ -241,7 +241,7 @@ int tmain() ], "return_type": "int", "start_from": { - "id": 1047834785038011964, + "id": "8382678280304095716", "location": "clanguml::t20050::tmain()" } } diff --git a/docs/test_cases/t20050_sequence.svg b/docs/test_cases/t20050_sequence.svg index ec8a1045..bf221629 100644 --- a/docs/test_cases/t20050_sequence.svg +++ b/docs/test_cases/t20050_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,26 +9,26 @@ - - - - - - + + + + + + - + t20050.cu - + t20050.cu - - - - - + + + + + tmain() - + @@ -39,7 +39,7 @@ loop - + @@ -51,7 +51,7 @@ - + @@ -63,7 +63,7 @@ - + diff --git a/docs/test_cases/t20051.md b/docs/test_cases/t20051.md index ec7a5fef..b55b9d55 100644 --- a/docs/test_cases/t20051.md +++ b/docs/test_cases/t20051.md @@ -83,7 +83,7 @@ __global__ void vector_square_add(float *out, float *a, float *b, int n); { "display_name": "tmain()", "full_name": "clanguml::t20051::tmain()", - "id": "33004218577871304", + "id": "264033748622970437", "name": "tmain", "namespace": "clanguml::t20051", "source_location": { @@ -97,7 +97,7 @@ __global__ void vector_square_add(float *out, float *a, float *b, int n); { "display_name": "vector_square_add(float *,float *,float *,int)", "full_name": "clanguml::t20051::vector_square_add(float *,float *,float *,int)", - "id": "1972238512532321229", + "id": "15777908100258569834", "is_cuda_kernel": true, "name": "vector_square_add", "namespace": "clanguml::t20051", @@ -115,8 +115,8 @@ __global__ void vector_square_add(float *out, float *a, float *b, int n); "messages": [ { "from": { - "activity_id": "33004218577871304", - "participant_id": "33004218577871304" + "activity_id": "264033748622970437", + "participant_id": "264033748622970437" }, "name": "", "return_type": "void", @@ -128,14 +128,14 @@ __global__ void vector_square_add(float *out, float *a, float *b, int n); "translation_unit": "t20051.cu" }, "to": { - "activity_id": "1972238512532321229", - "participant_id": "1972238512532321229" + "activity_id": "15777908100258569834", + "participant_id": "15777908100258569834" }, "type": "message" } ], "start_from": { - "id": 33004218577871304, + "id": "264033748622970437", "location": "clanguml::t20051::tmain()" } } diff --git a/docs/test_cases/t20051_sequence.svg b/docs/test_cases/t20051_sequence.svg index aaa44503..1d1e25b4 100644 --- a/docs/test_cases/t20051_sequence.svg +++ b/docs/test_cases/t20051_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,27 +9,27 @@ - - + + - - + + tmain() - + tmain() - - + + «CUDA Kernel» vector_square_add(float *,float *,float *,int) - + «CUDA Kernel» vector_square_add(float *,float *,float *,int) - - - + + + diff --git a/docs/test_cases/t20052.md b/docs/test_cases/t20052.md index 6653a309..fb2b970f 100644 --- a/docs/test_cases/t20052.md +++ b/docs/test_cases/t20052.md @@ -136,7 +136,7 @@ void tmain() { "display_name": "tmain()", "full_name": "clanguml::t20052::tmain()", - "id": "1863374927109937538", + "id": "14906999416879500308", "name": "tmain", "namespace": "clanguml::t20052", "source_location": { @@ -152,7 +152,7 @@ void tmain() { "display_name": "a()", "full_name": "clanguml::t20052::A::a()", - "id": "1226536010860143477", + "id": "9812288086881147823", "name": "a", "namespace": "", "source_location": { @@ -166,7 +166,7 @@ void tmain() { "display_name": "aa()", "full_name": "clanguml::t20052::A::aa()", - "id": "152397826074008213", + "id": "1219182608592065706", "name": "aa", "namespace": "", "source_location": { @@ -180,7 +180,7 @@ void tmain() { "display_name": "aaa()", "full_name": "clanguml::t20052::A::aaa()", - "id": "1337804153305761200", + "id": "10702433226446089600", "name": "aaa", "namespace": "", "source_location": { @@ -194,7 +194,7 @@ void tmain() ], "display_name": "A", "full_name": "clanguml::t20052::A", - "id": "1703104288786661165", + "id": "13624834310293289324", "name": "A", "namespace": "clanguml::t20052", "source_location": { @@ -210,7 +210,7 @@ void tmain() { "display_name": "b()", "full_name": "clanguml::t20052::B::b()", - "id": "319515743780574134", + "id": "2556125950244593078", "name": "b", "namespace": "", "source_location": { @@ -224,7 +224,7 @@ void tmain() { "display_name": "bb()", "full_name": "clanguml::t20052::B::bb()", - "id": "647068274411777494", + "id": "5176546195294219959", "name": "bb", "namespace": "", "source_location": { @@ -238,7 +238,7 @@ void tmain() { "display_name": "bbb()", "full_name": "clanguml::t20052::B::bbb()", - "id": "849373810301162421", + "id": "6794990482409299371", "name": "bbb", "namespace": "", "source_location": { @@ -252,7 +252,7 @@ void tmain() ], "display_name": "B", "full_name": "clanguml::t20052::B", - "id": "1858368487431426893", + "id": "14866947899451415150", "name": "B", "namespace": "clanguml::t20052", "source_location": { @@ -268,7 +268,7 @@ void tmain() { "display_name": "c()", "full_name": "clanguml::t20052::C::c()", - "id": "286735272236693235", + "id": "2293882177893545884", "name": "c", "namespace": "", "source_location": { @@ -282,7 +282,7 @@ void tmain() { "display_name": "cc()", "full_name": "clanguml::t20052::C::cc()", - "id": "927328030188215717", + "id": "7418624241505725736", "name": "cc", "namespace": "", "source_location": { @@ -296,7 +296,7 @@ void tmain() { "display_name": "ccc()", "full_name": "clanguml::t20052::C::ccc()", - "id": "733299138189220355", + "id": "5866393105513762844", "name": "ccc", "namespace": "", "source_location": { @@ -310,7 +310,7 @@ void tmain() ], "display_name": "C", "full_name": "clanguml::t20052::C", - "id": "695917114097253548", + "id": "5567336912778028391", "name": "C", "namespace": "clanguml::t20052", "source_location": { @@ -326,7 +326,7 @@ void tmain() { "display_name": "R((lambda at t20052.cc:86:9) &&)", "full_name": "clanguml::t20052::R<(lambda at t20052.cc:86:9)>::R((lambda at t20052.cc:86:9) &&)", - "id": "1771911385519841377", + "id": "14175291084158731020", "name": "R", "namespace": "", "source_location": { @@ -340,7 +340,7 @@ void tmain() { "display_name": "r()", "full_name": "clanguml::t20052::R<(lambda at t20052.cc:86:9)>::r()", - "id": "1643468997390681958", + "id": "13147751979125455669", "name": "r", "namespace": "", "source_location": { @@ -354,7 +354,7 @@ void tmain() ], "display_name": "R<(lambda at t20052.cc:86:9)>", "full_name": "clanguml::t20052::R<(lambda at t20052.cc:86:9)>", - "id": "548336024237507357", + "id": "4386688193900058862", "name": "R", "namespace": "clanguml::t20052", "source_location": { @@ -370,7 +370,7 @@ void tmain() { "display_name": "add5(int) const", "full_name": "clanguml::t20052::D::add5(int) const", - "id": "2099569549236534730", + "id": "16796556393892277847", "name": "add5", "namespace": "", "source_location": { @@ -384,7 +384,7 @@ void tmain() ], "display_name": "D", "full_name": "clanguml::t20052::D", - "id": "1091266475405978871", + "id": "8730131803247830968", "name": "D", "namespace": "clanguml::t20052", "source_location": { @@ -401,8 +401,8 @@ void tmain() "messages": [ { "from": { - "activity_id": "1863374927109937538", - "participant_id": "1863374927109937538" + "activity_id": "14906999416879500308", + "participant_id": "14906999416879500308" }, "name": "a()", "return_type": "void", @@ -414,15 +414,15 @@ void tmain() "translation_unit": "t20052.cc" }, "to": { - "activity_id": "1226536010860143477", - "participant_id": "1703104288786661165" + "activity_id": "9812288086881147823", + "participant_id": "13624834310293289324" }, "type": "message" }, { "from": { - "activity_id": "1226536010860143477", - "participant_id": "1703104288786661165" + "activity_id": "9812288086881147823", + "participant_id": "13624834310293289324" }, "name": "aa()", "return_type": "void", @@ -434,15 +434,15 @@ void tmain() "translation_unit": "t20052.cc" }, "to": { - "activity_id": "152397826074008213", - "participant_id": "1703104288786661165" + "activity_id": "1219182608592065706", + "participant_id": "13624834310293289324" }, "type": "message" }, { "from": { - "activity_id": "152397826074008213", - "participant_id": "1703104288786661165" + "activity_id": "1219182608592065706", + "participant_id": "13624834310293289324" }, "name": "aaa()", "return_type": "void", @@ -454,15 +454,15 @@ void tmain() "translation_unit": "t20052.cc" }, "to": { - "activity_id": "1337804153305761200", - "participant_id": "1703104288786661165" + "activity_id": "10702433226446089600", + "participant_id": "13624834310293289324" }, "type": "message" }, { "from": { - "activity_id": "1863374927109937538", - "participant_id": "1863374927109937538" + "activity_id": "14906999416879500308", + "participant_id": "14906999416879500308" }, "name": "b()", "return_type": "void", @@ -474,15 +474,15 @@ void tmain() "translation_unit": "t20052.cc" }, "to": { - "activity_id": "319515743780574134", - "participant_id": "1858368487431426893" + "activity_id": "2556125950244593078", + "participant_id": "14866947899451415150" }, "type": "message" }, { "from": { - "activity_id": "319515743780574134", - "participant_id": "1858368487431426893" + "activity_id": "2556125950244593078", + "participant_id": "14866947899451415150" }, "name": "bb()", "return_type": "void", @@ -494,15 +494,15 @@ void tmain() "translation_unit": "t20052.cc" }, "to": { - "activity_id": "647068274411777494", - "participant_id": "1858368487431426893" + "activity_id": "5176546195294219959", + "participant_id": "14866947899451415150" }, "type": "message" }, { "from": { - "activity_id": "647068274411777494", - "participant_id": "1858368487431426893" + "activity_id": "5176546195294219959", + "participant_id": "14866947899451415150" }, "name": "bbb()", "return_type": "void", @@ -514,15 +514,15 @@ void tmain() "translation_unit": "t20052.cc" }, "to": { - "activity_id": "849373810301162421", - "participant_id": "1858368487431426893" + "activity_id": "6794990482409299371", + "participant_id": "14866947899451415150" }, "type": "message" }, { "from": { - "activity_id": "1863374927109937538", - "participant_id": "1863374927109937538" + "activity_id": "14906999416879500308", + "participant_id": "14906999416879500308" }, "name": "c()", "return_type": "void", @@ -534,15 +534,15 @@ void tmain() "translation_unit": "t20052.cc" }, "to": { - "activity_id": "286735272236693235", - "participant_id": "695917114097253548" + "activity_id": "2293882177893545884", + "participant_id": "5567336912778028391" }, "type": "message" }, { "from": { - "activity_id": "286735272236693235", - "participant_id": "695917114097253548" + "activity_id": "2293882177893545884", + "participant_id": "5567336912778028391" }, "name": "cc()", "return_type": "void", @@ -554,15 +554,15 @@ void tmain() "translation_unit": "t20052.cc" }, "to": { - "activity_id": "927328030188215717", - "participant_id": "695917114097253548" + "activity_id": "7418624241505725736", + "participant_id": "5567336912778028391" }, "type": "message" }, { "from": { - "activity_id": "927328030188215717", - "participant_id": "695917114097253548" + "activity_id": "7418624241505725736", + "participant_id": "5567336912778028391" }, "name": "ccc()", "return_type": "void", @@ -574,15 +574,15 @@ void tmain() "translation_unit": "t20052.cc" }, "to": { - "activity_id": "733299138189220355", - "participant_id": "695917114097253548" + "activity_id": "5866393105513762844", + "participant_id": "5567336912778028391" }, "type": "message" }, { "from": { - "activity_id": "1863374927109937538", - "participant_id": "1863374927109937538" + "activity_id": "14906999416879500308", + "participant_id": "14906999416879500308" }, "name": "a()", "return_type": "void", @@ -594,15 +594,15 @@ void tmain() "translation_unit": "t20052.cc" }, "to": { - "activity_id": "1226536010860143477", - "participant_id": "1703104288786661165" + "activity_id": "9812288086881147823", + "participant_id": "13624834310293289324" }, "type": "message" }, { "from": { - "activity_id": "1226536010860143477", - "participant_id": "1703104288786661165" + "activity_id": "9812288086881147823", + "participant_id": "13624834310293289324" }, "name": "aa()", "return_type": "void", @@ -614,15 +614,15 @@ void tmain() "translation_unit": "t20052.cc" }, "to": { - "activity_id": "152397826074008213", - "participant_id": "1703104288786661165" + "activity_id": "1219182608592065706", + "participant_id": "13624834310293289324" }, "type": "message" }, { "from": { - "activity_id": "152397826074008213", - "participant_id": "1703104288786661165" + "activity_id": "1219182608592065706", + "participant_id": "13624834310293289324" }, "name": "aaa()", "return_type": "void", @@ -634,15 +634,15 @@ void tmain() "translation_unit": "t20052.cc" }, "to": { - "activity_id": "1337804153305761200", - "participant_id": "1703104288786661165" + "activity_id": "10702433226446089600", + "participant_id": "13624834310293289324" }, "type": "message" }, { "from": { - "activity_id": "1863374927109937538", - "participant_id": "1863374927109937538" + "activity_id": "14906999416879500308", + "participant_id": "14906999416879500308" }, "name": "b()", "return_type": "void", @@ -654,15 +654,15 @@ void tmain() "translation_unit": "t20052.cc" }, "to": { - "activity_id": "319515743780574134", - "participant_id": "1858368487431426893" + "activity_id": "2556125950244593078", + "participant_id": "14866947899451415150" }, "type": "message" }, { "from": { - "activity_id": "319515743780574134", - "participant_id": "1858368487431426893" + "activity_id": "2556125950244593078", + "participant_id": "14866947899451415150" }, "name": "bb()", "return_type": "void", @@ -674,15 +674,15 @@ void tmain() "translation_unit": "t20052.cc" }, "to": { - "activity_id": "647068274411777494", - "participant_id": "1858368487431426893" + "activity_id": "5176546195294219959", + "participant_id": "14866947899451415150" }, "type": "message" }, { "from": { - "activity_id": "647068274411777494", - "participant_id": "1858368487431426893" + "activity_id": "5176546195294219959", + "participant_id": "14866947899451415150" }, "name": "bbb()", "return_type": "void", @@ -694,15 +694,15 @@ void tmain() "translation_unit": "t20052.cc" }, "to": { - "activity_id": "849373810301162421", - "participant_id": "1858368487431426893" + "activity_id": "6794990482409299371", + "participant_id": "14866947899451415150" }, "type": "message" }, { "from": { - "activity_id": "1863374927109937538", - "participant_id": "1863374927109937538" + "activity_id": "14906999416879500308", + "participant_id": "14906999416879500308" }, "name": "R((lambda at t20052.cc:86:9) &&)", "return_type": "void", @@ -714,15 +714,15 @@ void tmain() "translation_unit": "t20052.cc" }, "to": { - "activity_id": "1771911385519841377", - "participant_id": "548336024237507357" + "activity_id": "14175291084158731020", + "participant_id": "4386688193900058862" }, "type": "message" }, { "from": { - "activity_id": "1863374927109937538", - "participant_id": "1863374927109937538" + "activity_id": "14906999416879500308", + "participant_id": "14906999416879500308" }, "name": "r()", "return_type": "void", @@ -734,15 +734,15 @@ void tmain() "translation_unit": "t20052.cc" }, "to": { - "activity_id": "1643468997390681958", - "participant_id": "548336024237507357" + "activity_id": "13147751979125455669", + "participant_id": "4386688193900058862" }, "type": "message" }, { "from": { - "activity_id": "1643468997390681958", - "participant_id": "548336024237507357" + "activity_id": "13147751979125455669", + "participant_id": "4386688193900058862" }, "name": "c()", "return_type": "void", @@ -754,15 +754,15 @@ void tmain() "translation_unit": "t20052.cc" }, "to": { - "activity_id": "286735272236693235", - "participant_id": "695917114097253548" + "activity_id": "2293882177893545884", + "participant_id": "5567336912778028391" }, "type": "message" }, { "from": { - "activity_id": "286735272236693235", - "participant_id": "695917114097253548" + "activity_id": "2293882177893545884", + "participant_id": "5567336912778028391" }, "name": "cc()", "return_type": "void", @@ -774,15 +774,15 @@ void tmain() "translation_unit": "t20052.cc" }, "to": { - "activity_id": "927328030188215717", - "participant_id": "695917114097253548" + "activity_id": "7418624241505725736", + "participant_id": "5567336912778028391" }, "type": "message" }, { "from": { - "activity_id": "927328030188215717", - "participant_id": "695917114097253548" + "activity_id": "7418624241505725736", + "participant_id": "5567336912778028391" }, "name": "ccc()", "return_type": "void", @@ -794,15 +794,15 @@ void tmain() "translation_unit": "t20052.cc" }, "to": { - "activity_id": "733299138189220355", - "participant_id": "695917114097253548" + "activity_id": "5866393105513762844", + "participant_id": "5567336912778028391" }, "type": "message" }, { "from": { - "activity_id": "1863374927109937538", - "participant_id": "1863374927109937538" + "activity_id": "14906999416879500308", + "participant_id": "14906999416879500308" }, "name": "add5(int) const", "return_type": "int", @@ -814,14 +814,14 @@ void tmain() "translation_unit": "t20052.cc" }, "to": { - "activity_id": "2099569549236534730", - "participant_id": "1091266475405978871" + "activity_id": "16796556393892277847", + "participant_id": "8730131803247830968" }, "type": "message" } ], "start_from": { - "id": 1863374927109937538, + "id": "14906999416879500308", "location": "clanguml::t20052::tmain()" } } diff --git a/docs/test_cases/t20052_sequence.svg b/docs/test_cases/t20052_sequence.svg index 0ba43244..698899d9 100644 --- a/docs/test_cases/t20052_sequence.svg +++ b/docs/test_cases/t20052_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,217 +9,217 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + tmain() - + tmain() - - + + A - + A - - + + B - + B - - + + C - + C - - + + R<(lambda at t20052.cc:86:9)> - + R<(lambda at t20052.cc:86:9)> - - + + D - + D - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + a() - + aa() - + aaa() - + b() - + bb() - + bbb() - + c() - + cc() - + ccc() - + a() - + aa() - + aaa() - + b() - + bb() - + bbb() - + R((lambda at t20052.cc:86:9) &&) - + r() - + c() - + cc() - + ccc() - + add5(int) const diff --git a/docs/test_cases/t20053.md b/docs/test_cases/t20053.md index 017d3d29..be6cfd64 100644 --- a/docs/test_cases/t20053.md +++ b/docs/test_cases/t20053.md @@ -59,7 +59,7 @@ int tmain() { "display_name": "tmain()", "full_name": "clanguml::t20053::tmain()", - "id": "1989009774042525491", + "id": "15912078192340203929", "name": "tmain", "namespace": "clanguml::t20053", "source_location": { @@ -73,7 +73,7 @@ int tmain() { "display_name": "a2(int)", "full_name": "clanguml::t20053::a2(int)", - "id": "670119640253232066", + "id": "5360957122025856535", "name": "a2", "namespace": "clanguml::t20053", "source_location": { @@ -87,7 +87,7 @@ int tmain() { "display_name": "a1<(lambda at t20053.cc:23:9)>((lambda at t20053.cc:23:9) &&)", "full_name": "clanguml::t20053::a1<(lambda at t20053.cc:23:9)>((lambda at /home/bartek/devel/clang-uml/tests/t20053/t20053.cc:23:9) &&)", - "id": "967684327663938310", + "id": "7741474621311506482", "name": "a1", "namespace": "clanguml::t20053", "source_location": { @@ -101,7 +101,7 @@ int tmain() { "display_name": "a3(int)", "full_name": "clanguml::t20053::a3(int)", - "id": "1586707721117132930", + "id": "12693661768937063443", "name": "a3", "namespace": "clanguml::t20053", "source_location": { @@ -118,8 +118,8 @@ int tmain() "messages": [ { "from": { - "activity_id": "1989009774042525491", - "participant_id": "1989009774042525491" + "activity_id": "15912078192340203929", + "participant_id": "15912078192340203929" }, "name": "", "return_type": "int", @@ -131,15 +131,15 @@ int tmain() "translation_unit": "t20053.cc" }, "to": { - "activity_id": "670119640253232066", - "participant_id": "670119640253232066" + "activity_id": "5360957122025856535", + "participant_id": "5360957122025856535" }, "type": "message" }, { "from": { - "activity_id": "1989009774042525491", - "participant_id": "1989009774042525491" + "activity_id": "15912078192340203929", + "participant_id": "15912078192340203929" }, "name": "", "return_type": "", @@ -151,15 +151,15 @@ int tmain() "translation_unit": "t20053.cc" }, "to": { - "activity_id": "967684327663938310", - "participant_id": "967684327663938310" + "activity_id": "7741474621311506482", + "participant_id": "7741474621311506482" }, "type": "message" }, { "from": { - "activity_id": "967684327663938310", - "participant_id": "967684327663938310" + "activity_id": "7741474621311506482", + "participant_id": "7741474621311506482" }, "name": "", "return_type": "int", @@ -171,14 +171,14 @@ int tmain() "translation_unit": "t20053.cc" }, "to": { - "activity_id": "1586707721117132930", - "participant_id": "1586707721117132930" + "activity_id": "12693661768937063443", + "participant_id": "12693661768937063443" }, "type": "message" } ], "start_from": { - "id": 1989009774042525491, + "id": "15912078192340203929", "location": "clanguml::t20053::tmain()" } } diff --git a/docs/test_cases/t20053_sequence.svg b/docs/test_cases/t20053_sequence.svg index 50b1233c..df1025ca 100644 --- a/docs/test_cases/t20053_sequence.svg +++ b/docs/test_cases/t20053_sequence.svg @@ -1,6 +1,6 @@ - + @@ -9,53 +9,53 @@ - - - - + + + + - - + + tmain() - + tmain() - - + + a2(int) - + a2(int) - - + + a1<(lambda at t20053.cc:23:9)>((lambda at t20053.cc:23:9) &&) - + a1<(lambda at t20053.cc:23:9)>((lambda at t20053.cc:23:9) &&) - - + + a3(int) - + a3(int) - - - - - + + + + + - + - + diff --git a/docs/test_cases/t20054.md b/docs/test_cases/t20054.md new file mode 100644 index 00000000..5199476b --- /dev/null +++ b/docs/test_cases/t20054.md @@ -0,0 +1,316 @@ +# t20054 - Test case for sequence diagram with nested classes +## Config +```yaml +diagrams: + t20054_sequence: + type: sequence + glob: + - t20054.cc + include: + namespaces: + - clanguml::t20054 + using_namespace: clanguml::t20054 + from: + - function: "clanguml::t20054::tmain()" + - function: "clanguml::t20054::A::AA::bb()" +``` +## Source code +File `tests/t20054/t20054.cc` +```cpp +namespace clanguml { +namespace t20054 { + +struct A { + struct AA { + struct AAA { + int aaa() { return 3; } + }; + + struct BBB { + int bbb() { return 4; } + }; + + int aa() { return aaa.aaa(); } + + int bb() { return bbb.bbb(); } + + AAA aaa; + BBB bbb; + }; + + void a() { aa.aa(); } + + AA aa; +}; + +void tmain() +{ + A a; + + a.a(); +} + +} // namespace t20054 +} // namespace clanguml +``` +## Generated PlantUML diagrams +![t20054_sequence](./t20054_sequence.svg "Test case for sequence diagram with nested classes") +## Generated Mermaid diagrams +![t20054_sequence](./t20054_sequence_mermaid.svg "Test case for sequence diagram with nested classes") +## Generated JSON models +```json +{ + "diagram_type": "sequence", + "name": "t20054_sequence", + "participants": [ + { + "display_name": "tmain()", + "full_name": "clanguml::t20054::tmain()", + "id": "10803568768958466513", + "name": "tmain", + "namespace": "clanguml::t20054", + "source_location": { + "column": 6, + "file": "t20054.cc", + "line": 27, + "translation_unit": "t20054.cc" + }, + "type": "function" + }, + { + "activities": [ + { + "display_name": "a()", + "full_name": "clanguml::t20054::A::a()", + "id": "1698987340403449834", + "name": "a", + "namespace": "", + "source_location": { + "column": 10, + "file": "t20054.cc", + "line": 22, + "translation_unit": "t20054.cc" + }, + "type": "method" + } + ], + "display_name": "A", + "full_name": "clanguml::t20054::A", + "id": "10637501985902225285", + "name": "A", + "namespace": "clanguml::t20054", + "source_location": { + "column": 8, + "file": "t20054.cc", + "line": 4, + "translation_unit": "t20054.cc" + }, + "type": "class" + }, + { + "activities": [ + { + "display_name": "aa()", + "full_name": "clanguml::t20054::A::AA::aa()", + "id": "2773833107878981483", + "name": "aa", + "namespace": "", + "source_location": { + "column": 13, + "file": "t20054.cc", + "line": 14, + "translation_unit": "t20054.cc" + }, + "type": "method" + }, + { + "display_name": "bb()", + "full_name": "clanguml::t20054::A::AA::bb()", + "id": "11517263835285279", + "name": "bb", + "namespace": "", + "source_location": { + "column": 13, + "file": "t20054.cc", + "line": 16, + "translation_unit": "t20054.cc" + }, + "type": "method" + } + ], + "display_name": "A::AA", + "full_name": "clanguml::t20054::A::AA", + "id": "12335963931754675068", + "name": "A::AA", + "namespace": "clanguml::t20054", + "source_location": { + "column": 12, + "file": "t20054.cc", + "line": 5, + "translation_unit": "t20054.cc" + }, + "type": "class" + }, + { + "activities": [ + { + "display_name": "aaa()", + "full_name": "clanguml::t20054::A::AA::AAA::aaa()", + "id": "18440523953211239190", + "name": "aaa", + "namespace": "", + "source_location": { + "column": 17, + "file": "t20054.cc", + "line": 7, + "translation_unit": "t20054.cc" + }, + "type": "method" + } + ], + "display_name": "A::AA::AAA", + "full_name": "clanguml::t20054::A::AA::AAA", + "id": "3657855768627469326", + "name": "A::AA::AAA", + "namespace": "clanguml::t20054", + "source_location": { + "column": 16, + "file": "t20054.cc", + "line": 6, + "translation_unit": "t20054.cc" + }, + "type": "class" + }, + { + "activities": [ + { + "display_name": "bbb()", + "full_name": "clanguml::t20054::A::AA::BBB::bbb()", + "id": "14647351109927833443", + "name": "bbb", + "namespace": "", + "source_location": { + "column": 17, + "file": "t20054.cc", + "line": 11, + "translation_unit": "t20054.cc" + }, + "type": "method" + } + ], + "display_name": "A::AA::BBB", + "full_name": "clanguml::t20054::A::AA::BBB", + "id": "14233611940581501088", + "name": "A::AA::BBB", + "namespace": "clanguml::t20054", + "source_location": { + "column": 16, + "file": "t20054.cc", + "line": 10, + "translation_unit": "t20054.cc" + }, + "type": "class" + } + ], + "sequences": [ + { + "messages": [ + { + "from": { + "activity_id": "10803568768958466513", + "participant_id": "10803568768958466513" + }, + "name": "a()", + "return_type": "void", + "scope": "normal", + "source_location": { + "column": 5, + "file": "t20054.cc", + "line": 31, + "translation_unit": "t20054.cc" + }, + "to": { + "activity_id": "1698987340403449834", + "participant_id": "10637501985902225285" + }, + "type": "message" + }, + { + "from": { + "activity_id": "1698987340403449834", + "participant_id": "10637501985902225285" + }, + "name": "aa()", + "return_type": "int", + "scope": "normal", + "source_location": { + "column": 16, + "file": "t20054.cc", + "line": 22, + "translation_unit": "t20054.cc" + }, + "to": { + "activity_id": "2773833107878981483", + "participant_id": "12335963931754675068" + }, + "type": "message" + }, + { + "from": { + "activity_id": "2773833107878981483", + "participant_id": "12335963931754675068" + }, + "name": "aaa()", + "return_type": "int", + "scope": "normal", + "source_location": { + "column": 27, + "file": "t20054.cc", + "line": 14, + "translation_unit": "t20054.cc" + }, + "to": { + "activity_id": "18440523953211239190", + "participant_id": "3657855768627469326" + }, + "type": "message" + } + ], + "start_from": { + "id": "10803568768958466513", + "location": "clanguml::t20054::tmain()" + } + }, + { + "messages": [ + { + "from": { + "activity_id": "11517263835285279", + "participant_id": "12335963931754675068" + }, + "name": "bbb()", + "return_type": "int", + "scope": "normal", + "source_location": { + "column": 27, + "file": "t20054.cc", + "line": 16, + "translation_unit": "t20054.cc" + }, + "to": { + "activity_id": "14647351109927833443", + "participant_id": "14233611940581501088" + }, + "type": "message" + } + ], + "return_type": "int", + "start_from": { + "id": "11517263835285279", + "location": "clanguml::t20054::A::AA::bb()" + } + } + ], + "using_namespace": "clanguml::t20054" +} +``` diff --git a/docs/test_cases/t20054_sequence.svg b/docs/test_cases/t20054_sequence.svg new file mode 100644 index 00000000..cfc346d4 --- /dev/null +++ b/docs/test_cases/t20054_sequence.svg @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + tmain() + + tmain() + + + + A + + A + + + + A::AA + + A::AA + + + + A::AA::AAA + + A::AA::AAA + + + + A::AA::BBB + + A::AA::BBB + + + + + + + + + + + a() + + + + + aa() + + + + + aaa() + + + + + + + + bb() + + + + bbb() + + + + + + + diff --git a/docs/test_cases/t20054_sequence_mermaid.svg b/docs/test_cases/t20054_sequence_mermaid.svg new file mode 100644 index 00000000..0de2614f --- /dev/null +++ b/docs/test_cases/t20054_sequence_mermaid.svg @@ -0,0 +1,166 @@ + + + + + A::AA::BBB + + + + + + * + + + + + + A::AA::AAA + + + + + + A::AA + + + + + + A + + + + + + tmain() + + + + + + + + A::AA::BBB + + + + + + + + + * + + + + + + + + + A::AA::AAA + + + + + + + + + A::AA + + + + + + + + + A + + + + + + + + + tmain() + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + a() + + aa() + + aaa() + + ​ + + ​ + + bb() + + bbb() + + ​ + + ​ + + diff --git a/docs/test_cases/t30001.md b/docs/test_cases/t30001.md index a827202e..e13a2026 100644 --- a/docs/test_cases/t30001.md +++ b/docs/test_cases/t30001.md @@ -87,7 +87,7 @@ namespace BB { "elements": [ { "display_name": "AAA", - "id": "274638237740249424", + "id": "2197105901921995395", "is_deprecated": false, "name": "AAA", "namespace": "clanguml::t30001::A::AA", @@ -101,7 +101,7 @@ namespace BB { }, { "display_name": "BBB", - "id": "2129154382024012563", + "id": "17033235056192100504", "is_deprecated": false, "name": "BBB", "namespace": "clanguml::t30001::A::AA", @@ -114,7 +114,7 @@ namespace BB { "type": "namespace" } ], - "id": "1528517990989164155", + "id": "12228143927913313240", "is_deprecated": false, "name": "AA", "namespace": "clanguml::t30001::A", @@ -128,7 +128,7 @@ namespace BB { }, { "display_name": "BB", - "id": "983199564524723281", + "id": "7865596516197786253", "is_deprecated": false, "name": "BB", "namespace": "clanguml::t30001::A", @@ -141,7 +141,7 @@ namespace BB { "type": "namespace" } ], - "id": "1184614645531659789", + "id": "9476917164253278318", "is_deprecated": false, "name": "A", "namespace": "clanguml::t30001", @@ -165,7 +165,7 @@ namespace BB { "elements": [ { "display_name": "AAA", - "id": "262162485307734028", + "id": "2097299882461872226", "is_deprecated": false, "name": "AAA", "namespace": "clanguml::t30001::B::AA", @@ -179,7 +179,7 @@ namespace BB { }, { "display_name": "BBB", - "id": "18542334992237803", + "id": "148338679937902424", "is_deprecated": false, "name": "BBB", "namespace": "clanguml::t30001::B::AA", @@ -192,7 +192,7 @@ namespace BB { "type": "namespace" } ], - "id": "895913707182089871", + "id": "7167309657456718972", "is_deprecated": false, "name": "AA", "namespace": "clanguml::t30001::B", @@ -206,7 +206,7 @@ namespace BB { }, { "display_name": "BB", - "id": "2230464321696304488", + "id": "17843714573570435906", "is_deprecated": false, "name": "BB", "namespace": "clanguml::t30001::B", @@ -219,7 +219,7 @@ namespace BB { "type": "namespace" } ], - "id": "1931735210112054430", + "id": "15453881680896435444", "is_deprecated": false, "name": "B", "namespace": "clanguml::t30001", diff --git a/docs/test_cases/t30001_package.svg b/docs/test_cases/t30001_package.svg index e6f53335..51354016 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/t30001_package_mermaid.svg b/docs/test_cases/t30001_package_mermaid.svg index a1082ce0..36561168 100644 --- a/docs/test_cases/t30001_package_mermaid.svg +++ b/docs/test_cases/t30001_package_mermaid.svg @@ -22,7 +22,7 @@ - + @@ -32,7 +32,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -54,9 +54,9 @@ - - - + + + @@ -90,7 +90,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -161,7 +161,7 @@ - + diff --git a/docs/test_cases/t30002.md b/docs/test_cases/t30002.md index f3e95fdb..93c3c302 100644 --- a/docs/test_cases/t30002.md +++ b/docs/test_cases/t30002.md @@ -157,7 +157,7 @@ template std::map> cm() "elements": [ { "display_name": "A1", - "id": "1164966689017271053", + "id": "9319733512138168425", "is_deprecated": false, "name": "A1", "namespace": "clanguml::t30002::A::AA", @@ -171,7 +171,7 @@ template std::map> cm() }, { "display_name": "A2", - "id": "695366113361481509", + "id": "5562928906891852079", "is_deprecated": false, "name": "A2", "namespace": "clanguml::t30002::A::AA", @@ -185,7 +185,7 @@ template std::map> cm() }, { "display_name": "A3", - "id": "1267709074800873528", + "id": "10141672598406988224", "is_deprecated": false, "name": "A3", "namespace": "clanguml::t30002::A::AA", @@ -199,7 +199,7 @@ template std::map> cm() }, { "display_name": "A4", - "id": "299262817531370604", + "id": "2394102540250964834", "is_deprecated": false, "name": "A4", "namespace": "clanguml::t30002::A::AA", @@ -213,7 +213,7 @@ template std::map> cm() }, { "display_name": "A5", - "id": "1207764290216680521", + "id": "9662114321733444169", "is_deprecated": false, "name": "A5", "namespace": "clanguml::t30002::A::AA", @@ -227,7 +227,7 @@ template std::map> cm() }, { "display_name": "A6", - "id": "899091126727901939", + "id": "7192729013823215515", "is_deprecated": false, "name": "A6", "namespace": "clanguml::t30002::A::AA", @@ -241,7 +241,7 @@ template std::map> cm() }, { "display_name": "A7", - "id": "563861734550555261", + "id": "4510893876404442092", "is_deprecated": false, "name": "A7", "namespace": "clanguml::t30002::A::AA", @@ -255,7 +255,7 @@ template std::map> cm() }, { "display_name": "A8", - "id": "839146342143718390", + "id": "6713170737149747123", "is_deprecated": false, "name": "A8", "namespace": "clanguml::t30002::A::AA", @@ -269,7 +269,7 @@ template std::map> cm() }, { "display_name": "A9", - "id": "1650835159458422245", + "id": "13206681275667377960", "is_deprecated": false, "name": "A9", "namespace": "clanguml::t30002::A::AA", @@ -283,7 +283,7 @@ template std::map> cm() }, { "display_name": "A10", - "id": "1453242941322376182", + "id": "11625943530579009458", "is_deprecated": false, "name": "A10", "namespace": "clanguml::t30002::A::AA", @@ -297,7 +297,7 @@ template std::map> cm() }, { "display_name": "A11", - "id": "384833776371876986", + "id": "3078670210975015891", "is_deprecated": false, "name": "A11", "namespace": "clanguml::t30002::A::AA", @@ -311,7 +311,7 @@ template std::map> cm() }, { "display_name": "A12", - "id": "1199527037490355138", + "id": "9596216299922841108", "is_deprecated": false, "name": "A12", "namespace": "clanguml::t30002::A::AA", @@ -325,7 +325,7 @@ template std::map> cm() }, { "display_name": "A13", - "id": "620689743711615190", + "id": "4965517949692921527", "is_deprecated": false, "name": "A13", "namespace": "clanguml::t30002::A::AA", @@ -339,7 +339,7 @@ template std::map> cm() }, { "display_name": "A14", - "id": "301858476377711436", + "id": "2414867811021691488", "is_deprecated": false, "name": "A14", "namespace": "clanguml::t30002::A::AA", @@ -353,7 +353,7 @@ template std::map> cm() }, { "display_name": "A15", - "id": "561239706327729436", + "id": "4489917650621835488", "is_deprecated": false, "name": "A15", "namespace": "clanguml::t30002::A::AA", @@ -367,7 +367,7 @@ template std::map> cm() }, { "display_name": "A16", - "id": "1415398383158410524", + "id": "11323187065267284195", "is_deprecated": false, "name": "A16", "namespace": "clanguml::t30002::A::AA", @@ -381,7 +381,7 @@ template std::map> cm() }, { "display_name": "A17", - "id": "532437874530119999", + "id": "4259502996240959994", "is_deprecated": false, "name": "A17", "namespace": "clanguml::t30002::A::AA", @@ -395,7 +395,7 @@ template std::map> cm() }, { "display_name": "A18", - "id": "405712335116487393", + "id": "3245698680931899146", "is_deprecated": false, "name": "A18", "namespace": "clanguml::t30002::A::AA", @@ -408,7 +408,7 @@ template std::map> cm() "type": "namespace" } ], - "id": "1669745471968085401", + "id": "13357963775744683208", "is_deprecated": false, "name": "AA", "namespace": "clanguml::t30002::A", @@ -421,7 +421,7 @@ template std::map> cm() "type": "namespace" } ], - "id": "1543480715632256641", + "id": "12347845725058053133", "is_deprecated": false, "name": "A", "namespace": "clanguml::t30002", @@ -441,7 +441,7 @@ template std::map> cm() "elements": [ { "display_name": "BBB", - "id": "2255521339657425355", + "id": "18044170717259402844", "is_deprecated": false, "name": "BBB", "namespace": "clanguml::t30002::B::BB", @@ -454,7 +454,7 @@ template std::map> cm() "type": "namespace" } ], - "id": "1938861639623819235", + "id": "15510893116990553883", "is_deprecated": false, "name": "BB", "namespace": "clanguml::t30002::B", @@ -467,7 +467,7 @@ template std::map> cm() "type": "namespace" } ], - "id": "145302773464360955", + "id": "1162422187714887647", "is_deprecated": false, "name": "B", "namespace": "clanguml::t30002", @@ -484,93 +484,93 @@ template std::map> cm() "package_type": "namespace", "relationships": [ { - "destination": "839146342143718390", - "source": "2255521339657425355", + "destination": "6713170737149747123", + "source": "18044170717259402844", "type": "dependency" }, { - "destination": "1650835159458422245", - "source": "2255521339657425355", + "destination": "13206681275667377960", + "source": "18044170717259402844", "type": "dependency" }, { - "destination": "1164966689017271053", - "source": "2255521339657425355", + "destination": "9319733512138168425", + "source": "18044170717259402844", "type": "dependency" }, { - "destination": "695366113361481509", - "source": "2255521339657425355", + "destination": "5562928906891852079", + "source": "18044170717259402844", "type": "dependency" }, { - "destination": "1267709074800873528", - "source": "2255521339657425355", + "destination": "10141672598406988224", + "source": "18044170717259402844", "type": "dependency" }, { - "destination": "299262817531370604", - "source": "2255521339657425355", + "destination": "2394102540250964834", + "source": "18044170717259402844", "type": "dependency" }, { - "destination": "561239706327729436", - "source": "2255521339657425355", + "destination": "4489917650621835488", + "source": "18044170717259402844", "type": "dependency" }, { - "destination": "405712335116487393", - "source": "2255521339657425355", + "destination": "3245698680931899146", + "source": "18044170717259402844", "type": "dependency" }, { - "destination": "1415398383158410524", - "source": "2255521339657425355", + "destination": "11323187065267284195", + "source": "18044170717259402844", "type": "dependency" }, { - "destination": "301858476377711436", - "source": "2255521339657425355", + "destination": "2414867811021691488", + "source": "18044170717259402844", "type": "dependency" }, { - "destination": "1207764290216680521", - "source": "2255521339657425355", + "destination": "9662114321733444169", + "source": "18044170717259402844", "type": "dependency" }, { - "destination": "563861734550555261", - "source": "2255521339657425355", + "destination": "4510893876404442092", + "source": "18044170717259402844", "type": "dependency" }, { - "destination": "532437874530119999", - "source": "2255521339657425355", + "destination": "4259502996240959994", + "source": "18044170717259402844", "type": "dependency" }, { - "destination": "899091126727901939", - "source": "2255521339657425355", + "destination": "7192729013823215515", + "source": "18044170717259402844", "type": "dependency" }, { - "destination": "1453242941322376182", - "source": "2255521339657425355", + "destination": "11625943530579009458", + "source": "18044170717259402844", "type": "dependency" }, { - "destination": "384833776371876986", - "source": "2255521339657425355", + "destination": "3078670210975015891", + "source": "18044170717259402844", "type": "dependency" }, { - "destination": "1199527037490355138", - "source": "2255521339657425355", + "destination": "9596216299922841108", + "source": "18044170717259402844", "type": "dependency" }, { - "destination": "620689743711615190", - "source": "2255521339657425355", + "destination": "4965517949692921527", + "source": "18044170717259402844", "type": "dependency" } ], diff --git a/docs/test_cases/t30002_package.svg b/docs/test_cases/t30002_package.svg index e154ae2a..0c4515f2 100644 --- a/docs/test_cases/t30002_package.svg +++ b/docs/test_cases/t30002_package.svg @@ -1,6 +1,6 @@ - + @@ -9,156 +9,156 @@ - - + + 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/t30002_package_mermaid.svg b/docs/test_cases/t30002_package_mermaid.svg index 652965df..6148fba0 100644 --- a/docs/test_cases/t30002_package_mermaid.svg +++ b/docs/test_cases/t30002_package_mermaid.svg @@ -21,7 +21,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -63,24 +63,24 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -247,7 +247,7 @@ - + @@ -258,7 +258,7 @@ - + @@ -269,7 +269,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -291,7 +291,7 @@ - + @@ -302,7 +302,7 @@ - + @@ -313,7 +313,7 @@ - + @@ -324,7 +324,7 @@ - + @@ -335,7 +335,7 @@ - + @@ -346,7 +346,7 @@ - + @@ -357,7 +357,7 @@ - + @@ -368,7 +368,7 @@ - + @@ -379,7 +379,7 @@ - + @@ -390,7 +390,7 @@ - + @@ -401,7 +401,7 @@ - + @@ -412,7 +412,7 @@ - + @@ -423,7 +423,7 @@ - + @@ -434,7 +434,7 @@ - + @@ -445,7 +445,7 @@ - + diff --git a/docs/test_cases/t30003.md b/docs/test_cases/t30003.md index 87edcc38..9d74ee64 100644 --- a/docs/test_cases/t30003.md +++ b/docs/test_cases/t30003.md @@ -59,7 +59,7 @@ class B : public ns1::ns2::Anon { }; "elements": [ { "display_name": "ns2_v1_0_0", - "id": "647755950450743637", + "id": "5182047603605949099", "is_deprecated": false, "name": "ns2_v1_0_0", "namespace": "clanguml::t30003::ns1", @@ -73,7 +73,7 @@ class B : public ns1::ns2::Anon { }; }, { "display_name": "ns2_v0_9_0", - "id": "1013406647495422406", + "id": "8107253179963379254", "is_deprecated": true, "name": "ns2_v0_9_0", "namespace": "clanguml::t30003::ns1", @@ -86,7 +86,7 @@ class B : public ns1::ns2::Anon { }; "type": "namespace" } ], - "id": "600452871069546589", + "id": "4803622968556372712", "is_deprecated": false, "name": "ns1", "namespace": "clanguml::t30003", @@ -106,7 +106,7 @@ class B : public ns1::ns2::Anon { }; "elements": [ { "display_name": "ns2", - "id": "820462660523726751", + "id": "6563701284189814015", "is_deprecated": false, "name": "ns2", "namespace": "clanguml::t30003::ns3::ns1", @@ -119,7 +119,7 @@ class B : public ns1::ns2::Anon { }; "type": "namespace" } ], - "id": "1209144861141334061", + "id": "9673158889130672490", "is_deprecated": false, "name": "ns1", "namespace": "clanguml::t30003::ns3", @@ -132,7 +132,7 @@ class B : public ns1::ns2::Anon { }; "type": "namespace" } ], - "id": "427104404739526818", + "id": "3416835237916214549", "is_deprecated": true, "name": "ns3", "namespace": "clanguml::t30003", @@ -149,8 +149,8 @@ class B : public ns1::ns2::Anon { }; "package_type": "namespace", "relationships": [ { - "destination": "647755950450743637", - "source": "820462660523726751", + "destination": "5182047603605949099", + "source": "6563701284189814015", "type": "dependency" } ], diff --git a/docs/test_cases/t30003_package.svg b/docs/test_cases/t30003_package.svg index 191fa95a..7030a8fe 100644 --- a/docs/test_cases/t30003_package.svg +++ b/docs/test_cases/t30003_package.svg @@ -1,6 +1,6 @@ - + @@ -9,39 +9,39 @@ - - + + ns1 - - + + ns3 «deprecated» - - + + ns1 - - + + ns2_v1_0_0 - - + + ns2_v0_9_0 «deprecated» - - + + ns2 - + diff --git a/docs/test_cases/t30003_package_mermaid.svg b/docs/test_cases/t30003_package_mermaid.svg index de53726e..8b9b5361 100644 --- a/docs/test_cases/t30003_package_mermaid.svg +++ b/docs/test_cases/t30003_package_mermaid.svg @@ -21,7 +21,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -89,7 +89,7 @@ - + diff --git a/docs/test_cases/t30004.md b/docs/test_cases/t30004.md index 19712438..6eb3cb8a 100644 --- a/docs/test_cases/t30004.md +++ b/docs/test_cases/t30004.md @@ -75,7 +75,7 @@ namespace CCC { "raw": "/// @uml{note[ bottom ] Package AAA.}" }, "display_name": "AAA", - "id": "1517185300862579159", + "id": "12137482406900633279", "is_deprecated": false, "name": "AAA", "namespace": "clanguml::t30004::A", @@ -93,7 +93,7 @@ namespace CCC { "raw": "/// \\uml{note[right] Package BBB.}" }, "display_name": "BBB", - "id": "1982379087062354928", + "id": "15859032696498839429", "is_deprecated": false, "name": "BBB", "namespace": "clanguml::t30004::A", @@ -111,7 +111,7 @@ namespace CCC { "raw": "///\n/// @uml{note:t30004_package[bottom] CCCC package note.}\n/// This is package CCC." }, "display_name": "CCC", - "id": "2304726195556701567", + "id": "18437809564453612539", "is_deprecated": false, "name": "CCC", "namespace": "clanguml::t30004::A", @@ -129,7 +129,7 @@ namespace CCC { "raw": "/// @uml{style[#pink;line:red;line.bold;text:red]}\n/// \\uml{note[top] We skipped DDD.}" }, "display_name": "EEE", - "id": "1084924732216290779", + "id": "8679397857730326233", "is_deprecated": false, "name": "EEE", "namespace": "clanguml::t30004::A", @@ -142,7 +142,7 @@ namespace CCC { "type": "namespace" } ], - "id": "33410665874039845", + "id": "267285326992318765", "is_deprecated": false, "name": "A", "namespace": "clanguml::t30004", diff --git a/docs/test_cases/t30004_package.svg b/docs/test_cases/t30004_package.svg index 1df5ad4b..d6335f01 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/t30004_package_mermaid.svg b/docs/test_cases/t30004_package_mermaid.svg index b3da38b3..c04dae2e 100644 --- a/docs/test_cases/t30004_package_mermaid.svg +++ b/docs/test_cases/t30004_package_mermaid.svg @@ -26,7 +26,7 @@ - + @@ -38,10 +38,10 @@ - - - - + + + + @@ -82,7 +82,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -137,7 +137,7 @@ - + @@ -159,7 +159,7 @@ - + diff --git a/docs/test_cases/t30005.md b/docs/test_cases/t30005.md index 3fccc9a0..7b88898d 100644 --- a/docs/test_cases/t30005.md +++ b/docs/test_cases/t30005.md @@ -62,7 +62,7 @@ struct C2 { "elements": [ { "display_name": "AAA", - "id": "914090901927655181", + "id": "7312727215421241448", "is_deprecated": false, "name": "AAA", "namespace": "clanguml::t30005::A::AA", @@ -75,7 +75,7 @@ struct C2 { "type": "namespace" } ], - "id": "1777547159021391040", + "id": "14220377272171128327", "is_deprecated": false, "name": "AA", "namespace": "clanguml::t30005::A", @@ -88,7 +88,7 @@ struct C2 { "type": "namespace" } ], - "id": "1768303675686131578", + "id": "14146429405489052628", "is_deprecated": false, "name": "A", "namespace": "clanguml::t30005", @@ -108,7 +108,7 @@ struct C2 { "elements": [ { "display_name": "BBB", - "id": "1871026935460001668", + "id": "14968215483680013344", "is_deprecated": false, "name": "BBB", "namespace": "clanguml::t30005::B::BB", @@ -121,7 +121,7 @@ struct C2 { "type": "namespace" } ], - "id": "1696631362104244809", + "id": "13573050896833958473", "is_deprecated": false, "name": "BB", "namespace": "clanguml::t30005::B", @@ -134,7 +134,7 @@ struct C2 { "type": "namespace" } ], - "id": "378529216628023051", + "id": "3028233733024184414", "is_deprecated": false, "name": "B", "namespace": "clanguml::t30005", @@ -154,7 +154,7 @@ struct C2 { "elements": [ { "display_name": "CCC", - "id": "1763279540133487999", + "id": "14106236321067903999", "is_deprecated": false, "name": "CCC", "namespace": "clanguml::t30005::C::CC", @@ -167,7 +167,7 @@ struct C2 { "type": "namespace" } ], - "id": "2134234141727442046", + "id": "17073873133819536371", "is_deprecated": false, "name": "CC", "namespace": "clanguml::t30005::C", @@ -180,7 +180,7 @@ struct C2 { "type": "namespace" } ], - "id": "1041076320925403190", + "id": "8328610567403225525", "is_deprecated": false, "name": "C", "namespace": "clanguml::t30005", @@ -197,13 +197,13 @@ struct C2 { "package_type": "namespace", "relationships": [ { - "destination": "914090901927655181", - "source": "1871026935460001668", + "destination": "7312727215421241448", + "source": "14968215483680013344", "type": "dependency" }, { - "destination": "914090901927655181", - "source": "1763279540133487999", + "destination": "7312727215421241448", + "source": "14106236321067903999", "type": "dependency" } ], diff --git a/docs/test_cases/t30005_package.svg b/docs/test_cases/t30005_package.svg index fcfea6d1..0f7375a1 100644 --- a/docs/test_cases/t30005_package.svg +++ b/docs/test_cases/t30005_package.svg @@ -1,6 +1,6 @@ - + @@ -9,54 +9,54 @@ - - + + A - - + + AA - - + + B - - + + BB - - + + C - - + + CC - - + + AAA - - + + BBB - - + + CCC - + - + diff --git a/docs/test_cases/t30005_package_mermaid.svg b/docs/test_cases/t30005_package_mermaid.svg index f97615b4..f7e6dd10 100644 --- a/docs/test_cases/t30005_package_mermaid.svg +++ b/docs/test_cases/t30005_package_mermaid.svg @@ -21,7 +21,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -71,7 +71,7 @@ - + @@ -83,8 +83,8 @@ - - + + @@ -107,7 +107,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -129,7 +129,7 @@ - + diff --git a/docs/test_cases/t30006.md b/docs/test_cases/t30006.md index 22b46edc..264417a5 100644 --- a/docs/test_cases/t30006.md +++ b/docs/test_cases/t30006.md @@ -56,7 +56,7 @@ struct A2 { "elements": [ { "display_name": "B", - "id": "1659090172211944144", + "id": "13272721377695553156", "is_deprecated": false, "name": "B", "namespace": "clanguml::t30006", @@ -74,7 +74,7 @@ struct A2 { "raw": "/// \\uml{note[top] Top A note.}" }, "display_name": "A", - "id": "1499919423527579699", + "id": "11999355388220637599", "is_deprecated": false, "name": "A", "namespace": "clanguml::t30006", @@ -88,7 +88,7 @@ struct A2 { }, { "display_name": "C", - "id": "1380567463986115369", + "id": "11044539711888922958", "is_deprecated": false, "name": "C", "namespace": "clanguml::t30006", @@ -105,13 +105,13 @@ struct A2 { "package_type": "namespace", "relationships": [ { - "destination": "1659090172211944144", - "source": "1499919423527579699", + "destination": "13272721377695553156", + "source": "11999355388220637599", "type": "dependency" }, { - "destination": "1380567463986115369", - "source": "1499919423527579699", + "destination": "11044539711888922958", + "source": "11999355388220637599", "type": "dependency" } ], diff --git a/docs/test_cases/t30006_package.svg b/docs/test_cases/t30006_package.svg index 0df7e065..bf2b4537 100644 --- a/docs/test_cases/t30006_package.svg +++ b/docs/test_cases/t30006_package.svg @@ -1,6 +1,6 @@ - + @@ -9,28 +9,28 @@ - - + + B - - + + A - - + + C - + Top A note. - - + + - + diff --git a/docs/test_cases/t30006_package_mermaid.svg b/docs/test_cases/t30006_package_mermaid.svg index 6bc8f006..de523cf9 100644 --- a/docs/test_cases/t30006_package_mermaid.svg +++ b/docs/test_cases/t30006_package_mermaid.svg @@ -22,9 +22,9 @@ - - - + + + @@ -67,7 +67,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -89,7 +89,7 @@ - + diff --git a/docs/test_cases/t30007.md b/docs/test_cases/t30007.md index 4255fa0e..f5761651 100644 --- a/docs/test_cases/t30007.md +++ b/docs/test_cases/t30007.md @@ -64,7 +64,7 @@ struct A2 { "elements": [ { "display_name": "B", - "id": "1852704221005355550", + "id": "14821633768042844406", "is_deprecated": false, "name": "B", "namespace": "clanguml::t30007", @@ -85,7 +85,7 @@ struct A2 { "elements": [ { "display_name": "AA", - "id": "357722505818238170", + "id": "2861780046545905366", "is_deprecated": false, "name": "AA", "namespace": "clanguml::t30007::A", @@ -98,7 +98,7 @@ struct A2 { "type": "namespace" } ], - "id": "870874615388866345", + "id": "6966996923110930767", "is_deprecated": false, "name": "A", "namespace": "clanguml::t30007", @@ -112,7 +112,7 @@ struct A2 { }, { "display_name": "C", - "id": "937791537887318363", + "id": "7502332303098546906", "is_deprecated": false, "name": "C", "namespace": "clanguml::t30007", @@ -129,13 +129,13 @@ struct A2 { "package_type": "namespace", "relationships": [ { - "destination": "1852704221005355550", - "source": "357722505818238170", + "destination": "14821633768042844406", + "source": "2861780046545905366", "type": "dependency" }, { - "destination": "937791537887318363", - "source": "357722505818238170", + "destination": "7502332303098546906", + "source": "2861780046545905366", "type": "dependency" } ], diff --git a/docs/test_cases/t30007_package.svg b/docs/test_cases/t30007_package.svg index 5ad44e66..f8e25b8a 100644 --- a/docs/test_cases/t30007_package.svg +++ b/docs/test_cases/t30007_package.svg @@ -1,6 +1,6 @@ - + @@ -9,33 +9,33 @@ - - + + A - - + + B - - + + AA - - + + C - + Compare layout with t30006. - - + + - + diff --git a/docs/test_cases/t30007_package_mermaid.svg b/docs/test_cases/t30007_package_mermaid.svg index bb0c362d..a346064d 100644 --- a/docs/test_cases/t30007_package_mermaid.svg +++ b/docs/test_cases/t30007_package_mermaid.svg @@ -21,7 +21,7 @@ - + @@ -33,9 +33,9 @@ - - - + + + @@ -67,7 +67,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -100,7 +100,7 @@ - + diff --git a/docs/test_cases/t30008.md b/docs/test_cases/t30008.md index dabb9b6b..485f82fb 100644 --- a/docs/test_cases/t30008.md +++ b/docs/test_cases/t30008.md @@ -77,7 +77,7 @@ struct FF { "elements": [ { "display_name": "A", - "id": "2096441629244782012", + "id": "16771533033958256100", "is_deprecated": false, "name": "A", "namespace": "clanguml::t30008::dependants", @@ -91,7 +91,7 @@ struct FF { }, { "display_name": "B", - "id": "500208250168931957", + "id": "4001666001351455659", "is_deprecated": false, "name": "B", "namespace": "clanguml::t30008::dependants", @@ -105,7 +105,7 @@ struct FF { }, { "display_name": "C", - "id": "1095841247154575825", + "id": "8766729977236606603", "is_deprecated": false, "name": "C", "namespace": "clanguml::t30008::dependants", @@ -118,7 +118,7 @@ struct FF { "type": "namespace" } ], - "id": "1601960042765615222", + "id": "12815680342124921776", "is_deprecated": false, "name": "dependants", "namespace": "clanguml::t30008", @@ -135,7 +135,7 @@ struct FF { "elements": [ { "display_name": "D", - "id": "912387297717034254", + "id": "7299098381736274037", "is_deprecated": false, "name": "D", "namespace": "clanguml::t30008::dependencies", @@ -149,7 +149,7 @@ struct FF { }, { "display_name": "E", - "id": "1114997990364518938", + "id": "8919983922916151509", "is_deprecated": false, "name": "E", "namespace": "clanguml::t30008::dependencies", @@ -163,7 +163,7 @@ struct FF { }, { "display_name": "F", - "id": "1062827161678172094", + "id": "8502617293425376752", "is_deprecated": false, "name": "F", "namespace": "clanguml::t30008::dependencies", @@ -176,7 +176,7 @@ struct FF { "type": "namespace" } ], - "id": "2103969167872217960", + "id": "16831753342977743687", "is_deprecated": false, "name": "dependencies", "namespace": "clanguml::t30008", @@ -193,23 +193,23 @@ struct FF { "package_type": "namespace", "relationships": [ { - "destination": "2096441629244782012", - "source": "500208250168931957", + "destination": "16771533033958256100", + "source": "4001666001351455659", "type": "dependency" }, { - "destination": "500208250168931957", - "source": "1095841247154575825", + "destination": "4001666001351455659", + "source": "8766729977236606603", "type": "dependency" }, { - "destination": "912387297717034254", - "source": "1114997990364518938", + "destination": "7299098381736274037", + "source": "8919983922916151509", "type": "dependency" }, { - "destination": "1114997990364518938", - "source": "1062827161678172094", + "destination": "8919983922916151509", + "source": "8502617293425376752", "type": "dependency" } ], diff --git a/docs/test_cases/t30008_package.svg b/docs/test_cases/t30008_package.svg index bb44aa9a..e6120e6a 100644 --- a/docs/test_cases/t30008_package.svg +++ b/docs/test_cases/t30008_package.svg @@ -1,6 +1,6 @@ - + @@ -9,53 +9,53 @@ - - + + dependants - - + + dependencies - - + + A - - + + B - - + + C - - + + D - - + + E - - + + F - + - + - + - + diff --git a/docs/test_cases/t30008_package_mermaid.svg b/docs/test_cases/t30008_package_mermaid.svg index 6d9fc16a..c986e45a 100644 --- a/docs/test_cases/t30008_package_mermaid.svg +++ b/docs/test_cases/t30008_package_mermaid.svg @@ -26,7 +26,7 @@ - + @@ -38,8 +38,8 @@ - - + + @@ -62,7 +62,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -99,7 +99,7 @@ - + @@ -111,8 +111,8 @@ - - + + @@ -135,7 +135,7 @@ - + @@ -146,7 +146,7 @@ - + @@ -157,7 +157,7 @@ - + diff --git a/docs/test_cases/t30009.md b/docs/test_cases/t30009.md index cafa282e..85174098 100644 --- a/docs/test_cases/t30009.md +++ b/docs/test_cases/t30009.md @@ -57,7 +57,7 @@ namespace D { "elements": [ { "display_name": "A", - "id": "1189741240939898414", + "id": "9517929927519187315", "is_deprecated": false, "name": "A", "namespace": "clanguml::t30009::One", @@ -71,7 +71,7 @@ namespace D { }, { "display_name": "B", - "id": "209763670816643341", + "id": "1678109366533146728", "is_deprecated": false, "name": "B", "namespace": "clanguml::t30009::One", @@ -85,7 +85,7 @@ namespace D { }, { "display_name": "C", - "id": "946522260503371974", + "id": "7572178084026975795", "is_deprecated": false, "name": "C", "namespace": "clanguml::t30009::One", @@ -99,7 +99,7 @@ namespace D { }, { "display_name": "D", - "id": "1181245940399690936", + "id": "9449967523197527493", "is_deprecated": false, "name": "D", "namespace": "clanguml::t30009::One", @@ -112,7 +112,7 @@ namespace D { "type": "namespace" } ], - "id": "1187941209208108244", + "id": "9503529673664865952", "is_deprecated": false, "name": "One", "namespace": "clanguml::t30009", @@ -129,7 +129,7 @@ namespace D { "elements": [ { "display_name": "A", - "id": "986505573514384282", + "id": "7892044588115074260", "is_deprecated": false, "name": "A", "namespace": "clanguml::t30009::Two", @@ -143,7 +143,7 @@ namespace D { }, { "display_name": "B", - "id": "2156827588463114203", + "id": "17254620707704913628", "is_deprecated": false, "name": "B", "namespace": "clanguml::t30009::Two", @@ -157,7 +157,7 @@ namespace D { }, { "display_name": "C", - "id": "1653274432960093632", + "id": "13226195463680749060", "is_deprecated": false, "name": "C", "namespace": "clanguml::t30009::Two", @@ -171,7 +171,7 @@ namespace D { }, { "display_name": "D", - "id": "263095551354153183", + "id": "2104764410833225466", "is_deprecated": false, "name": "D", "namespace": "clanguml::t30009::Two", @@ -184,7 +184,7 @@ namespace D { "type": "namespace" } ], - "id": "1940839474792549233", + "id": "15526715798340393868", "is_deprecated": false, "name": "Two", "namespace": "clanguml::t30009", diff --git a/docs/test_cases/t30009_package.svg b/docs/test_cases/t30009_package.svg index d566534f..7259c80a 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/t30009_package_mermaid.svg b/docs/test_cases/t30009_package_mermaid.svg index 903c6979..a1d66740 100644 --- a/docs/test_cases/t30009_package_mermaid.svg +++ b/docs/test_cases/t30009_package_mermaid.svg @@ -26,7 +26,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -102,7 +102,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -135,7 +135,7 @@ - + diff --git a/docs/test_cases/t30010.md b/docs/test_cases/t30010.md index c2b5e03a..0bc4dd6b 100644 --- a/docs/test_cases/t30010.md +++ b/docs/test_cases/t30010.md @@ -123,7 +123,7 @@ struct App { "elements": [ { "display_name": "lib1", - "id": "879212264535378961", + "id": "7033698116283031691", "is_deprecated": false, "name": "lib1", "path": "", @@ -137,7 +137,7 @@ struct App { }, { "display_name": "lib2", - "id": "1522606219626203424", + "id": "12180849757009627397", "is_deprecated": false, "name": "lib2", "path": "", @@ -151,7 +151,7 @@ struct App { }, { "display_name": "lib3", - "id": "2263709579652581325", + "id": "18109676637220650603", "is_deprecated": false, "name": "lib3", "path": "", @@ -165,7 +165,7 @@ struct App { }, { "display_name": "lib4", - "id": "1103453030023410219", + "id": "8827624240187281752", "is_deprecated": false, "name": "lib4", "path": "", @@ -178,7 +178,7 @@ struct App { "type": "directory" } ], - "id": "879401191375500756", + "id": "7035209531004006049", "is_deprecated": false, "name": "libraries", "path": "", @@ -186,7 +186,7 @@ struct App { }, { "display_name": "app", - "id": "2001320261642080149", + "id": "16010562093136641194", "is_deprecated": false, "name": "app", "path": "", @@ -203,23 +203,23 @@ struct App { "package_type": "directory", "relationships": [ { - "destination": "879212264535378961", - "source": "2001320261642080149", + "destination": "7033698116283031691", + "source": "16010562093136641194", "type": "dependency" }, { - "destination": "1522606219626203424", - "source": "2001320261642080149", + "destination": "12180849757009627397", + "source": "16010562093136641194", "type": "dependency" }, { - "destination": "2263709579652581325", - "source": "2001320261642080149", + "destination": "18109676637220650603", + "source": "16010562093136641194", "type": "dependency" }, { - "destination": "1103453030023410219", - "source": "2001320261642080149", + "destination": "8827624240187281752", + "source": "16010562093136641194", "type": "dependency" } ], diff --git a/docs/test_cases/t30010_package.svg b/docs/test_cases/t30010_package.svg index bde4786a..931f1ebb 100644 --- a/docs/test_cases/t30010_package.svg +++ b/docs/test_cases/t30010_package.svg @@ -1,6 +1,6 @@ - + @@ -9,41 +9,41 @@ - + libraries - - + + lib1 - - + + lib2 - - + + lib3 - - + + lib4 - - + + app - + - + - + - + diff --git a/docs/test_cases/t30010_package_mermaid.svg b/docs/test_cases/t30010_package_mermaid.svg index 897b1799..8cb50c2c 100644 --- a/docs/test_cases/t30010_package_mermaid.svg +++ b/docs/test_cases/t30010_package_mermaid.svg @@ -21,7 +21,7 @@ - + @@ -33,10 +33,10 @@ - - - - + + + + @@ -77,7 +77,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -99,7 +99,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -121,7 +121,7 @@ - + diff --git a/docs/test_cases/t30011.md b/docs/test_cases/t30011.md index bec2152a..41a6578b 100644 --- a/docs/test_cases/t30011.md +++ b/docs/test_cases/t30011.md @@ -85,7 +85,7 @@ void c(struct t30011_App *app, struct t30011_C *c) { } "elements": [ { "display_name": "lib1", - "id": "879212264535378961", + "id": "7033698116283031691", "is_deprecated": false, "name": "lib1", "path": "", @@ -99,7 +99,7 @@ void c(struct t30011_App *app, struct t30011_C *c) { } }, { "display_name": "lib2", - "id": "1522606219626203424", + "id": "12180849757009627397", "is_deprecated": false, "name": "lib2", "path": "", @@ -113,7 +113,7 @@ void c(struct t30011_App *app, struct t30011_C *c) { } }, { "display_name": "lib3", - "id": "2263709579652581325", + "id": "18109676637220650603", "is_deprecated": false, "name": "lib3", "path": "", @@ -127,7 +127,7 @@ void c(struct t30011_App *app, struct t30011_C *c) { } }, { "display_name": "lib4", - "id": "1103453030023410219", + "id": "8827624240187281752", "is_deprecated": false, "name": "lib4", "path": "", @@ -140,7 +140,7 @@ void c(struct t30011_App *app, struct t30011_C *c) { } "type": "directory" } ], - "id": "879401191375500756", + "id": "7035209531004006049", "is_deprecated": false, "name": "libraries", "path": "", @@ -148,7 +148,7 @@ void c(struct t30011_App *app, struct t30011_C *c) { } }, { "display_name": "app", - "id": "2001320261642080149", + "id": "16010562093136641194", "is_deprecated": false, "name": "app", "path": "", @@ -165,23 +165,23 @@ void c(struct t30011_App *app, struct t30011_C *c) { } "package_type": "directory", "relationships": [ { - "destination": "879212264535378961", - "source": "2001320261642080149", + "destination": "7033698116283031691", + "source": "16010562093136641194", "type": "dependency" }, { - "destination": "1522606219626203424", - "source": "2001320261642080149", + "destination": "12180849757009627397", + "source": "16010562093136641194", "type": "dependency" }, { - "destination": "2263709579652581325", - "source": "2001320261642080149", + "destination": "18109676637220650603", + "source": "16010562093136641194", "type": "dependency" }, { - "destination": "1103453030023410219", - "source": "2001320261642080149", + "destination": "8827624240187281752", + "source": "16010562093136641194", "type": "dependency" } ] diff --git a/docs/test_cases/t30011_package.svg b/docs/test_cases/t30011_package.svg index 94dbe18d..ec23a2dd 100644 --- a/docs/test_cases/t30011_package.svg +++ b/docs/test_cases/t30011_package.svg @@ -1,6 +1,6 @@ - + @@ -9,41 +9,41 @@ - + libraries - - + + lib1 - - + + lib2 - - + + lib3 - - + + lib4 - - + + app - + - + - + - + diff --git a/docs/test_cases/t30011_package_mermaid.svg b/docs/test_cases/t30011_package_mermaid.svg index 897b1799..8cb50c2c 100644 --- a/docs/test_cases/t30011_package_mermaid.svg +++ b/docs/test_cases/t30011_package_mermaid.svg @@ -21,7 +21,7 @@ - + @@ -33,10 +33,10 @@ - - - - + + + + @@ -77,7 +77,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -99,7 +99,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -121,7 +121,7 @@ - + diff --git a/docs/test_cases/t30012.md b/docs/test_cases/t30012.md index 30f3695c..55e5e91b 100644 --- a/docs/test_cases/t30012.md +++ b/docs/test_cases/t30012.md @@ -110,7 +110,7 @@ class D { }; "elements": [ { "display_name": "mod1", - "id": "1890617159212924206", + "id": "15124937273703393654", "is_deprecated": false, "name": "mod1", "namespace": "t30012.app.lib1", @@ -124,7 +124,7 @@ class D { }; }, { "display_name": "mod2", - "id": "206451677325228178", + "id": "1651613418601825427", "is_deprecated": false, "name": "mod2", "namespace": "t30012.app.lib1", @@ -137,7 +137,7 @@ class D { }; "type": "module" } ], - "id": "2078388864960203240", + "id": "16627110919681625923", "is_deprecated": false, "name": "lib1", "namespace": "t30012.app", @@ -151,7 +151,7 @@ class D { }; }, { "display_name": "lib2", - "id": "765684581621927632", + "id": "6125476652975421063", "is_deprecated": false, "name": "lib2", "namespace": "t30012.app", @@ -164,7 +164,7 @@ class D { }; "type": "module" } ], - "id": "381866731754697815", + "id": "3054933854037582522", "is_deprecated": false, "name": "app", "namespace": "t30012", diff --git a/docs/test_cases/t30012_package.svg b/docs/test_cases/t30012_package.svg index 7a0304c6..4c4c6fba 100644 --- a/docs/test_cases/t30012_package.svg +++ b/docs/test_cases/t30012_package.svg @@ -1,6 +1,6 @@ - + @@ -9,26 +9,26 @@ - + app - - + + lib1 - - + + mod1 - - + + mod2 - - + + lib2 diff --git a/docs/test_cases/t30012_package_mermaid.svg b/docs/test_cases/t30012_package_mermaid.svg index 62b5da66..e8452433 100644 --- a/docs/test_cases/t30012_package_mermaid.svg +++ b/docs/test_cases/t30012_package_mermaid.svg @@ -26,7 +26,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -80,7 +80,7 @@ - + diff --git a/docs/test_cases/t30013.md b/docs/test_cases/t30013.md index b38523b4..77d4324e 100644 --- a/docs/test_cases/t30013.md +++ b/docs/test_cases/t30013.md @@ -272,7 +272,7 @@ struct CO { }; "elements": [ { "display_name": "mod1", - "id": "2044296282469444594", + "id": "16354370259755556752", "is_deprecated": false, "name": "mod1", "namespace": "t30013", @@ -286,7 +286,7 @@ struct CO { }; }, { "display_name": "mod2", - "id": "1532747677179216874", + "id": "12261981417433734998", "is_deprecated": false, "name": "mod2", "namespace": "t30013", @@ -300,7 +300,7 @@ struct CO { }; }, { "display_name": "mod3", - "id": "2181211985644595508", + "id": "17449695885156764068", "is_deprecated": false, "name": "mod3", "namespace": "t30013", @@ -314,7 +314,7 @@ struct CO { }; }, { "display_name": "mod4", - "id": "1994575092781206355", + "id": "15956600742249650841", "is_deprecated": false, "name": "mod4", "namespace": "t30013", @@ -328,7 +328,7 @@ struct CO { }; }, { "display_name": "mod5", - "id": "83546849245676714", + "id": "668374793965413715", "is_deprecated": false, "name": "mod5", "namespace": "t30013", @@ -342,7 +342,7 @@ struct CO { }; }, { "display_name": "mod6", - "id": "441620369599169965", + "id": "3532962956793359726", "is_deprecated": false, "name": "mod6", "namespace": "t30013", @@ -356,7 +356,7 @@ struct CO { }; }, { "display_name": "mod7", - "id": "836435135277319151", + "id": "6691481082218553213", "is_deprecated": false, "name": "mod7", "namespace": "t30013", @@ -370,7 +370,7 @@ struct CO { }; }, { "display_name": "mod8", - "id": "420790450869221512", + "id": "3366323606953772100", "is_deprecated": false, "name": "mod8", "namespace": "t30013", @@ -384,7 +384,7 @@ struct CO { }; }, { "display_name": "mod9", - "id": "396495954682989840", + "id": "3171967637463918724", "is_deprecated": false, "name": "mod9", "namespace": "t30013", @@ -398,7 +398,7 @@ struct CO { }; }, { "display_name": "mod10", - "id": "2177162846045884064", + "id": "17417302768367072513", "is_deprecated": false, "name": "mod10", "namespace": "t30013", @@ -412,7 +412,7 @@ struct CO { }; }, { "display_name": "mod11", - "id": "1414886740502603020", + "id": "11319093924020824163", "is_deprecated": false, "name": "mod11", "namespace": "t30013", @@ -426,7 +426,7 @@ struct CO { }; }, { "display_name": "mod12", - "id": "1312439587201843275", + "id": "10499516697614746202", "is_deprecated": false, "name": "mod12", "namespace": "t30013", @@ -440,7 +440,7 @@ struct CO { }; }, { "display_name": "mod13", - "id": "1087761784810349022", + "id": "8702094278482792177", "is_deprecated": false, "name": "mod13", "namespace": "t30013", @@ -454,7 +454,7 @@ struct CO { }; }, { "display_name": "mod14", - "id": "613410583917815311", + "id": "4907284671342522495", "is_deprecated": false, "name": "mod14", "namespace": "t30013", @@ -468,7 +468,7 @@ struct CO { }; }, { "display_name": "mod15", - "id": "1226951305255100636", + "id": "9815610442040805091", "is_deprecated": false, "name": "mod15", "namespace": "t30013", @@ -482,7 +482,7 @@ struct CO { }; }, { "display_name": "mod16", - "id": "1931818205177002737", + "id": "15454545641416021896", "is_deprecated": false, "name": "mod16", "namespace": "t30013", @@ -496,7 +496,7 @@ struct CO { }; }, { "display_name": "mod17", - "id": "1954698286919808752", + "id": "15637586295358470019", "is_deprecated": false, "name": "mod17", "namespace": "t30013", @@ -510,7 +510,7 @@ struct CO { }; }, { "display_name": "mod18", - "id": "984386744169567889", + "id": "7875093953356543116", "is_deprecated": false, "name": "mod18", "namespace": "t30013", @@ -524,7 +524,7 @@ struct CO { }; }, { "display_name": "app", - "id": "45223532970498010", + "id": "361788263763984082", "is_deprecated": false, "name": "app", "namespace": "t30013", @@ -541,93 +541,93 @@ struct CO { }; "package_type": "module", "relationships": [ { - "destination": "420790450869221512", - "source": "45223532970498010", + "destination": "3366323606953772100", + "source": "361788263763984082", "type": "dependency" }, { - "destination": "396495954682989840", - "source": "45223532970498010", + "destination": "3171967637463918724", + "source": "361788263763984082", "type": "dependency" }, { - "destination": "2044296282469444594", - "source": "45223532970498010", + "destination": "16354370259755556752", + "source": "361788263763984082", "type": "dependency" }, { - "destination": "1532747677179216874", - "source": "45223532970498010", + "destination": "12261981417433734998", + "source": "361788263763984082", "type": "dependency" }, { - "destination": "2181211985644595508", - "source": "45223532970498010", + "destination": "17449695885156764068", + "source": "361788263763984082", "type": "dependency" }, { - "destination": "1994575092781206355", - "source": "45223532970498010", + "destination": "15956600742249650841", + "source": "361788263763984082", "type": "dependency" }, { - "destination": "1226951305255100636", - "source": "45223532970498010", + "destination": "9815610442040805091", + "source": "361788263763984082", "type": "dependency" }, { - "destination": "984386744169567889", - "source": "45223532970498010", + "destination": "7875093953356543116", + "source": "361788263763984082", "type": "dependency" }, { - "destination": "1931818205177002737", - "source": "45223532970498010", + "destination": "15454545641416021896", + "source": "361788263763984082", "type": "dependency" }, { - "destination": "613410583917815311", - "source": "45223532970498010", + "destination": "4907284671342522495", + "source": "361788263763984082", "type": "dependency" }, { - "destination": "83546849245676714", - "source": "45223532970498010", + "destination": "668374793965413715", + "source": "361788263763984082", "type": "dependency" }, { - "destination": "836435135277319151", - "source": "45223532970498010", + "destination": "6691481082218553213", + "source": "361788263763984082", "type": "dependency" }, { - "destination": "1954698286919808752", - "source": "45223532970498010", + "destination": "15637586295358470019", + "source": "361788263763984082", "type": "dependency" }, { - "destination": "441620369599169965", - "source": "45223532970498010", + "destination": "3532962956793359726", + "source": "361788263763984082", "type": "dependency" }, { - "destination": "2177162846045884064", - "source": "45223532970498010", + "destination": "17417302768367072513", + "source": "361788263763984082", "type": "dependency" }, { - "destination": "1414886740502603020", - "source": "45223532970498010", + "destination": "11319093924020824163", + "source": "361788263763984082", "type": "dependency" }, { - "destination": "1312439587201843275", - "source": "45223532970498010", + "destination": "10499516697614746202", + "source": "361788263763984082", "type": "dependency" }, { - "destination": "1087761784810349022", - "source": "45223532970498010", + "destination": "8702094278482792177", + "source": "361788263763984082", "type": "dependency" } ], diff --git a/docs/test_cases/t30013_package.svg b/docs/test_cases/t30013_package.svg index 61f1bbab..ab0ccd2b 100644 --- a/docs/test_cases/t30013_package.svg +++ b/docs/test_cases/t30013_package.svg @@ -1,6 +1,6 @@ - + @@ -9,136 +9,136 @@ - - + + mod1 - - + + mod2 - - + + mod3 - - + + mod4 - - + + mod5 - - + + mod6 - - + + mod7 - - + + mod8 - - + + mod9 - - + + mod10 - - + + mod11 - - + + mod12 - - + + mod13 - - + + mod14 - - + + mod15 - - + + mod16 - - + + mod17 - - + + mod18 - - + + app - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/docs/test_cases/t30013_package_mermaid.svg b/docs/test_cases/t30013_package_mermaid.svg index ec097879..7a623f26 100644 --- a/docs/test_cases/t30013_package_mermaid.svg +++ b/docs/test_cases/t30013_package_mermaid.svg @@ -22,24 +22,24 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -206,7 +206,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -239,7 +239,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -272,7 +272,7 @@ - + @@ -283,7 +283,7 @@ - + @@ -294,7 +294,7 @@ - + @@ -305,7 +305,7 @@ - + @@ -316,7 +316,7 @@ - + @@ -327,7 +327,7 @@ - + @@ -338,7 +338,7 @@ - + @@ -349,7 +349,7 @@ - + @@ -360,7 +360,7 @@ - + @@ -371,7 +371,7 @@ - + @@ -382,7 +382,7 @@ - + @@ -393,7 +393,7 @@ - + @@ -404,7 +404,7 @@ - + diff --git a/docs/test_cases/t30014.md b/docs/test_cases/t30014.md index f68feaca..24d76234 100644 --- a/docs/test_cases/t30014.md +++ b/docs/test_cases/t30014.md @@ -106,7 +106,7 @@ class D { }; "elements": [ { "display_name": "mod1", - "id": "2034114360803168801", + "id": "16272914886425350409", "is_deprecated": false, "name": "mod1", "namespace": "t30014.app:lib1", @@ -119,7 +119,7 @@ class D { }; "type": "module" } ], - "id": "1618985722491582169", + "id": "12951885779932657355", "is_deprecated": false, "name": ":lib1", "namespace": "t30014.app", @@ -133,7 +133,7 @@ class D { }; }, { "display_name": ":lib2", - "id": "1569901875704270760", + "id": "12559215005634166087", "is_deprecated": false, "name": ":lib2", "namespace": "t30014.app", @@ -146,7 +146,7 @@ class D { }; "type": "module" } ], - "id": "1932503454610788726", + "id": "15460027636886309813", "is_deprecated": false, "name": "app", "namespace": "t30014", diff --git a/docs/test_cases/t30014_package.svg b/docs/test_cases/t30014_package.svg index cf8f5c9e..93f28d32 100644 --- a/docs/test_cases/t30014_package.svg +++ b/docs/test_cases/t30014_package.svg @@ -1,6 +1,6 @@ - + @@ -9,21 +9,21 @@ - + app - - + + :lib1 - - + + mod1 - - + + :lib2 diff --git a/docs/test_cases/t30014_package_mermaid.svg b/docs/test_cases/t30014_package_mermaid.svg index bf069df7..3a014bf0 100644 --- a/docs/test_cases/t30014_package_mermaid.svg +++ b/docs/test_cases/t30014_package_mermaid.svg @@ -26,7 +26,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -69,7 +69,7 @@ - + diff --git a/docs/test_cases/t30015.md b/docs/test_cases/t30015.md index d6651ad7..21b7fb0c 100644 --- a/docs/test_cases/t30015.md +++ b/docs/test_cases/t30015.md @@ -284,7 +284,7 @@ struct CO { }; "elements": [ { "display_name": ":mod1", - "id": "2078789731210233181", + "id": "16630317849681865450", "is_deprecated": false, "name": ":mod1", "namespace": "t30015.lib1", @@ -298,7 +298,7 @@ struct CO { }; }, { "display_name": ":mod2", - "id": "108157285110421434", + "id": "865258280883371475", "is_deprecated": false, "name": ":mod2", "namespace": "t30015.lib1", @@ -312,7 +312,7 @@ struct CO { }; }, { "display_name": ":mod3", - "id": "1466337333501241721", + "id": "11730698668009933772", "is_deprecated": false, "name": ":mod3", "namespace": "t30015.lib1", @@ -326,7 +326,7 @@ struct CO { }; }, { "display_name": ":mod4", - "id": "2181077882404368936", + "id": "17448623059234951491", "is_deprecated": false, "name": ":mod4", "namespace": "t30015.lib1", @@ -340,7 +340,7 @@ struct CO { }; }, { "display_name": ":mod5", - "id": "1045004042628075747", + "id": "8360032341024605982", "is_deprecated": false, "name": ":mod5", "namespace": "t30015.lib1", @@ -354,7 +354,7 @@ struct CO { }; }, { "display_name": ":mod6", - "id": "536067780214444138", + "id": "4288542241715553111", "is_deprecated": false, "name": ":mod6", "namespace": "t30015.lib1", @@ -368,7 +368,7 @@ struct CO { }; }, { "display_name": ":mod7", - "id": "1678616733221858020", + "id": "13428933865774864166", "is_deprecated": false, "name": ":mod7", "namespace": "t30015.lib1", @@ -382,7 +382,7 @@ struct CO { }; }, { "display_name": ":mod8", - "id": "240013230569803405", + "id": "1920105844558427246", "is_deprecated": false, "name": ":mod8", "namespace": "t30015.lib1", @@ -396,7 +396,7 @@ struct CO { }; }, { "display_name": ":mod9", - "id": "179175577447017767", + "id": "1433404619576142142", "is_deprecated": false, "name": ":mod9", "namespace": "t30015.lib1", @@ -410,7 +410,7 @@ struct CO { }; }, { "display_name": ":mod10", - "id": "485628131931062884", + "id": "3885025055448503075", "is_deprecated": false, "name": ":mod10", "namespace": "t30015.lib1", @@ -424,7 +424,7 @@ struct CO { }; }, { "display_name": ":mod11", - "id": "791090113373006765", + "id": "6328720906984054121", "is_deprecated": false, "name": ":mod11", "namespace": "t30015.lib1", @@ -438,7 +438,7 @@ struct CO { }; }, { "display_name": ":mod12", - "id": "500107934060144677", + "id": "4000863472481157416", "is_deprecated": false, "name": ":mod12", "namespace": "t30015.lib1", @@ -452,7 +452,7 @@ struct CO { }; }, { "display_name": ":mod13", - "id": "1195842122299166493", + "id": "9566736978393331950", "is_deprecated": false, "name": ":mod13", "namespace": "t30015.lib1", @@ -466,7 +466,7 @@ struct CO { }; }, { "display_name": ":mod14", - "id": "581129920847850526", + "id": "4649039366782804209", "is_deprecated": false, "name": ":mod14", "namespace": "t30015.lib1", @@ -480,7 +480,7 @@ struct CO { }; }, { "display_name": ":mod15", - "id": "1715856257738182160", + "id": "13726850061905457280", "is_deprecated": false, "name": ":mod15", "namespace": "t30015.lib1", @@ -494,7 +494,7 @@ struct CO { }; }, { "display_name": ":mod16", - "id": "1435303665523039114", + "id": "11482429324184312915", "is_deprecated": false, "name": ":mod16", "namespace": "t30015.lib1", @@ -508,7 +508,7 @@ struct CO { }; }, { "display_name": ":mod17", - "id": "1327885001907982070", + "id": "10623080015263856565", "is_deprecated": false, "name": ":mod17", "namespace": "t30015.lib1", @@ -522,7 +522,7 @@ struct CO { }; }, { "display_name": ":mod18", - "id": "2193691762152553973", + "id": "17549534097220431785", "is_deprecated": false, "name": ":mod18", "namespace": "t30015.lib1", @@ -535,7 +535,7 @@ struct CO { }; "type": "module" } ], - "id": "1208975031146850353", + "id": "9671800249174802825", "is_deprecated": false, "name": "lib1", "namespace": "t30015", @@ -543,7 +543,7 @@ struct CO { }; }, { "display_name": "app", - "id": "1200268042616700255", + "id": "9602144340933602046", "is_deprecated": false, "name": "app", "namespace": "t30015", @@ -560,93 +560,93 @@ struct CO { }; "package_type": "module", "relationships": [ { - "destination": "240013230569803405", - "source": "1200268042616700255", + "destination": "1920105844558427246", + "source": "9602144340933602046", "type": "dependency" }, { - "destination": "179175577447017767", - "source": "1200268042616700255", + "destination": "1433404619576142142", + "source": "9602144340933602046", "type": "dependency" }, { - "destination": "2078789731210233181", - "source": "1200268042616700255", + "destination": "16630317849681865450", + "source": "9602144340933602046", "type": "dependency" }, { - "destination": "108157285110421434", - "source": "1200268042616700255", + "destination": "865258280883371475", + "source": "9602144340933602046", "type": "dependency" }, { - "destination": "1466337333501241721", - "source": "1200268042616700255", + "destination": "11730698668009933772", + "source": "9602144340933602046", "type": "dependency" }, { - "destination": "2181077882404368936", - "source": "1200268042616700255", + "destination": "17448623059234951491", + "source": "9602144340933602046", "type": "dependency" }, { - "destination": "1715856257738182160", - "source": "1200268042616700255", + "destination": "13726850061905457280", + "source": "9602144340933602046", "type": "dependency" }, { - "destination": "2193691762152553973", - "source": "1200268042616700255", + "destination": "17549534097220431785", + "source": "9602144340933602046", "type": "dependency" }, { - "destination": "1435303665523039114", - "source": "1200268042616700255", + "destination": "11482429324184312915", + "source": "9602144340933602046", "type": "dependency" }, { - "destination": "581129920847850526", - "source": "1200268042616700255", + "destination": "4649039366782804209", + "source": "9602144340933602046", "type": "dependency" }, { - "destination": "1045004042628075747", - "source": "1200268042616700255", + "destination": "8360032341024605982", + "source": "9602144340933602046", "type": "dependency" }, { - "destination": "1678616733221858020", - "source": "1200268042616700255", + "destination": "13428933865774864166", + "source": "9602144340933602046", "type": "dependency" }, { - "destination": "1327885001907982070", - "source": "1200268042616700255", + "destination": "10623080015263856565", + "source": "9602144340933602046", "type": "dependency" }, { - "destination": "536067780214444138", - "source": "1200268042616700255", + "destination": "4288542241715553111", + "source": "9602144340933602046", "type": "dependency" }, { - "destination": "485628131931062884", - "source": "1200268042616700255", + "destination": "3885025055448503075", + "source": "9602144340933602046", "type": "dependency" }, { - "destination": "791090113373006765", - "source": "1200268042616700255", + "destination": "6328720906984054121", + "source": "9602144340933602046", "type": "dependency" }, { - "destination": "500107934060144677", - "source": "1200268042616700255", + "destination": "4000863472481157416", + "source": "9602144340933602046", "type": "dependency" }, { - "destination": "1195842122299166493", - "source": "1200268042616700255", + "destination": "9566736978393331950", + "source": "9602144340933602046", "type": "dependency" } ], diff --git a/docs/test_cases/t30015_package.svg b/docs/test_cases/t30015_package.svg index 8e5cbc2d..89421058 100644 --- a/docs/test_cases/t30015_package.svg +++ b/docs/test_cases/t30015_package.svg @@ -1,6 +1,6 @@ - + @@ -9,139 +9,139 @@ - + lib1 - - + + :mod1 - - + + :mod2 - - + + :mod3 - - + + :mod4 - - + + :mod5 - - + + :mod6 - - + + :mod7 - - + + :mod8 - - + + :mod9 - - + + :mod10 - - + + :mod11 - - + + :mod12 - - + + :mod13 - - + + :mod14 - - + + :mod15 - - + + :mod16 - - + + :mod17 - - + + :mod18 - - + + app - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/docs/test_cases/t30015_package_mermaid.svg b/docs/test_cases/t30015_package_mermaid.svg index b7cd9ad0..906ad10b 100644 --- a/docs/test_cases/t30015_package_mermaid.svg +++ b/docs/test_cases/t30015_package_mermaid.svg @@ -21,7 +21,7 @@ - + @@ -33,24 +33,24 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -217,7 +217,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -239,7 +239,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -272,7 +272,7 @@ - + @@ -283,7 +283,7 @@ - + @@ -294,7 +294,7 @@ - + @@ -305,7 +305,7 @@ - + @@ -316,7 +316,7 @@ - + @@ -327,7 +327,7 @@ - + @@ -338,7 +338,7 @@ - + @@ -349,7 +349,7 @@ - + @@ -360,7 +360,7 @@ - + @@ -371,7 +371,7 @@ - + @@ -382,7 +382,7 @@ - + @@ -393,7 +393,7 @@ - + @@ -404,7 +404,7 @@ - + @@ -415,7 +415,7 @@ - + diff --git a/docs/test_cases/t40001.md b/docs/test_cases/t40001.md index 7edffec9..414c160d 100644 --- a/docs/test_cases/t40001.md +++ b/docs/test_cases/t40001.md @@ -85,19 +85,19 @@ int foo2() { return 0; } { "display_name": "src/t40001.cc", "file_kind": "implementation", - "id": "1755015016680017839", + "id": "14040120133440142713", "name": "t40001.cc", "type": "file" } ], - "id": "1387619747296316447", + "id": "11100957978370531577", "name": "src", "type": "folder" }, { "display_name": "string", "file_kind": "header", - "id": "1687197357150905926", + "id": "13497578857207247412", "is_system": true, "name": "string", "type": "file" @@ -105,7 +105,7 @@ int foo2() { return 0; } { "display_name": "vector", "file_kind": "header", - "id": "405203884025072971", + "id": "3241631072200583771", "is_system": true, "name": "vector", "type": "file" @@ -116,7 +116,7 @@ int foo2() { return 0; } { "display_name": "include/t40001_include1.h", "file_kind": "header", - "id": "1926692816440595520", + "id": "15413542531524764165", "is_system": false, "name": "t40001_include1.h", "type": "file" @@ -127,25 +127,25 @@ int foo2() { return 0; } { "display_name": "include/lib1/lib1.h", "file_kind": "header", - "id": "2193549214042244690", + "id": "17548393712337957522", "is_system": false, "name": "lib1.h", "type": "file" } ], - "id": "1687675335949018432", + "id": "13501402687592147456", "name": "lib1", "type": "folder" } ], - "id": "989412417490706876", + "id": "7915299339925655008", "name": "include", "type": "folder" }, { "display_name": "yaml-cpp/yaml.h", "file_kind": "header", - "id": "1659736894483045485", + "id": "13277895155864363881", "is_system": true, "name": "yaml-cpp/yaml.h", "type": "file" @@ -154,33 +154,33 @@ int foo2() { return 0; } "name": "t40001_include", "relationships": [ { - "destination": "1687197357150905926", - "source": "1755015016680017839", + "destination": "13497578857207247412", + "source": "14040120133440142713", "type": "dependency" }, { - "destination": "405203884025072971", - "source": "1755015016680017839", + "destination": "3241631072200583771", + "source": "14040120133440142713", "type": "dependency" }, { - "destination": "1926692816440595520", - "source": "1755015016680017839", + "destination": "15413542531524764165", + "source": "14040120133440142713", "type": "association" }, { - "destination": "2193549214042244690", - "source": "1926692816440595520", + "destination": "17548393712337957522", + "source": "15413542531524764165", "type": "association" }, { - "destination": "1659736894483045485", - "source": "1926692816440595520", + "destination": "13277895155864363881", + "source": "15413542531524764165", "type": "dependency" }, { - "destination": "1687197357150905926", - "source": "1926692816440595520", + "destination": "13497578857207247412", + "source": "15413542531524764165", "type": "dependency" } ], diff --git a/docs/test_cases/t40001_include.svg b/docs/test_cases/t40001_include.svg index 51e6cada..89f77b78 100644 --- a/docs/test_cases/t40001_include.svg +++ b/docs/test_cases/t40001_include.svg @@ -1,6 +1,6 @@ - + @@ -10,56 +10,56 @@ Basic include diagram example - + src - + include - + lib1 - - + + t40001.cc - - + + t40001_include1.h - + lib1.h - + string - + vector - + yaml-cpp/yaml.h - + This is a lib1 include dir - + This is a t40001_include1.h include file - + - + - + - + - + - + - - + + diff --git a/docs/test_cases/t40001_include_mermaid.svg b/docs/test_cases/t40001_include_mermaid.svg index bbd6e170..bec9eeea 100644 --- a/docs/test_cases/t40001_include_mermaid.svg +++ b/docs/test_cases/t40001_include_mermaid.svg @@ -22,7 +22,7 @@ - + @@ -32,7 +32,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -54,14 +54,14 @@ - - - - - - - - + + + + + + + + @@ -138,8 +138,8 @@ - - + + @@ -151,8 +151,8 @@ - - + + @@ -164,8 +164,8 @@ - - + + @@ -177,7 +177,7 @@ - + @@ -188,7 +188,7 @@ - + @@ -199,7 +199,7 @@ - + diff --git a/docs/test_cases/t40002.md b/docs/test_cases/t40002.md index 37c1c398..0e443efc 100644 --- a/docs/test_cases/t40002.md +++ b/docs/test_cases/t40002.md @@ -126,7 +126,7 @@ int foo(); { "display_name": "src/t40002.cc", "file_kind": "implementation", - "id": "1489450289909741706", + "id": "11915602319277933652", "name": "t40002.cc", "type": "file" }, @@ -136,12 +136,12 @@ int foo(); { "display_name": "src/lib1/lib1.cc", "file_kind": "implementation", - "id": "1493913207373215402", + "id": "11951305658985723216", "name": "lib1.cc", "type": "file" } ], - "id": "1284742705549910910", + "id": "10277941644399287283", "name": "lib1", "type": "folder" }, @@ -151,17 +151,17 @@ int foo(); { "display_name": "src/lib2/lib2.cc", "file_kind": "implementation", - "id": "1761875020766116446", + "id": "14095000166128931568", "name": "lib2.cc", "type": "file" } ], - "id": "1397224709580110803", + "id": "11177797676640886425", "name": "lib2", "type": "folder" } ], - "id": "1387619747296316447", + "id": "11100957978370531577", "name": "src", "type": "folder" }, @@ -174,13 +174,13 @@ int foo(); { "display_name": "include/lib1/lib1.h", "file_kind": "header", - "id": "2193549214042244690", + "id": "17548393712337957522", "is_system": false, "name": "lib1.h", "type": "file" } ], - "id": "1687675335949018432", + "id": "13501402687592147456", "name": "lib1", "type": "folder" }, @@ -190,18 +190,18 @@ int foo(); { "display_name": "include/lib2/lib2.h", "file_kind": "header", - "id": "1969674835696841438", + "id": "15757398685574731504", "is_system": false, "name": "lib2.h", "type": "file" } ], - "id": "1248530620501446930", + "id": "9988244964011575444", "name": "lib2", "type": "folder" } ], - "id": "989412417490706876", + "id": "7915299339925655008", "name": "include", "type": "folder" } @@ -209,28 +209,28 @@ int foo(); "name": "t40002_include", "relationships": [ { - "destination": "2193549214042244690", - "source": "1489450289909741706", + "destination": "17548393712337957522", + "source": "11915602319277933652", "type": "association" }, { - "destination": "1969674835696841438", - "source": "1489450289909741706", + "destination": "15757398685574731504", + "source": "11915602319277933652", "type": "association" }, { - "destination": "2193549214042244690", - "source": "1493913207373215402", + "destination": "17548393712337957522", + "source": "11951305658985723216", "type": "association" }, { - "destination": "1969674835696841438", - "source": "1761875020766116446", + "destination": "15757398685574731504", + "source": "14095000166128931568", "type": "association" }, { - "destination": "1969674835696841438", - "source": "2193549214042244690", + "destination": "15757398685574731504", + "source": "17548393712337957522", "type": "association" } ] diff --git a/docs/test_cases/t40002_include.svg b/docs/test_cases/t40002_include.svg index dac68946..acab8052 100644 --- a/docs/test_cases/t40002_include.svg +++ b/docs/test_cases/t40002_include.svg @@ -1,6 +1,6 @@ - + @@ -9,58 +9,58 @@ - + 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 0c3ebfe6..0c35079d 100644 --- a/docs/test_cases/t40002_include_mermaid.svg +++ b/docs/test_cases/t40002_include_mermaid.svg @@ -21,7 +21,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -71,7 +71,7 @@ - + @@ -83,11 +83,11 @@ - - - - - + + + + + @@ -137,8 +137,8 @@ - - + + @@ -150,8 +150,8 @@ - - + + @@ -163,8 +163,8 @@ - - + + @@ -176,8 +176,8 @@ - - + + @@ -189,8 +189,8 @@ - - + + diff --git a/docs/test_cases/t40003.md b/docs/test_cases/t40003.md index 5b1423ad..be508764 100644 --- a/docs/test_cases/t40003.md +++ b/docs/test_cases/t40003.md @@ -11,12 +11,19 @@ diagrams: - src/dependencies/t2.cc # Render the paths relative to this directory include: - # Include only files which depend on t1.h + # Include files which depend on t1.h dependants: - include/dependants/t1.h # and dependencies of t2.cc dependencies: - src/dependencies/t2.cc + exclude: + # Exclude files which depend on t10.h + dependants: + - include/dependants/t10.h + # and other dependencies of t8.h + dependencies: + - include/dependencies/t8.h plantuml: before: - "' t40003 test include diagram" @@ -32,6 +39,7 @@ void t() { t3(); t5(); + t8(); } } ``` @@ -58,6 +66,16 @@ namespace clanguml::t40003::dependencies { void t3() { t2(); } } ``` +File `tests/t40003/include/dependencies/t8.h` +```cpp +#pragma once + +#include "t7.h" + +namespace clanguml::t40003::dependencies { +void t8() { t7(); } +} +``` File `tests/t40003/include/dependencies/t1.h` ```cpp #pragma once @@ -81,9 +99,14 @@ File `tests/t40003/include/dependencies/t5.h` #pragma once #include "t1.h" +#include "t8.h" namespace clanguml::t40003::dependencies { -void t5() { t1(); } +void t5() +{ + t1(); + t8(); +} } ``` File `tests/t40003/include/dependencies/t2.h` @@ -96,6 +119,14 @@ namespace clanguml::t40003::dependencies { void t2() { t1(); } } ``` +File `tests/t40003/include/dependencies/t7.h` +```cpp +#pragma once + +namespace clanguml::t40003::dependencies { +void t7() { } +} +``` File `tests/t40003/include/dependants/t3.h` ```cpp #pragma once @@ -106,6 +137,16 @@ namespace clanguml::t40003::dependants { void t3() { t2(); } } ``` +File `tests/t40003/include/dependants/t10.h` +```cpp +#pragma once + +#include "t3.h" + +namespace clanguml::t40003::dependants { +void t10() { t3(); } +} +``` File `tests/t40003/include/dependants/t4.h` ```cpp #pragma once @@ -122,6 +163,16 @@ namespace clanguml::t40003::dependants { void t1() { } } ``` +File `tests/t40003/include/dependants/t11.h` +```cpp +#pragma once + +#include "t10.h" + +namespace clanguml::t40003::dependants { +void t11() { t10(); } +} +``` File `tests/t40003/include/dependants/t2.h` ```cpp #pragma once @@ -150,12 +201,12 @@ void t2() { t1(); } { "display_name": "src/dependants/t1.cc", "file_kind": "implementation", - "id": "1215324434184692437", + "id": "9722595473477539496", "name": "t1.cc", "type": "file" } ], - "id": "1128556599972003761", + "id": "9028452799776030089", "name": "dependants", "type": "folder" }, @@ -165,17 +216,17 @@ void t2() { t1(); } { "display_name": "src/dependencies/t2.cc", "file_kind": "implementation", - "id": "2215849176605856058", + "id": "17726793412846848469", "name": "t2.cc", "type": "file" } ], - "id": "2015386828772336316", + "id": "16123094630178690530", "name": "dependencies", "type": "folder" } ], - "id": "1387619747296316447", + "id": "11100957978370531577", "name": "src", "type": "folder" }, @@ -188,7 +239,7 @@ void t2() { t1(); } { "display_name": "include/dependants/t3.h", "file_kind": "header", - "id": "60001020671836182", + "id": "480008165374689457", "is_system": false, "name": "t3.h", "type": "file" @@ -196,7 +247,7 @@ void t2() { t1(); } { "display_name": "include/dependants/t2.h", "file_kind": "header", - "id": "1921842892192045013", + "id": "15374743137536360107", "is_system": false, "name": "t2.h", "type": "file" @@ -204,13 +255,13 @@ void t2() { t1(); } { "display_name": "include/dependants/t1.h", "file_kind": "header", - "id": "2295271780650013565", + "id": "18362174245200108524", "is_system": false, "name": "t1.h", "type": "file" } ], - "id": "1763526330848915994", + "id": "14108210646791327956", "name": "dependants", "type": "folder" }, @@ -220,7 +271,7 @@ void t2() { t1(); } { "display_name": "include/dependencies/t3.h", "file_kind": "header", - "id": "1226843223635488673", + "id": "9814745789083909391", "is_system": false, "name": "t3.h", "type": "file" @@ -228,7 +279,7 @@ void t2() { t1(); } { "display_name": "include/dependencies/t2.h", "file_kind": "header", - "id": "1849348825646635129", + "id": "14794790605173081035", "is_system": false, "name": "t2.h", "type": "file" @@ -236,7 +287,7 @@ void t2() { t1(); } { "display_name": "include/dependencies/t1.h", "file_kind": "header", - "id": "1120257488305564427", + "id": "8962059906444515418", "is_system": false, "name": "t1.h", "type": "file" @@ -244,18 +295,18 @@ void t2() { t1(); } { "display_name": "include/dependencies/t5.h", "file_kind": "header", - "id": "2106129159239499468", + "id": "16849033273915995749", "is_system": false, "name": "t5.h", "type": "file" } ], - "id": "1833478793852674517", + "id": "14667830350821396139", "name": "dependencies", "type": "folder" } ], - "id": "989412417490706876", + "id": "7915299339925655008", "name": "include", "type": "folder" } @@ -263,48 +314,58 @@ void t2() { t1(); } "name": "t40003_include", "relationships": [ { - "destination": "60001020671836182", - "source": "1215324434184692437", + "destination": "480008165374689457", + "source": "9722595473477539496", "type": "association" }, { - "destination": "1882940911178525353", - "source": "1215324434184692437", + "destination": "15063527289428202824", + "source": "9722595473477539496", "type": "association" }, { - "destination": "1226843223635488673", - "source": "2215849176605856058", + "destination": "9814745789083909391", + "source": "17726793412846848469", "type": "association" }, { - "destination": "2106129159239499468", - "source": "2215849176605856058", + "destination": "16849033273915995749", + "source": "17726793412846848469", "type": "association" }, { - "destination": "1921842892192045013", - "source": "60001020671836182", + "destination": "15374743137536360107", + "source": "480008165374689457", "type": "association" }, { - "destination": "2295271780650013565", - "source": "1921842892192045013", + "destination": "18362174245200108524", + "source": "15374743137536360107", "type": "association" }, { - "destination": "1849348825646635129", - "source": "1226843223635488673", + "destination": "14794790605173081035", + "source": "9814745789083909391", "type": "association" }, { - "destination": "1120257488305564427", - "source": "1849348825646635129", + "destination": "8962059906444515418", + "source": "14794790605173081035", "type": "association" }, { - "destination": "1120257488305564427", - "source": "2106129159239499468", + "destination": "8962059906444515418", + "source": "16849033273915995749", + "type": "association" + }, + { + "destination": "15065692964616746228", + "source": "16849033273915995749", + "type": "association" + }, + { + "destination": "7559120824700944250", + "source": "15065692964616746228", "type": "association" } ] diff --git a/docs/test_cases/t40003_include.svg b/docs/test_cases/t40003_include.svg index 46d7ee2e..fb2439c3 100644 --- a/docs/test_cases/t40003_include.svg +++ b/docs/test_cases/t40003_include.svg @@ -1,6 +1,6 @@ - + @@ -9,80 +9,80 @@ - + 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 aa263922..cca5700d 100644 --- a/docs/test_cases/t40003_include_mermaid.svg +++ b/docs/test_cases/t40003_include_mermaid.svg @@ -21,7 +21,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -71,7 +71,7 @@ - + @@ -83,14 +83,14 @@ - - - - - - - - + + + + + + + + @@ -167,8 +167,8 @@ - - + + @@ -180,8 +180,8 @@ - - + + @@ -193,8 +193,8 @@ - - + + @@ -206,8 +206,8 @@ - - + + @@ -219,8 +219,8 @@ - - + + @@ -232,8 +232,8 @@ - - + + @@ -245,8 +245,8 @@ - - + + @@ -258,8 +258,8 @@ - - + + @@ -271,8 +271,8 @@ - - + +