better paths operations, simplified example

Author: AndrewShpagin

CppAsScript.cpp

@@ -4,32 +4,28 @@
 
 int main()
 {
-	cppProject PR;
-	std::string download = PR.checkIfCompilerInstalled();
+	cppProject project;
+	std::string download = project.checkIfCompilerInstalled();
 	if(download.length()) {
 		std::cout << "LLVM-CL not installed, please download and install at:\n" << download << "\n";
 		return 1;
 	}
-	/// the path to project, we walk up because thet exe placed somehere deeply
-	std::filesystem::path cur = std::filesystem::current_path().parent_path().parent_path().parent_path();
+	/// Set searh paths for files if they passed in relative form
+	///	3 means that we add current folder of exe file and 3 parent folders
+	///	this is done because exe is usually deeply inside projects folder
+	project.addSearhPath(std::filesystem::current_path(), 3);
 
-	/// the path to the file to be compiled and executed
-	std::filesystem::path test = cur;
-	test.append("test/test.cpp");
-
-	/// the path to API reference include folder
-	std::filesystem::path inc = cur;
-	inc.append("api_test/");
-
-	/// set project settings, pass the file to execute
-	PR.addFile(test.string()).addIncludeFolder(inc.string()).debug();
+	/// addFile adds the path to the file to be compiled and executed
+	///	addIncludeFolder adds the path to API reference include folder
+	///	debug states that debug config compiled, PDB file will be compiled as well
+	project.addFile("test/test.cpp").addIncludeFolder("api_test/").debug();
 
 	/// find and execute the main
-	auto f = PR.bind<void()>("main");
+	auto f = project.bind<void()>("main");
 	if (f)f();
 
 	/// find and execute the test123
-	auto f1 = PR.bind<void(int)>("test123");
+	auto f1 = project.bind<void(int)>("test123");
 	if (f1)f1(23);
 
 	return 0;

cppAsScript.h

@@ -16,6 +16,7 @@ class cppBuilder;
 class cppProject {
 protected:
 	std::vector<std::string> files;
+	std::vector<std::filesystem::path> paths;
 	std::string modulePath;
 	std::string log;
 	std::string _options;
@@ -28,6 +29,21 @@ class cppProject {
 	cppProject();
 	virtual ~cppProject();
 
+
+	/**
+	 * \brief Add the path where we seek for files if the relative path passed
+	 * \param path the absolute path
+	 * \param parent_depth we add the path, then add parent path and so on, repeat this parent_depth count. It is useful if executable nested somewhere deeply into project folder
+	 */
+	void addSearhPath(const std::filesystem::path& path, int parent_depth = 0);
+
+	/**
+	 * \brief determines if path is local and tries to find the file in any folder defined previously with addSearhPath
+	 * \param path relative or absolute path 
+	 * \return the file path if the file exists, empty path othervice 
+	 */
+	std::filesystem::path findFile(const std::string& path);
+
 	/// Compile the project (if need).
 	void recompileIfNeed();
 
@@ -41,7 +57,7 @@ class cppProject {
 	cppProject& addIncludeFolder(const std::string& path);
 
 	/// Add the text of cpp file to be compiled into the project
-	cppProject& addSource(const char* cpp_text);
+	cppProject& addSource(const std::string& cpp_text);
 
 	/// Compile (in future) with the speed optimization
 	cppProject& speedOptimization();
@@ -60,7 +76,7 @@ class cppProject {
 
 	/// Pass the function name and get the function tat may be called later (till the project is loaded).
 	template <class F>
-	std::function<F> bind(const char* functionName);
+	std::function<F> bind(const std::string& functionName);
 
 	/// returns the compile log
 	std::string& compileLog();
@@ -79,13 +95,13 @@ class cppProject {
 };
 
 template <class F>
-std::function<F> cppProject::bind(const char* functionName) {
+std::function<F> cppProject::bind(const std::string& functionName) {
 	std::function<F> f1 = nullptr;
 	if (!ref) {
 		recompileIfNeed();
 	}
 	if (ref) {
-		f1 = static_cast<F*>(ref->raw_ptr(functionName));
+		f1 = static_cast<F*>(ref->raw_ptr(functionName.c_str()));
 	}
 	return f1;
 }
@@ -288,6 +304,28 @@ inline cppProject::~cppProject() {
 	ref = nullptr;
 }
 
+inline void cppProject::addSearhPath(const std::filesystem::path& path, int parent_depth) {
+	paths.push_back(path);
+	if(parent_depth && path.has_parent_path()) {
+		addSearhPath(path.parent_path(), parent_depth - 1);
+	}
+}
+
+inline std::filesystem::path cppProject::findFile(const std::string& path) {
+	std::filesystem::path p = path;
+	if(p.is_absolute()) {
+		if (exists(p))return p;
+	} else {
+		for(auto p:paths) {
+			auto pt = p;
+			pt.append(path);
+			if (exists(pt))return pt;
+		}
+	}
+	p.clear();
+	return p;
+}
+
 inline bool cppProject::valid() {
 	return ref != nullptr;
 }
@@ -313,16 +351,18 @@ inline std::string& cppProject::includes() {
 }
 
 inline cppProject& cppProject::addFile(const std::string& path) {
-	filesList().push_back(path);
+	auto fpath = findFile(path);
+	if (!is_empty(fpath))filesList().push_back(fpath.string());
 	return *this;
 }
 
 inline cppProject& cppProject::addIncludeFolder(const std::string& path) {
-	includes() += " /I " + path;
+	auto fpath = findFile(path);
+	if(exists(fpath)) includes() += std::string(" /I ") + "\"" + path + "\"";
 	return *this;
 }
 
-inline cppProject& cppProject::addSource(const char* cpp_text) {
+inline cppProject& cppProject::addSource(const std::string& cpp_text) {
 	std::string fn = "temp_" + md5::hash(cpp_text) + ".cpp";
 	std::string res = builder->pathInHeap(fn);
 	std::ofstream f(res);