Merge pull request #43 from andreasfertig/fixIssue41

Fixed Issue #41: Segfault with generic lambda.

CodeGenerator.cpp

@@ -121,6 +121,15 @@ OutputFormatHelper& CodeGenerator::LambdaScopeHandler::GetBuffer(OutputFormatHel
 }
 //-----------------------------------------------------------------------------
 
+void CodeGenerator::InsertArg(const CXXDependentScopeMemberExpr* stmt)
+{
+    InsertArg(stmt->getBase());
+    const std::string op{stmt->isArrow() ? "->" : "."};
+
+    mOutputFormatHelper.Append(op, stmt->getMemberNameInfo().getAsString());
+}
+//-----------------------------------------------------------------------------
+
 void CodeGenerator::InsertArg(const CXXForRangeStmt* rangeForStmt)
 {
     mOutputFormatHelper.OpenScope();
@@ -1070,7 +1079,12 @@ void CodeGenerator::InsertArg(const CXXOperatorCallExpr* stmt)
 
     // operators in a namespace but outside a class so operator goes first
     if(!isCXXMethod) {
-        mOutputFormatHelper.Append(GetName(*callee), "(");
+        if(callee) {
+            mOutputFormatHelper.Append(GetName(*callee), "(");
+        } else {
+            InsertArg(stmt->getCallee()->IgnoreImpCasts());
+            mOutputFormatHelper.Append("(");
+        }
     }
 
     // insert the arguments

CodeGeneratorTypes.h

@@ -96,6 +96,7 @@ SUPPORTED_STMT(CXXScalarValueInitExpr)
 SUPPORTED_STMT(CXXTryStmt)
 SUPPORTED_STMT(CXXCatchStmt)
 SUPPORTED_STMT(CXXThrowExpr)
+SUPPORTED_STMT(CXXDependentScopeMemberExpr)
 
 #undef IGNORED_DECL
 #undef IGNORED_STMT

tests/Issue41.cpp

@@ -0,0 +1,13 @@
+#include <vector>
+#include <algorithm>
+#include <string>
+
+using namespace std;
+
+int main()
+{
+  vector<string> v = { "aaa", "bbb", "ccc" };
+
+  auto it = std::find_if(begin(v), end(v), 
+                         [](const auto & str){ return str == "bbb";} );
+}

tests/Issue41.expect

@@ -0,0 +1,22 @@
+#include <vector>
+#include <algorithm>
+#include <string>
+
+using namespace std;
+
+int main()
+{
+  vector<std::string> v = std::vector<std::basic_string<char>, std::allocator<std::basic_string<char> > >{std::initializer_list<std::basic_string<char> >{std::basic_string<char>("aaa"), std::basic_string<char>("bbb"), std::basic_string<char>("ccc")}};
+
+  class __lambda_12_26
+  {
+    public: inline /*constexpr */ bool operator()(const std::basic_string<char> & str) const
+    {
+      return operator==(str, "bbb");
+    }
+
+  };
+
+  std::__wrap_iter<std::basic_string<char> *> it = std::find_if(std::begin(v), std::end(v), __lambda_12_26{});
+}
+