go around global variable

aql2/src/aql.cpp

@@ -76,7 +76,9 @@ int main ( int argc, char * argv[] ) {
 		measurements::start ( "Overal", measurements::Type::OVERALL );
-		cli::Environment environment;
+		Prompt & p = Prompt::getPrompt ( );
+		cli::Environment & environment = p.getEnvironment ( );
+
 		environment.setBinding ( "stdin", "-" );
 		environment.setBinding ( "stdout", "-" );
@@ -84,8 +86,6 @@ int main ( int argc, char * argv[] ) {
 			environment.setBinding ( param.first, param.second );
 		}
-		Prompt p ( std::move ( environment ) );
-
 		cli::Command::Result result = cli::Command::Result::OK;
 		if ( queries.getValue ( ).empty ( ) ) {
 			result = p.run ( );

aql2/src/prompt/Prompt.cpp

@@ -67,10 +67,8 @@ Prompt::Prompt ( cli::Environment environment ) : m_history_file ( std::string (
 		++ i;
 	}
-
 	// register readline completion function, pass environment
 	rl_attempted_completion_function = readline_completion;
-	rl_aql_environment = & m_environment;
 }
 Prompt::~Prompt ( ) {

aql2/src/prompt/Prompt.h

@@ -29,10 +29,15 @@ class Prompt {
 	cli::Environment m_environment;
-public:
 	Prompt ( cli::Environment environment );
 	~Prompt ( );
+public:
+	static Prompt & getPrompt ( ) {
+		static Prompt instance { cli::Environment ( ) };
+		return instance;
+	}
+
 	cli::Command::Result run ( );
 	template < class T >
@@ -50,7 +55,7 @@ public:
 		}
 	}
-	const cli::Environment & getEnvironment ( ) const {
+	cli::Environment & getEnvironment ( ) {
 		return m_environment;
 	}
 };

aql2/src/prompt/ReadlinePromptCompletion.cpp

@@ -12,9 +12,7 @@
 #include <registry/Registry.h>
 #include "ReadlinePromptCompletion.h"
-
-
-const cli::Environment* rl_aql_environment = nullptr;
+#include "Prompt.h"
 /* ========================================================================= */
@@ -65,15 +63,11 @@ std::set < std::string > fetchCommandsIntrospect ( const char *text ) {
 }
 std::set < std::string > fetchBindings ( const char *text ) {
-	if ( rl_aql_environment )
-		return filter_completions ( addPrefix ( rl_aql_environment -> getBindingNames ( ), "#" ), text );
-	return std::set < std::string > ( );
+	return filter_completions ( addPrefix ( Prompt::getPrompt ( ).getEnvironment ( ).getBindingNames ( ), "#" ), text );
 }
 std::set < std::string > fetchVariables ( const char *text ) {
-	if ( rl_aql_environment )
-		return filter_completions ( addPrefix ( rl_aql_environment -> getVariableNames ( ), "$" ), text );
-	return std::set < std::string > ( );
+	return filter_completions ( addPrefix ( Prompt::getPrompt ( ).getEnvironment ( ).getVariableNames ( ), "$" ), text );
 }
 std::set < std::string > fetchFilepath ( const char *text ) {

aql2/src/prompt/ReadlinePromptCompletion.h

@@ -15,8 +15,6 @@
 #include <readline/readline.h>
 #include <environment/Environment.h>
-extern const cli::Environment* rl_aql_environment;
-
 enum class CompletionContext {
 	COMMAND,
 	COMMAND_INTROSPECT,