ext: MiniScript: updated to latest version

Das-Kollektiv · Jan 2, 2024 · fc44b1e · fc44b1e
1 parent c29187d
commit fc44b1e
Show file tree

Hide file tree

Showing 57 changed files with 1,319 additions and 480 deletions.
diff --git a/ext/miniscript/src/miniscript/miniscript/ApplicationMethods.cpp b/ext/miniscript/src/miniscript/miniscript/ApplicationMethods.cpp
@@ -20,6 +20,9 @@ using miniscript::miniscript::MiniScript;
 using _Console = miniscript::utilities::Console;
 using _StringTools = miniscript::utilities::StringTools;
 
+void ApplicationMethods::registerConstants(MiniScript* miniScript) {
+}
+
 const string ApplicationMethods::execute(const string& command) {
 	// see: https://stackoverflow.com/questions/478898/how-to-execute-a-command-and-get-output-of-command-within-c-using-posix
 	array<char, 128> buffer;

diff --git a/ext/miniscript/src/miniscript/miniscript/ApplicationMethods.h b/ext/miniscript/src/miniscript/miniscript/ApplicationMethods.h
@@ -15,6 +15,12 @@ using std::string;
  */
 class miniscript::miniscript::ApplicationMethods {
 public:
+	/**
+	 * Register constants
+	 * @param miniScript miniScript
+	 */
+	static void registerConstants(MiniScript* miniScript);
+
 	/**
 	 * Register methods
 	 * @param miniScript miniScript

diff --git a/ext/miniscript/src/miniscript/miniscript/ArrayMethods.cpp b/ext/miniscript/src/miniscript/miniscript/ArrayMethods.cpp
@@ -13,6 +13,9 @@ using miniscript::miniscript::MiniScript;
 
 using _Console = miniscript::utilities::Console;
 
+void ArrayMethods::registerConstants(MiniScript* miniScript) {
+}
+
 void ArrayMethods::registerMethods(MiniScript* miniScript) {
 	// array methods
 	{

diff --git a/ext/miniscript/src/miniscript/miniscript/ArrayMethods.h b/ext/miniscript/src/miniscript/miniscript/ArrayMethods.h
@@ -11,6 +11,12 @@ using miniscript::miniscript::MiniScript;
  */
 class miniscript::miniscript::ArrayMethods {
 public:
+	/**
+	 * Register constants
+	 * @param miniScript miniScript
+	 */
+	static void registerConstants(MiniScript* miniScript);
+
 	/**
 	 * Register methods
 	 * @param miniScript miniScript

diff --git a/ext/miniscript/src/miniscript/miniscript/BaseMethods.cpp b/ext/miniscript/src/miniscript/miniscript/BaseMethods.cpp
@@ -15,6 +15,9 @@ using miniscript::miniscript::MiniScript;
 using _Console = miniscript::utilities::Console;
 using _Time = miniscript::utilities::Time;
 
+void BaseMethods::registerConstants(MiniScript* miniScript) {
+}
+
 void BaseMethods::registerMethods(MiniScript* miniScript) {
 	// base methods
 	{

diff --git a/ext/miniscript/src/miniscript/miniscript/BaseMethods.h b/ext/miniscript/src/miniscript/miniscript/BaseMethods.h
@@ -11,6 +11,12 @@ using miniscript::miniscript::MiniScript;
  */
 class miniscript::miniscript::BaseMethods {
 public:
+	/**
+	 * Register constants
+	 * @param miniScript miniScript
+	 */
+	static void registerConstants(MiniScript* miniScript);
+
 	/**
 	 * Register methods
 	 * @param miniScript miniScript

diff --git a/ext/miniscript/src/miniscript/miniscript/ByteArrayMethods.cpp b/ext/miniscript/src/miniscript/miniscript/ByteArrayMethods.cpp
@@ -13,6 +13,9 @@ using miniscript::miniscript::MiniScript;
 
 using _Console = miniscript::utilities::Console;
 
+void ByteArrayMethods::registerConstants(MiniScript* miniScript) {
+}
+
 void ByteArrayMethods::registerMethods(MiniScript* miniScript) {
 	// array methods
 	{

diff --git a/ext/miniscript/src/miniscript/miniscript/ByteArrayMethods.h b/ext/miniscript/src/miniscript/miniscript/ByteArrayMethods.h
@@ -11,6 +11,12 @@ using miniscript::miniscript::MiniScript;
  */
 class miniscript::miniscript::ByteArrayMethods {
 public:
+	/**
+	 * Register constants
+	 * @param miniScript miniScript
+	 */
+	static void registerConstants(MiniScript* miniScript);
+
 	/**
 	 * Register methods
 	 * @param miniScript miniScript

diff --git a/ext/miniscript/src/miniscript/miniscript/ConsoleMethods.cpp b/ext/miniscript/src/miniscript/miniscript/ConsoleMethods.cpp
@@ -13,6 +13,9 @@ using miniscript::miniscript::MiniScript;
 
 using _Console = miniscript::utilities::Console;
 
+void ConsoleMethods::registerConstants(MiniScript* miniScript) {
+}
+
 void ConsoleMethods::registerMethods(MiniScript* miniScript) {
 	// console
 	{

diff --git a/ext/miniscript/src/miniscript/miniscript/ConsoleMethods.h b/ext/miniscript/src/miniscript/miniscript/ConsoleMethods.h
@@ -11,6 +11,12 @@ using miniscript::miniscript::MiniScript;
  */
 class miniscript::miniscript::ConsoleMethods {
 public:
+	/**
+	 * Register constants
+	 * @param miniScript miniScript
+	 */
+	static void registerConstants(MiniScript* miniScript);
+
 	/**
 	 * Register methods
 	 * @param miniScript miniScript

diff --git a/ext/miniscript/src/miniscript/miniscript/ContextMethods.cpp b/ext/miniscript/src/miniscript/miniscript/ContextMethods.cpp
@@ -16,6 +16,9 @@ using miniscript::miniscript::MiniScript;
 
 using _Console = miniscript::utilities::Console;
 
+void ContextMethods::registerConstants(MiniScript* miniScript) {
+}
+
 void ContextMethods::registerMethods(MiniScript* miniScript) {
 	if (miniScript->getContext() == nullptr) return;
 	{

diff --git a/ext/miniscript/src/miniscript/miniscript/ContextMethods.h b/ext/miniscript/src/miniscript/miniscript/ContextMethods.h
@@ -11,6 +11,12 @@ using miniscript::miniscript::MiniScript;
  */
 class miniscript::miniscript::ContextMethods {
 public:
+	/**
+	 * Register constants
+	 * @param miniScript miniScript
+	 */
+	static void registerConstants(MiniScript* miniScript);
+
 	/**
 	 * Register methods
 	 * @param miniScript miniScript

diff --git a/ext/miniscript/src/miniscript/miniscript/CryptographyMethods.cpp b/ext/miniscript/src/miniscript/miniscript/CryptographyMethods.cpp
@@ -19,6 +19,9 @@ using _Console = miniscript::utilities::Console;
 using _SHA256 = miniscript::utilities::SHA256;
 using _StringTools = miniscript::utilities::StringTools;
 
+void CryptographyMethods::registerConstants(MiniScript* miniScript) {
+}
+
 void CryptographyMethods::registerMethods(MiniScript* miniScript) {
 	// base64
 	{

diff --git a/ext/miniscript/src/miniscript/miniscript/CryptographyMethods.h b/ext/miniscript/src/miniscript/miniscript/CryptographyMethods.h
@@ -11,6 +11,12 @@ using miniscript::miniscript::MiniScript;
  */
 class miniscript::miniscript::CryptographyMethods {
 public:
+	/**
+	 * Register constants
+	 * @param miniScript miniScript
+	 */
+	static void registerConstants(MiniScript* miniScript);
+
 	/**
 	 * Register methods
 	 * @param miniScript miniScript

diff --git a/ext/miniscript/src/miniscript/miniscript/Documentation.cpp b/ext/miniscript/src/miniscript/miniscript/Documentation.cpp
@@ -279,10 +279,41 @@ const string Documentation::generateOperatorsDocumentation(
 	//
 	string result;
 	result+= string() + "\n";
-	result+= string() + "# 10. Operators" + "\n";
+	result+= string() + "# " + to_string(mainHeadingIdx) + ". " + heading + "\n";
 	result+= string() + "\n";
 	result+= string() + "| Op | Method                                                                                      |" + "\n";
 	result+= string() + "|----|---------------------------------------------------------------------------------------------|" + "\n";
 	for (const auto& method: operators) result+= string() + method + "\n";
 	return result;
 }
+
+const string Documentation::generateVariablesDocumentation(
+	const string& heading,
+	int mainHeadingIdx,
+	MiniScript* miniScript
+) {
+	//
+	vector<string> variables;
+	for (const auto& [variableName, variable]: miniScript->getRootScriptState().variables) {
+		string variableString;
+		variableString = "| ";
+		variableString+= variableName;
+		while (variableString.size() < 62) variableString+= " ";
+		variableString+= "| ";
+		auto idx = variableString.size();
+		variableString+= variable->getValueAsString();
+		while (variableString.size() - idx < 35) variableString+= " ";
+		variableString+= "|";
+		variables.push_back(variableString);
+	}
+	sort(variables.begin(), variables.end());
+	//
+	string result;
+	result+= string() + "\n";
+	result+= string() + "# " + to_string(mainHeadingIdx) + ". " + heading + "\n";
+	result+= string() + "\n";
+	result+= string() + "| Name                                                        | Value                              |" + "\n";
+	result+= string() + "|-------------------------------------------------------------|------------------------------------|" + "\n";
+	for (const auto& method: variables) result+= string() + method + "\n";
+	return result;
+}
diff --git a/ext/miniscript/src/miniscript/miniscript/Documentation.h b/ext/miniscript/src/miniscript/miniscript/Documentation.h
@@ -91,4 +91,18 @@ class miniscript::miniscript::Documentation {
 		int mainHeadingIdx,
 		MiniScript* miniScript
 	);
+
+	/**
+	 * Generate variables documentation
+	 * @param heading heading
+	 * @param mainHeadingIdx main heading index
+	 * @param miniScript MiniScript script instance
+	 * @return documentation
+	 */
+	static const string generateVariablesDocumentation(
+		const string& heading,
+		int mainHeadingIdx,
+		MiniScript* miniScript
+	);
+
 };
diff --git a/ext/miniscript/src/miniscript/miniscript/FileSystemMethods.cpp b/ext/miniscript/src/miniscript/miniscript/FileSystemMethods.cpp
@@ -19,6 +19,9 @@ using _Console = miniscript::utilities::Console;
 using _Exception = miniscript::utilities::Exception;
 using _ExceptionBase = miniscript::utilities::ExceptionBase;
 
+void FileSystemMethods::registerConstants(MiniScript* miniScript) {
+}
+
 void FileSystemMethods::registerMethods(MiniScript* miniScript) {
 	// file system methods
 	{

diff --git a/ext/miniscript/src/miniscript/miniscript/FileSystemMethods.h b/ext/miniscript/src/miniscript/miniscript/FileSystemMethods.h
@@ -11,6 +11,12 @@ using miniscript::miniscript::MiniScript;
  */
 class miniscript::miniscript::FileSystemMethods {
 public:
+	/**
+	 * Register constants
+	 * @param miniScript miniScript
+	 */
+	static void registerConstants(MiniScript* miniScript);
+
 	/**
 	 * Register methods
 	 * @param miniScript miniScript

diff --git a/ext/miniscript/src/miniscript/miniscript/JSONMethods.cpp b/ext/miniscript/src/miniscript/miniscript/JSONMethods.cpp
@@ -15,6 +15,9 @@ using miniscript::miniscript::MiniScript;
 using _Console = miniscript::utilities::Console;
 using _StringTools = miniscript::utilities::StringTools;
 
+void JSONMethods::registerConstants(MiniScript* miniScript) {
+}
+
 void JSONMethods::registerMethods(MiniScript* miniScript) {
 	// json
 	{

diff --git a/ext/miniscript/src/miniscript/miniscript/JSONMethods.h b/ext/miniscript/src/miniscript/miniscript/JSONMethods.h
@@ -11,6 +11,12 @@ using miniscript::miniscript::MiniScript;
  */
 class miniscript::miniscript::JSONMethods {
 public:
+	/**
+	 * Register constants
+	 * @param miniScript miniScript
+	 */
+	static void registerConstants(MiniScript* miniScript);
+
 	/**
 	 * Register methods
 	 * @param miniScript miniScript

diff --git a/ext/miniscript/src/miniscript/miniscript/MapMethods.cpp b/ext/miniscript/src/miniscript/miniscript/MapMethods.cpp
@@ -13,6 +13,9 @@ using miniscript::miniscript::MiniScript;
 
 using _Console = miniscript::utilities::Console;
 
+void MapMethods::registerConstants(MiniScript* miniScript) {
+}
+
 void MapMethods::registerMethods(MiniScript* miniScript) {
 	// map
 	{

diff --git a/ext/miniscript/src/miniscript/miniscript/MapMethods.h b/ext/miniscript/src/miniscript/miniscript/MapMethods.h
@@ -11,6 +11,12 @@ using miniscript::miniscript::MiniScript;
  */
 class miniscript::miniscript::MapMethods {
 public:
+	/**
+	 * Register constants
+	 * @param miniScript miniScript
+	 */
+	static void registerConstants(MiniScript* miniScript);
+
 	/**
 	 * Register methods
 	 * @param miniScript miniScript

diff --git a/ext/miniscript/src/miniscript/miniscript/MathMethods.cpp b/ext/miniscript/src/miniscript/miniscript/MathMethods.cpp
@@ -19,6 +19,9 @@ void MathMethods::registerDataType(MiniScript::DataType* dataType) {
 	dataTypes.push_back(dataType);
 }
 
+void MathMethods::registerConstants() {
+}
+
 void MathMethods::registerMethods() {
 	// operator methods
 	{

diff --git a/ext/miniscript/src/miniscript/miniscript/MathMethods.h b/ext/miniscript/src/miniscript/miniscript/MathMethods.h
@@ -27,6 +27,11 @@ class miniscript::miniscript::MathMethods {
 	 */
 	void registerDataType(MiniScript::DataType* dataType);
 
+	/**
+	 * Register constants
+	 */
+	void registerConstants();
+
 	/**
 	 * Register methods
 	 */