Don't copy __FILE__ string when unnecessary

This reduces the amount of dynamic allocations done before main() runs.
And as a result also the amount of false positives from rudimentary
memory leak detectors (malloc/free counters that use atexit() as the
moment where all memory should be freed again).

Author: muggenhor

include/cucumber-cpp/internal/CukeEngine.hpp

@@ -20,9 +20,13 @@ class CUCUMBER_CPP_EXPORT StepMatchArg {
 
 class CUCUMBER_CPP_EXPORT StepMatch {
 public:
+    StepMatch()
+      : source() // Explicitly calling the default constructor, will zero-init for POD types
+    {}
+
     std::string id;
     std::vector<StepMatchArg> args;
-    std::string source;
+    const char* source;
     std::string regexp;
 };
 

include/cucumber-cpp/internal/step/StepMacros.hpp

@@ -25,9 +25,14 @@ CUKE_OBJECT_(                                               \
 )                                                           \
 /**/
 
+#define CUKE_STRINGIFY_BASE_(x) #x
+#define CUKE_STRINGIFY_(x) CUKE_STRINGIFY_BASE_(x)
+#define CUKE_AT_ __FILE__ ":" CUKE_STRINGIFY_(__LINE__)
+/**/
+
 #define CUKE_STEP_REGISTRATION_(step_name, step_matcher) \
 ::cucumber::internal::registerStep< step_name >(         \
-    step_matcher, __FILE__, __LINE__                     \
+    step_matcher, CUKE_AT_                               \
 )                                                        \
 /**/
 

include/cucumber-cpp/internal/step/StepManager.hpp

@@ -1,6 +1,7 @@
 #ifndef CUKE_STEPMANAGER_HPP_
 #define CUKE_STEPMANAGER_HPP_
 
+#include <cstring>
 #include <map>
 #include <sstream>
 #include <stdexcept>
@@ -101,13 +102,13 @@ class CUCUMBER_CPP_EXPORT InvokeResult {
 
 class CUCUMBER_CPP_EXPORT StepInfo : public boost::enable_shared_from_this<StepInfo> {
 public:
-    StepInfo(const std::string &stepMatcher, const std::string source);
+    StepInfo(const std::string &stepMatcher, const char* const source);
     SingleStepMatch matches(const std::string &stepDescription) const;
     virtual InvokeResult invokeStep(const InvokeArgs * pArgs) const = 0;
 
     step_id_type id;
     Regex regex;
-    const std::string source;
+    const char* const source;
 private:
     // Shut up MSVC warning C4512: assignment operator could not be generated
     StepInfo& operator=(const StepInfo& other);
@@ -166,7 +167,7 @@ class CUCUMBER_CPP_EXPORT BasicStep {
 template<class T>
 class StepInvoker : public StepInfo {
 public:
-    StepInvoker(const std::string &stepMatcher, const std::string source);
+    StepInvoker(const std::string &stepMatcher, const char* const source);
 
     InvokeResult invokeStep(const InvokeArgs *args) const;
 };
@@ -192,23 +193,27 @@ class CUCUMBER_CPP_EXPORT StepManager {
 };
 
 
-static inline std::string toSourceString(const char *filePath, const int line) {
-    using namespace std;
-    stringstream s;
-    string file(filePath);
-    string::size_type pos = file.find_last_of("/\\");
-    if (pos == string::npos) {
-        s << file;
+static inline const char* toSourceString(const char* const fileLocation) {
+    using std::strrchr;
+    const char* pos = strrchr(fileLocation, '/');
+    if (pos == NULL) {
+        pos = strrchr(fileLocation, '\\');
     } else {
-       s << file.substr(++pos);
+        const char* maybeNewPos = strrchr(pos, '\\');
+        if (maybeNewPos != NULL) {
+            pos = maybeNewPos;
+        }
+    }
+    if (pos == NULL) {
+        return fileLocation;
+    } else {
+        return pos + 1;
     }
-    s << ":" << line;
-    return s.str();
 }
 
 template<class T>
-static int registerStep(const std::string &stepMatcher, const char *file, const int line) {
-   return StepManager::addStep(boost::make_shared< StepInvoker<T> >(stepMatcher, toSourceString(file, line)));
+static int registerStep(const std::string &stepMatcher, const char* const fileLocation) {
+   return StepManager::addStep(boost::make_shared< StepInvoker<T> >(stepMatcher, toSourceString(fileLocation)));
 }
 
 template<typename T>
@@ -251,7 +256,7 @@ const T BasicStep::getInvokeArg() {
 
 
 template<class T>
-StepInvoker<T>::StepInvoker(const std::string &stepMatcher, const std::string source) :
+StepInvoker<T>::StepInvoker(const std::string &stepMatcher, const char* const source) :
     StepInfo(stepMatcher, source) {
 }
 

src/StepManager.cpp

@@ -4,7 +4,7 @@ namespace cucumber {
 namespace internal {
 
 
-StepInfo::StepInfo(const std::string &stepMatcher, const std::string source) :
+StepInfo::StepInfo(const std::string &stepMatcher, const char* const source) :
     regex(stepMatcher),
     source(source) {
     static step_id_type currentId = 0;

src/connectors/wire/WireProtocol.cpp

@@ -272,8 +272,8 @@ namespace {
                     jsonArgs.push_back(jsonMa);
                 }
                 jsonM["args"] = jsonArgs;
-                if (!m.source.empty()) {
-                    jsonM["source"] = m.source;;
+                if (m.source && strlen(m.source) > 0) {
+                    jsonM["source"] = m.source;
                 }
                 if (!m.regexp.empty()) {
                     jsonM["regexp"] = m.regexp;

tests/integration/StepRegistrationTest.cpp

@@ -14,13 +14,13 @@ class ManualStep : public GenericStep {
 //private:
     static const int cukeRegId;
 };
-const int ManualStep::cukeRegId = ::cucumber::internal::registerStep<ManualStep>(MANUAL_STEP_MATCHER, "C:\\Path\\With/Barward/And\\Forward/Slashes.cpp", 42);
+const int ManualStep::cukeRegId = ::cucumber::internal::registerStep<ManualStep>(MANUAL_STEP_MATCHER, "C:\\Path\\With/Barward/And\\Forward/Slashes.cpp:42");
 
 TEST(StepRegistrationTest, manualRegistration) {
     // static_cast is necessary for GTest <= 1.7 and C++ >= 2011 because it
     // doesn't support contextually-convertible-to-bool
     EXPECT_TRUE(static_cast<bool>(StepManager::stepMatches(MANUAL_STEP_MATCHER)));
-    EXPECT_EQ("Slashes.cpp:42", StepManager::getStep(ManualStep::cukeRegId)->source);
+    EXPECT_STREQ("Slashes.cpp:42", StepManager::getStep(ManualStep::cukeRegId)->source);
 }
 
 #define GIVEN_MATCHER "given matcher"

tests/utils/StepManagerTestDouble.hpp

@@ -9,7 +9,7 @@ namespace internal {
 
 class StepInfoNoOp : public StepInfo {
 public:
-    StepInfoNoOp(const std::string &stepMatcher, const std::string source) : StepInfo(stepMatcher, source) {}
+    StepInfoNoOp(const std::string &stepMatcher, const char* const source) : StepInfo(stepMatcher, source) {}
     InvokeResult invokeStep(const InvokeArgs*) const {
         return InvokeResult::success();
     }
@@ -69,7 +69,7 @@ class StepManagerTestDouble : public StepManager {
     }
 
     static step_id_type addStepDefinitionWithId(step_id_type desiredId, const std::string &stepMatcher,
-            const std::string source) {
+            const char* const source) {
         boost::shared_ptr<StepInfo> stepInfo(boost::make_shared<StepInfoNoOp>(stepMatcher, source));
         stepInfo->id = desiredId;
         return addStep(stepInfo);