fixup load and unload statements

alib2cli/src/lexer/Lexer.h

@@ -9,8 +9,7 @@
 #include <exception/CommonException.h>
-#include "CharSequence.h"
-#include <readline/StringLineInterface.h>
+#include <lexer/CharSequence.h>
 namespace cli {

alib2cli/src/parser/Parser.cpp

@@ -410,13 +410,19 @@ std::unique_ptr < Command > Parser::command ( ) {
 		return std::make_unique < SetCommand > ( std::move ( param ), std::move ( value ) );
 	} else if ( check_nonreserved_kw ( "load" ) ) {
 		match_nonreserved_kw ( "load" );
+
+		setHint ( Lexer::Hint::FILE );
 		std::string libraryName = getTokenValue ( );
-		match ( cli::Lexer::TokenType::INTEGER, cli::Lexer::TokenType::IDENTIFIER, cli::Lexer::TokenType::STRING );
+		match ( cli::Lexer::TokenType::FILE, cli::Lexer::TokenType::STRING );
+
 		return std::make_unique < LoadCommand > ( std::move ( libraryName ) );
 	} else if ( check_nonreserved_kw ( "unload" ) ) {
 		match_nonreserved_kw ( "unload" );
+
+		setHint ( Lexer::Hint::FILE );
 		std::string libraryName = getTokenValue ( );
-		match ( cli::Lexer::TokenType::INTEGER, cli::Lexer::TokenType::IDENTIFIER, cli::Lexer::TokenType::STRING );
+		match ( cli::Lexer::TokenType::FILE, cli::Lexer::TokenType::STRING );
+
 		return std::make_unique < UnloadCommand > ( std::move ( libraryName ) );
 	} else if ( check ( cli::Lexer::TokenType::EOT ) ) {
 		return std::make_unique < EOTCommand > ( );

alib2cli/test-src/cli/CliTest.cpp

@@ -8,6 +8,7 @@
 #include <sys/stat.h>
 #include <registry/AlgorithmRegistry.hpp>
 #include <registration/AlgoRegistration.hpp>
+#include <readline/StringLineInterface.h>
 void testLine ( std::string line, cli::Environment & environment ) {
 	cli::Parser ( cli::Lexer ( cli::CharSequence ( cli::StringLineInterface ( line ) ) ) ).parse ( )->run ( environment );

alib2integrationtest/test-src/testing/TimeoutAqlTest.cpp

@@ -12,6 +12,8 @@
 #include <alib/exception>
 #include <alib/random>
+#include <readline/StringLineInterface.h>
+
 #define PIPE_RD 0
 #define PIPE_WR 1