bpp-lsp: Remove dependency on libfrozen

We can use a simple std::array and linear searches, libfrozen was overkill for this

[notest]

Author: rail5

.github/workflows/codeql.yml

@@ -74,7 +74,7 @@ jobs:
       run: |
         if [ "${{ matrix.language }}" = "c-cpp" ]; then
           apt-get update
-          apt-get install build-essential flex bison pandoc nlohmann-json3-dev libfrozen-dev libutfcpp-dev -y
+          apt-get install build-essential flex bison pandoc nlohmann-json3-dev libutfcpp-dev -y
         fi
 
     # Add any setup steps before running the `github/codeql-action/init` action.

.github/workflows/jekyll-gh-pages.yml

@@ -75,7 +75,7 @@ jobs:
         if: steps.code_changed.outputs.code == 'true'
         run: |
           apt-get update
-          apt-get install build-essential flex bison doxygen graphviz libfrozen-dev libutfcpp-dev -y
+          apt-get install build-essential flex bison doxygen graphviz libutfcpp-dev -y
       - name: Run tests and generate test stats SVG
         if: steps.code_changed.outputs.code == 'true'
         run: |

README.md

@@ -68,7 +68,6 @@ Pre-built packages are available for **amd64** and **arm64**. The .debs can also
 
 Language server-specific prerequisites:
  - `nlohmann-json3-dev`
- - `libfrozen-dev`
 
 Optional:
  - `pandoc` and `perl` for building the documentation
@@ -78,7 +77,7 @@ On Debian-based systems, you can install the prerequisites with:
 
 ```bash
 $ sudo apt update
-$ sudo apt install build-essential flex bison libutfcpp-dev libfrozen-dev pandoc perl debhelper nlohmann-json3-dev
+$ sudo apt install build-essential flex bison libutfcpp-dev pandoc perl debhelper nlohmann-json3-dev
 ```
 
 #### Building

debian/control

@@ -2,7 +2,7 @@ Source: bpp
 Priority: optional
 Maintainer: rail5 <andrew@rail5.org>
 Homepage: https://bpp.sh
-Build-Depends: debhelper (>= 10), pandoc, flex, bison, perl, nlohmann-json3-dev, libfrozen-dev, libutfcpp-dev
+Build-Depends: debhelper (>= 10), pandoc, flex, bison, perl, nlohmann-json3-dev, libutfcpp-dev
 Standards-Version: 4.7.0
 Section: utils
 

src/lsp/BashppServer.cpp

@@ -139,16 +139,22 @@ void bpp::BashppServer::sendNotification(const GenericNotificationMessage& notif
 void bpp::BashppServer::processRequest(const GenericRequestMessage& request) {
 	GenericResponseMessage response;
 	response.id = request.id;
-	std::function<GenericResponseMessage(const GenericRequestMessage&)> request_handler = invalidRequestHandler;
-	const auto* it = request_handlers.find(frozen::string(request.method));
-	if (it != request_handlers.end()) {
-		request_handler = std::bind(it->second, this, std::placeholders::_1); // Bind the method to the current instance
-	} else {
+
+	const auto* it = std::find_if(request_handlers.begin(), request_handlers.end(),
+		[&request](const RequestHandlerEntry& entry) {
+			return entry.method_name == request.method;
+		}
+	);
+
+	if (it == request_handlers.end()) {
 		log("No handler found for request method: ", request.method);
+		response = invalidRequestHandler(request);
+		sendResponse(response);
+		return;
 	}
 
 	try {
-		response = request_handler(request);
+		response = (this->*it->handler)(request);
 	} catch (const std::exception& e) {
 		log("Error handling request: ", e.what());
 		ResponseError err;
@@ -157,20 +163,25 @@ void bpp::BashppServer::processRequest(const GenericRequestMessage& request) {
 		err.data = e.what();
 		response.error = err;
 	}
+
 	sendResponse(response);
 }
 
 void bpp::BashppServer::processNotification(const GenericNotificationMessage& notification) {
-	std::function<void(const GenericNotificationMessage&)> notification_handler = invalidNotificationHandler;
-	const auto* it = notification_handlers.find(frozen::string(notification.method));
-	if (it != notification_handlers.end()) {
-		notification_handler = std::bind(it->second, this, std::placeholders::_1); // Bind the method to the current instance
-	} else {
+	const auto* it = std::find_if(notification_handlers.begin(), notification_handlers.end(),
+		[&notification](const NotificationHandlerEntry& entry) {
+			return entry.method_name == notification.method;
+		}
+	);
+
+	if (it == notification_handlers.end()) {
 		log("No handler found for notification method: ", notification.method);
+		invalidNotificationHandler(notification);
+		return;
 	}
 
 	try {
-		notification_handler(notification);
+		(this->*it->handler)(notification);
 	} catch (const std::exception& e) {
 		log("Error handling notification: ", e.what());
 	}

src/lsp/BashppServer.h

@@ -17,9 +17,6 @@
 #include <nlohmann/json.hpp>
 #include <unistd.h>
 
-#include <frozen/string.h>
-#include <frozen/unordered_map.h>
-
 #include "ThreadPool.h"
 #include "ProgramPool.h"
 
@@ -276,33 +273,42 @@ class BashppServer {
 		using RequestHandler = GenericResponseMessage (BashppServer::*)(const GenericRequestMessage&);
 		using NotificationHandler = void (BashppServer::*)(const GenericNotificationMessage&);
 
+		struct RequestHandlerEntry {
+			std::string_view method_name;
+			RequestHandler handler;
+		};
+		struct NotificationHandlerEntry {
+			std::string_view method_name;
+			NotificationHandler handler;
+		};
+
 		/**
 		 * @brief Maps request types to the functions that handle them.
 		 * 
 		 */
-		static constexpr frozen::unordered_map<frozen::string, RequestHandler, 8> request_handlers = {
-			{"initialize", &BashppServer::handleInitialize},
-			{"textDocument/definition", &BashppServer::handleDefinition},
-			{"textDocument/completion", &BashppServer::handleCompletion},
-			{"textDocument/hover", &BashppServer::handleHover},
+		static constexpr std::array<RequestHandlerEntry, 8> request_handlers = {{
+			{"initialize",                  &BashppServer::handleInitialize},
+			{"textDocument/definition",     &BashppServer::handleDefinition},
+			{"textDocument/completion",     &BashppServer::handleCompletion},
+			{"textDocument/hover",          &BashppServer::handleHover},
 			{"textDocument/documentSymbol", &BashppServer::handleDocumentSymbol},
-			{"textDocument/rename", &BashppServer::handleRename},
-			{"textDocument/references", &BashppServer::handleReferences},
-			{"shutdown", &BashppServer::shutdown}
-		};
+			{"textDocument/rename",         &BashppServer::handleRename},
+			{"textDocument/references",     &BashppServer::handleReferences},
+			{"shutdown",                    &BashppServer::shutdown}
+		}};
 
 		/**
 		 * @brief Maps notification types to the functions that handle them.
 		 * 
 		 */
-		static constexpr frozen::unordered_map<frozen::string, NotificationHandler, 6> notification_handlers = {
-			{"textDocument/didOpen", &BashppServer::handleDidOpen},
-			{"textDocument/didChange", &BashppServer::handleDidChange},
+		static constexpr std::array<NotificationHandlerEntry, 6> notification_handlers = {{
+			{"textDocument/didOpen",            &BashppServer::handleDidOpen},
+			{"textDocument/didChange",          &BashppServer::handleDidChange},
 			{"workspace/didChangeWatchedFiles", &BashppServer::handleDidChangeWatchedFiles},
-			{"textDocument/didSave", &BashppServer::handleDidSave},
-			{"textDocument/didClose", &BashppServer::handleDidClose},
-			{"exit", &BashppServer::exit}
-		};
+			{"textDocument/didSave",            &BashppServer::handleDidSave},
+			{"textDocument/didClose",           &BashppServer::handleDidClose},
+			{"exit",                            &BashppServer::exit}
+		}};
 };
 
 } // namespace bpp