Renamed lookupStringTemplateVariable() to lookupStringVariable().

Renamed `lookupStreamTemplateVariable()` to `lookupStreamVariable()`.

Author: end2endzone

src/bin2cpp/BaseGenerator.cpp

@@ -56,7 +56,7 @@ namespace bin2cpp
     return mContext;
   }
 
-  bool BaseGenerator::lookupStringTemplateVariable(const std::string& name, std::string& output)
+  bool BaseGenerator::lookupStringVariable(const std::string& name, std::string& output)
   {
     if ( name == "bin2cpp_output_file_macro_guard" ) { output = getCppIncludeGuardMacroName(mContext.headerFilename); return true; }
     if ( name == "bin2cpp_output_file_header" ) { output = getHeaderTemplate(); return true; }
@@ -109,7 +109,7 @@ namespace bin2cpp
     return false;
   }
 
-  bool BaseGenerator::lookupStreamTemplateVariable(const std::string& name, std::ostream& output)
+  bool BaseGenerator::lookupStreamVariable(const std::string& name, std::ostream& output)
   {
     if ( name == "bin2cpp_insert_input_file_as_code" )
     {

src/bin2cpp/BaseGenerator.h

@@ -45,8 +45,8 @@ namespace bin2cpp
     virtual const Context & getContext() const;
 
     //ITemplateVariableLookup methods
-    virtual bool lookupStringTemplateVariable(const std::string& name, std::string& output);
-    virtual bool lookupStreamTemplateVariable(const std::string& name, std::ostream& output);
+    virtual bool lookupStringVariable(const std::string& name, std::string& output);
+    virtual bool lookupStreamVariable(const std::string& name, std::ostream& output);
 
     //same header file for all generators
     virtual bool createCppHeaderFile(const char * header_file_path);

src/bin2cpp/ITemplateVariableLookup.h

@@ -44,7 +44,7 @@ namespace bin2cpp
     ///<param name="name">The name of the template variable.</param>
     ///<param name="output">The output string for getting the value or the template variable.</param>
     ///<return>Returns true when the template variable is handled by the instance. Returns false otherwise.<return>
-    virtual bool lookupStringTemplateVariable(const std::string& name, std::string& output) = 0;
+    virtual bool lookupStringVariable(const std::string& name, std::string& output) = 0;
 
     ///<summary>
     ///Lookup the string value for a given template variable name.
@@ -54,7 +54,7 @@ namespace bin2cpp
     ///<param name="name">The name of the template variable.</param>
     ///<param name="output">The output string for getting the value or the template variable.</param>
     ///<return>Returns true when the template variable is handled by the instance. Returns false otherwise.<return>
-    virtual bool lookupStreamTemplateVariable(const std::string& name, std::ostream& output) = 0;
+    virtual bool lookupStreamVariable(const std::string& name, std::ostream& output) = 0;
 
   };
 

src/bin2cpp/TemplateProcessor.cpp

@@ -126,7 +126,7 @@ namespace bin2cpp
 
           // Check if template variable is a string and do the variable expansion
           std::string expanded_value;
-          bool found_as_string = mVariableLookup->lookupStringTemplateVariable(variable_name, expanded_value);
+          bool found_as_string = mVariableLookup->lookupStringVariable(variable_name, expanded_value);
 
           // Proceed with the recursive handling
           if ( found_as_string )
@@ -144,7 +144,7 @@ namespace bin2cpp
           {
             // Check if template variable is a stream
             // Stream based template variables do not support recursive lookup and tracking
-            bool found_as_stream = mVariableLookup->lookupStreamTemplateVariable(variable_name, output_stream);
+            bool found_as_stream = mVariableLookup->lookupStreamVariable(variable_name, output_stream);
           }
 
           pos = end_pos + 1;

src/bin2cpp/Win32ResourceGenerator.cpp

@@ -376,13 +376,13 @@ namespace bin2cpp
     return false; // not supported
   }
 
-  bool Win32ResourceGenerator::lookupStringTemplateVariable(const std::string& name, std::string& output)
+  bool Win32ResourceGenerator::lookupStringVariable(const std::string& name, std::string& output)
   {
     if ( name == "bin2cpp_win32_resource_random_identifier" ) { output = getRandomIdentifier(mContext.inputFilePath.c_str()); return true; }
     if ( name == "bin2cpp_win32_local_info_struct_name" ) { output = getLocalInfoStructName(); return true; }
 
     // Unknown name
-    return this->BaseGenerator::lookupStringTemplateVariable(name, output);
+    return this->BaseGenerator::lookupStringVariable(name, output);
   }
 
   std::string Win32ResourceGenerator::getLocalInfoStructName()

src/bin2cpp/Win32ResourceGenerator.h

@@ -44,7 +44,7 @@ namespace bin2cpp
     virtual bool printFileContent();
 
     //ITemplateVariableLookup methods
-    virtual bool lookupStringTemplateVariable(const std::string& name, std::string& output);
+    virtual bool lookupStringVariable(const std::string& name, std::string& output);
 
   protected:
     virtual std::string getResourceFilePath(const char * file_path);

test/bin2cpp_unittest/TestTemplateProcessor.cpp

@@ -35,7 +35,7 @@
 class SampleVariableLookup : public bin2cpp::ITemplateVariableLookup
 {
 public:
-  bool lookupStringTemplateVariable(const std::string& name, std::string& output) override
+  bool lookupStringVariable(const std::string& name, std::string& output) override
   {
     if ( name == "first-name" ) { output =  "Luke"; return true; }
     if ( name == "last-name" ) { output =  "Skywalker"; return true; }
@@ -49,7 +49,7 @@ class SampleVariableLookup : public bin2cpp::ITemplateVariableLookup
     return false;
   }
 
-  bool lookupStreamTemplateVariable(const std::string& name, std::ostream& output) override
+  bool lookupStreamVariable(const std::string& name, std::ostream& output) override
   {
     return false;
   }