ext: synced MiniScript

Das-Kollektiv · Dec 19, 2023 · 3e5b618 · 3e5b618
1 parent 2511d95
commit 3e5b618
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/ext/miniscript/src/miniscript/miniscript/Library.cpp b/ext/miniscript/src/miniscript/miniscript/Library.cpp
@@ -10,24 +10,22 @@
 using std::make_unique;
 using std::string;
 
-using miniscript::miniscript::Library;
+using _Context = miniscript::miniscript::Context;
+using _Library = miniscript::miniscript::Library;
+using _Console = miniscript::utilities::Console;
 
-using miniscript::miniscript::Context;
-using miniscript::miniscript::MiniScript;
-using miniscript::utilities::Console;
-
-Library::Library(Context* context) {
+_Library::Library(_Context* context) {
 	this->context = context;
 }
 
-Library::~Library() {
+_Library::~Library() {
 }
 
-MiniScript* Library::loadScript(const string& pathName, const string& fileName) {
-	Console::println("Library::loadScript(): " + pathName + "/" + fileName);
+MiniScript* _Library::loadScript(const string& pathName, const string& fileName, const string& basePathName) {
+	_Console::println("Library::loadScript(): " + pathName + "/" + fileName + (basePathName.empty() == false?"@" + basePathName:""));
 	auto script = make_unique<MiniScript>();
 	script->setContext(context);
 	script->setLibrary(this);
-	script->parseScript(pathName, fileName);
+	script->parseScript((basePathName.empty() == false?basePathName + "/":"") + pathName, fileName);
 	return script.release();
 }
diff --git a/ext/miniscript/src/miniscript/miniscript/NativeLibrary.h b/ext/miniscript/src/miniscript/miniscript/NativeLibrary.h
@@ -25,7 +25,8 @@ class miniscript::miniscript::NativeLibrary: public _Library
 	FORBID_CLASS_COPY(NativeLibrary)
 
 	/**
-	 * Constructor
+	 * Public constructor
+	 * @param context context or nullptr
 	 */
 	NativeLibrary(_Context* context): _Library(context) {
 	}