Updated the Builder build system to use StorableCallback instead of std::function.

Author: Dawoodoz

Source/tools/builder/code/Machine.cpp

@@ -166,7 +166,7 @@ static bool validIdentifier(const dsr::ReadableString &identifier) {
 	return true;
 }
 
-using NameFilter = std::function<bool(const ReadableString &filename)>;
+using NameFilter = StorableCallback<bool(const ReadableString &filename)>;
 static NameFilter generateFilterFromPattern(const dsr::ReadableString &pattern) {
 	int64_t firstStar = string_findFirst(pattern, U'*');
 	int64_t lastStar = string_findLast(pattern, U'*');
@@ -198,7 +198,7 @@ static NameFilter generateFilterFromPattern(const dsr::ReadableString &pattern)
 	}
 }
 
-static void findFiles(const dsr::ReadableString &inPath, NameFilter filter, std::function<void(const ReadableString &path)> action) {
+static void findFiles(const dsr::ReadableString &inPath, NameFilter filter, StorableCallback<void(const ReadableString &path)> action) {
 	if (!file_getFolderContent(inPath, [&filter, &action](const ReadableString& entryPath, const ReadableString& entryName, EntryType entryType) {
 		if (entryType == EntryType::File) {
 			if (filter(entryName)) {

Source/tools/builder/code/expression.cpp

@@ -7,11 +7,11 @@ using namespace dsr;
 POIndex::POIndex() {}
 POIndex::POIndex(int16_t precedenceIndex, int16_t operationIndex) : precedenceIndex(precedenceIndex), operationIndex(operationIndex) {}
 
-Operation::Operation(int16_t symbolIndex, std::function<String(ReadableString, ReadableString)> action)
+Operation::Operation(int16_t symbolIndex, StorableCallback<String(ReadableString, ReadableString)> action)
 : symbolIndex(symbolIndex), action(action) {
 }
 
-static int16_t addOperation(ExpressionSyntax &targetSyntax, int16_t symbolIndex, std::function<String(ReadableString, ReadableString)> action) {
+static int16_t addOperation(ExpressionSyntax &targetSyntax, int16_t symbolIndex, StorableCallback<String(ReadableString, ReadableString)> action) {
 	int16_t precedenceIndex = targetSyntax.precedences.length() - 1;
 	int16_t operationIndex = targetSyntax.precedences.last().operations.length();
 	// TODO: Only allow assigning a symbol once per prefix, infix and postfix.
@@ -286,7 +286,7 @@ static bool validRightmostToken(int16_t symbolIndex, const ExpressionSyntax &syn
 
 // info is a list of additional information starting with info[0] at tokens[startTokenIndex]
 // infoStart is the startTokenIndex of the root evaluation call
-static String expression_evaluate_helper(const List<TokenInfo> &info, int64_t infoStart, int64_t currentDepth, const List<String> &tokens, int64_t startTokenIndex, int64_t endTokenIndex, const ExpressionSyntax &syntax, std::function<String(ReadableString)> identifierEvaluation) {
+static String expression_evaluate_helper(const List<TokenInfo> &info, int64_t infoStart, int64_t currentDepth, const List<String> &tokens, int64_t startTokenIndex, int64_t endTokenIndex, const ExpressionSyntax &syntax, StorableCallback<String(ReadableString)> identifierEvaluation) {
 	//printText(U"Evaluate: ", debugTokens(info, infoStart, tokens, startTokenIndex, endTokenIndex), U"\n");
 	if (startTokenIndex == endTokenIndex) {
 		ReadableString first = expression_getToken(tokens, startTokenIndex, U"");
@@ -382,7 +382,7 @@ static String expression_evaluate_helper(const List<TokenInfo> &info, int64_t in
 	return U"<ERROR:Invalid expression>";
 }
 
-String expression_evaluate(const List<String> &tokens, int64_t startTokenIndex, int64_t endTokenIndex, const ExpressionSyntax &syntax, std::function<String(ReadableString)> identifierEvaluation) {
+String expression_evaluate(const List<String> &tokens, int64_t startTokenIndex, int64_t endTokenIndex, const ExpressionSyntax &syntax, StorableCallback<String(ReadableString)> identifierEvaluation) {
 	// Scan the whole expression once in the beginning and write useful information into a separate list.
 	//   This allow handling tokens as plain lists of strings while still being able to number what they are.
 	int32_t depth = 0;
@@ -404,11 +404,11 @@ String expression_evaluate(const List<String> &tokens, int64_t startTokenIndex,
 	return expression_evaluate_helper(info, startTokenIndex, 0, tokens, startTokenIndex, endTokenIndex, syntax, identifierEvaluation);
 }
 
-String expression_evaluate(const List<String> &tokens, int64_t startTokenIndex, int64_t endTokenIndex, std::function<String(ReadableString)> identifierEvaluation) {
+String expression_evaluate(const List<String> &tokens, int64_t startTokenIndex, int64_t endTokenIndex, StorableCallback<String(ReadableString)> identifierEvaluation) {
 	return expression_evaluate(tokens, startTokenIndex, endTokenIndex, defaultSyntax, identifierEvaluation);
 }
 
-String expression_evaluate(const List<String> &tokens, std::function<String(ReadableString)> identifierEvaluation) {
+String expression_evaluate(const List<String> &tokens, StorableCallback<String(ReadableString)> identifierEvaluation) {
 	return expression_evaluate(tokens, 0, tokens.length() - 1, defaultSyntax, identifierEvaluation);
 }
 
@@ -533,7 +533,7 @@ static void expectResult(int64_t &errorCount, const List<String> &result, const
 }
 
 void expression_runRegressionTests() {
-	std::function<String(ReadableString)> context = [](ReadableString identifier) -> String {
+	StorableCallback<String(ReadableString)> context = [](ReadableString identifier) -> String {
 		if (string_caseInsensitiveMatch(identifier, U"x")) {
 			return U"5";
 		} else if (string_caseInsensitiveMatch(identifier, U"doorCount")) {

Source/tools/builder/code/expression.h

@@ -3,6 +3,7 @@
 #define DSR_BUILDER_EXPRESSION_MODULE
 
 #include "../../../DFPSR/api/stringAPI.h"
+#include "../../../DFPSR/base/StorableCallback.h"
 
 // The expression module is a slow but generic system for evaluating expressions where all data is stored as strings for simplicity.
 //   No decimal numbers allowed, because it requires both human readable syntax and full determinism without precision loss.
@@ -20,8 +21,8 @@ enum Associativity {
 
 struct Operation {
 	int16_t symbolIndex;
-	std::function<dsr::String(dsr::ReadableString, dsr::ReadableString)> action;
-	Operation(int16_t symbolIndex, std::function<dsr::String(dsr::ReadableString, dsr::ReadableString)> action);
+	dsr::StorableCallback<dsr::String(dsr::ReadableString, dsr::ReadableString)> action;
+	Operation(int16_t symbolIndex, dsr::StorableCallback<dsr::String(dsr::ReadableString, dsr::ReadableString)> action);
 };
 
 struct Precedence {
@@ -68,9 +69,9 @@ dsr::ReadableString expression_getToken(const dsr::List<dsr::String> &tokens, in
 
 int64_t expression_interpretAsInteger(const dsr::ReadableString &value);
 
-dsr::String expression_evaluate(const dsr::List<dsr::String> &tokens, std::function<dsr::String(dsr::ReadableString)> identifierEvaluation);
-dsr::String expression_evaluate(const dsr::List<dsr::String> &tokens, int64_t startTokenIndex, int64_t endTokenIndex, std::function<dsr::String(dsr::ReadableString)> identifierEvaluation);
-dsr::String expression_evaluate(const dsr::List<dsr::String> &tokens, int64_t startTokenIndex, int64_t endTokenIndex, const ExpressionSyntax &syntax, std::function<dsr::String(dsr::ReadableString)> identifierEvaluation);
+dsr::String expression_evaluate(const dsr::List<dsr::String> &tokens, dsr::StorableCallback<dsr::String(dsr::ReadableString)> identifierEvaluation);
+dsr::String expression_evaluate(const dsr::List<dsr::String> &tokens, int64_t startTokenIndex, int64_t endTokenIndex, dsr::StorableCallback<dsr::String(dsr::ReadableString)> identifierEvaluation);
+dsr::String expression_evaluate(const dsr::List<dsr::String> &tokens, int64_t startTokenIndex, int64_t endTokenIndex, const ExpressionSyntax &syntax, dsr::StorableCallback<dsr::String(dsr::ReadableString)> identifierEvaluation);
 
 // Tokenizing into pure lists of strings is inefficient redundant work,
 //   but a lot more reusable than a list of custom types hard-coded for a specific parser.