Adding handling of lambda expressions in sequence diagrams

tests/t20012/.clang-uml

@@ -0,0 +1,14 @@
+compilation_database_dir: ..
+output_directory: puml
+diagrams:
+  t20012_sequence:
+    type: sequence
+    glob:
+      - ../../tests/t20012/t20012.cc
+    include:
+      namespaces:
+        - clanguml::t20012
+    using_namespace:
+      - clanguml::t20012
+    start_from:
+      - function: "clanguml::t20012::tmain()"

tests/t20012/t20012.cc

@@ -0,0 +1,73 @@
+#include <functional>
+#include <utility>
+
+namespace clanguml {
+namespace t20012 {
+struct A {
+    void a() { aa(); }
+
+    void aa() { aaa(); }
+
+    void aaa() { }
+};
+
+struct B {
+    void b() { bb(); }
+
+    void bb() { bbb(); }
+
+    void bbb() { }
+};
+
+struct C {
+    void c() { cc(); }
+
+    void cc() { ccc(); }
+
+    void ccc() { }
+};
+
+template <typename F> struct R {
+    R(F &&f)
+        : f_{std::move(f)}
+    {
+    }
+
+    void r() { f_(); }
+
+    F f_;
+};
+
+void tmain()
+{
+    A a;
+    B b;
+    C c;
+
+    // The activity shouldn't be marked at the lambda definition, but
+    // wherever it is actually called...
+    auto alambda = [&a, &b]() {
+        a.a();
+        b.b();
+    };
+
+    // ...like here
+    alambda();
+
+    // There should be no call to B in the sequence diagram as the blambda
+    // is never called
+    [[maybe_unused]] auto blambda = [&b]() { b.b(); };
+
+    // Nested lambdas should also work
+    auto clambda = [alambda, &c]() {
+        c.c();
+        alambda();
+    };
+    clambda();
+
+    R r{[&c]() { c.c(); }};
+
+    r.r();
+}
+}
+}

tests/t20012/test_case.h

@@ -0,0 +1,66 @@
+/**
+ * tests/t20012/test_case.h
+ *
+ * Copyright (c) 2021-2022 Bartek Kryza <bkryza@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+TEST_CASE("t20012", "[test-case][sequence]")
+{
+    auto [config, db] = load_config("t20012");
+
+    auto diagram = config.diagrams["t20012_sequence"];
+
+    REQUIRE(diagram->name == "t20012_sequence");
+
+    auto model = generate_sequence_diagram(*db, diagram);
+
+    REQUIRE(model->name() == "t20012_sequence");
+
+    auto puml = generate_sequence_puml(diagram, *model);
+    AliasMatcher _A(puml);
+
+    REQUIRE_THAT(puml, StartsWith("@startuml"));
+    REQUIRE_THAT(puml, EndsWith("@enduml\n"));
+
+    // Check if all calls exist
+    REQUIRE_THAT(puml,
+        HasCall(_A("tmain()"), _A("tmain()##(lambda 49:20)"), "operator()"));
+    REQUIRE_THAT(puml, HasCall(_A("tmain()##(lambda 49:20)"), _A("A"), "a"));
+    REQUIRE_THAT(puml, HasCall(_A("A"), _A("A"), "aa"));
+    REQUIRE_THAT(puml, HasCall(_A("A"), _A("A"), "aaa"));
+
+    REQUIRE_THAT(puml, HasCall(_A("tmain()##(lambda 49:20)"), _A("B"), "b"));
+    REQUIRE_THAT(puml, HasCall(_A("B"), _A("B"), "bb"));
+    REQUIRE_THAT(puml, HasCall(_A("B"), _A("B"), "bbb"));
+
+    REQUIRE_THAT(puml, HasCall(_A("tmain()##(lambda 62:20)"), _A("C"), "c"));
+    REQUIRE_THAT(puml, HasCall(_A("C"), _A("C"), "cc"));
+    REQUIRE_THAT(puml, HasCall(_A("C"), _A("C"), "ccc"));
+    REQUIRE_THAT(puml,
+        HasCall(_A("tmain()##(lambda 62:20)"), _A("tmain()##(lambda 49:20)"),
+            "operator()"));
+
+    REQUIRE_THAT(puml, HasCall(_A("C"), _A("C"), "ccc"));
+
+    REQUIRE_THAT(puml, HasCall(_A("tmain()"), _A("R<R##(lambda 68:9)>"), "r"));
+    REQUIRE_THAT(puml,
+        HasCall(_A("R<R##(lambda 68:9)>"), _A("tmain()##(lambda 68:9)"),
+            "operator()"));
+    REQUIRE_THAT(
+        puml, HasCall(_A("tmain()##(lambda 68:9)"), _A("C"), "c"));
+
+    save_puml(
+        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+}

tests/test_cases.cc

@@ -258,6 +258,7 @@ using namespace clanguml::test::matchers;
 #include "t20009/test_case.h"
 #include "t20010/test_case.h"
 #include "t20011/test_case.h"
+#include "t20012/test_case.h"
 
 ///
 /// Package diagram tests