refactor: better name & move func up hierarchy

Samat Gaynutdinov · Samat Gaynutdinov · commit b7485cd1f93c · 2022-06-22T02:33:05.000+03:00
diff --git a/server/src/printers/DefaultMakefilePrinter.cpp b/server/src/printers/DefaultMakefilePrinter.cpp
@@ -24,6 +24,14 @@ void DefaultMakefilePrinter::declareVariableIfNotDefined(std::string const &vari
     ss << "endif\n";
 }
 
+void DefaultMakefilePrinter::declareVariableWithPriority(std::string const &variableName,
+                                                        std::string const &variablePath) {
+    ss << stringFormat("ifneq (\"$(wildcard %s)\",\"\")\n", variablePath);
+    ss << TAB;
+    declareVariable(variableName, variablePath);
+    ss << "endif\n";
+}
+
 void DefaultMakefilePrinter::declareAction(const std::string &name) {
     ss << name << "\n";
 }
diff --git a/server/src/printers/DefaultMakefilePrinter.h b/server/src/printers/DefaultMakefilePrinter.h
@@ -21,6 +21,8 @@ class DefaultMakefilePrinter : public Printer {
 
     void declareVariableIfNotDefined(std::string const &variableName, std::string const &ifNotDefinedValue);
 
+    void declareVariableWithPriority(std::string const &variableName, std::string const &variablePath);
+
     template<class ContainerD = std::initializer_list<std::string>,
             class ContainerA = std::initializer_list<std::string>>
     void declareTarget(std::string const &name,
diff --git a/server/src/printers/NativeMakefilePrinter.cpp b/server/src/printers/NativeMakefilePrinter.cpp
@@ -716,23 +716,15 @@ namespace printer {
     }
 
     void NativeMakefilePrinter::declareShellVariable(const std::string& variableName, fs::path path,
-                              std::function<void(const std::string&, const std::string&)> declareFunc,
+                              std::function<void(const std::string&, const std::string&)> shellVariableDeclarationFunction,
                               bool shouldWriteToMap, bool isCanonical) {
         const fs::path relativePath = getRelativePath(path, isCanonical);
         if (isCanonical) {
             path = fs::weakly_canonical(path);
         }
-        declareFunc(variableName, relativePath.string());
+        shellVariableDeclarationFunction(variableName, relativePath.string());
         if (shouldWriteToMap) {
             pathToShellVariable[path] = StringUtils::stringFormat("$(%s)", variableName);
         }
     }
-
-    void NativeMakefilePrinter::declareVariableWithPriority(std::string const &variableName,
-                                                            std::string const &variablePath) {
-        ss << stringFormat("ifneq (\"$(wildcard %s)\",\"\")\n", variablePath);
-        ss << TAB;
-        declareVariable(variableName, variablePath);
-        ss << "endif\n";
-    }
 }
diff --git a/server/src/printers/NativeMakefilePrinter.h b/server/src/printers/NativeMakefilePrinter.h
@@ -70,12 +70,9 @@ namespace printer {
                                              bool transformExeToLib);
 
         void declareShellVariable(const std::string& variableName, fs::path path,
-                                  std::function<void(const std::string&, const std::string&)> declareFunc,
+                                  std::function<void(const std::string&, const std::string&)> shellVariableDeclarationFunction,
                                   bool shouldWriteToMap = true, bool isCanonical = true);
 
-        void declareVariableWithPriority(std::string const &variableName,
-                                         std::string const &variablePath);
-
         fs::path getRelativePath(fs::path source, bool isCanonical) const;
 
     public:

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,14 @@ void DefaultMakefilePrinter::declareVariableIfNotDefined(std::string const &vari`
`24`	`24`	`ss << "endif\n";`
`25`	`25`	`}`
`26`	`26`
	`27`	`+void DefaultMakefilePrinter::declareVariableWithPriority(std::string const &variableName,`
	`28`	`+ std::string const &variablePath) {`
	`29`	`+ ss << stringFormat("ifneq (\"$(wildcard %s)\",\"\")\n", variablePath);`
	`30`	`+ ss << TAB;`
	`31`	`+ declareVariable(variableName, variablePath);`
	`32`	`+ ss << "endif\n";`
	`33`	`+}`
	`34`	`+`
`27`	`35`	`void DefaultMakefilePrinter::declareAction(const std::string &name) {`
`28`	`36`	`ss << name << "\n";`
`29`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -716,23 +716,15 @@ namespace printer {`
`716`	`716`	`}`
`717`	`717`
`718`	`718`	`void NativeMakefilePrinter::declareShellVariable(const std::string& variableName, fs::path path,`
`719`		`- std::function<void(const std::string&, const std::string&)> declareFunc,`
	`719`	`+ std::function<void(const std::string&, const std::string&)> shellVariableDeclarationFunction,`
`720`	`720`	`bool shouldWriteToMap, bool isCanonical) {`
`721`	`721`	`const fs::path relativePath = getRelativePath(path, isCanonical);`
`722`	`722`	`if (isCanonical) {`
`723`	`723`	`path = fs::weakly_canonical(path);`
`724`	`724`	`}`
`725`		`- declareFunc(variableName, relativePath.string());`
	`725`	`+ shellVariableDeclarationFunction(variableName, relativePath.string());`
`726`	`726`	`if (shouldWriteToMap) {`
`727`	`727`	`pathToShellVariable[path] = StringUtils::stringFormat("$(%s)", variableName);`
`728`	`728`	`}`
`729`	`729`	`}`
`730`		`-`
`731`		`- void NativeMakefilePrinter::declareVariableWithPriority(std::string const &variableName,`
`732`		`- std::string const &variablePath) {`
`733`		`- ss << stringFormat("ifneq (\"$(wildcard %s)\",\"\")\n", variablePath);`
`734`		`- ss << TAB;`
`735`		`- declareVariable(variableName, variablePath);`
`736`		`- ss << "endif\n";`
`737`		`- }`
`738`	`730`	`}`