From f91052199637f5d9d92d375c0c0d635bdb7638f0 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Wed, 2 Aug 2017 21:58:17 +0200
Subject: [PATCH] introspection in cli
---
alib2cli/src/command/HelpCommand.h | 1 +
alib2cli/src/command/IntrospectionCommand.h | 28 +++++++++++++++++++
alib2cli/src/parser/Parser.cpp | 10 +++++--
alib2cli/src/parser/Parser.h | 2 +-
.../src/abstraction/AlgorithmRegistry.hpp | 18 ++++++++++++
alib2common/src/abstraction/Registry.cpp | 8 ++++++
alib2common/src/abstraction/Registry.h | 3 ++
7 files changed, 67 insertions(+), 3 deletions(-)
create mode 100644 alib2cli/src/command/IntrospectionCommand.h
diff --git a/alib2cli/src/command/HelpCommand.h b/alib2cli/src/command/HelpCommand.h
index 8c6c8da389..e0a47b7fcc 100644
--- a/alib2cli/src/command/HelpCommand.h
+++ b/alib2cli/src/command/HelpCommand.h
@@ -52,6 +52,7 @@ public:
std::cout << "" << std::endl;
std::cout << "command quit: quits the processor." << std::endl;
std::cout << "command help: shows this help." << std::endl;
+ std::cout << "command introspect: prints available algorithms and algorithm overloads." << std::endl;
std::cout << "command execute: executes statements" << std::endl;
std::cout << "" << std::endl;
std::cout << "for details use help of individual command" << std::endl;
diff --git a/alib2cli/src/command/IntrospectionCommand.h b/alib2cli/src/command/IntrospectionCommand.h
new file mode 100644
index 0000000000..e205304609
--- /dev/null
+++ b/alib2cli/src/command/IntrospectionCommand.h
@@ -0,0 +1,28 @@
+#ifndef _CLI_INTROSPECTION_COMMAND_H_
+#define _CLI_INTROSPECTION_COMMAND_H_
+
+#include <command/Command.h>
+#include <environment/Environment.h>
+
+namespace cli {
+
+class IntrospectionCommand : public Command {
+ std::string m_algorithm;
+
+public:
+ IntrospectionCommand ( std::string algorithm ) : m_algorithm ( std::move ( algorithm ) ) {
+ }
+
+ virtual Command::Result run ( Environment & ) const override {
+ if ( m_algorithm == "" ) {
+ abstraction::Registry::listAlgorithms ( );
+ } else {
+ abstraction::Registry::listAlgorithmOverloads ( m_algorithm );
+ }
+ return Command::Result::OK;
+ }
+};
+
+} /* namespace cli */
+
+#endif /* _CLI_INTROSPECTION_COMMAND_H_ */
diff --git a/alib2cli/src/parser/Parser.cpp b/alib2cli/src/parser/Parser.cpp
index b1bcb15bbf..8980f01dbe 100644
--- a/alib2cli/src/parser/Parser.cpp
+++ b/alib2cli/src/parser/Parser.cpp
@@ -23,6 +23,7 @@
#include <command/ExecuteCommand.h>
#include <command/QuitCommand.h>
#include <command/HelpCommand.h>
+#include <command/IntrospectionCommand.h>
#include <primitive/Integer.h>
#include <primitive/String.h>
@@ -166,7 +167,7 @@ void Parser::result ( std::shared_ptr < StatementList > & list ) {
}
}
-std::string Parser::help_parameter ( ) {
+std::string Parser::optional_identifier ( ) {
if ( check ( cli::Lexer::TokenType::IDENTIFIER ) ) {
return matchIdentifier ( );
} else {
@@ -187,9 +188,14 @@ std::unique_ptr < Command > Parser::parse ( ) {
return std::make_unique < QuitCommand > ( );
} else if ( check_nonreserved_kw ( "help" ) ) {
match_nonreserved_kw ( "help" );
- std::string command = help_parameter ( );
+ std::string command = optional_identifier ( );
match ( cli::Lexer::TokenType::END );
return std::make_unique < HelpCommand > ( std::move ( command ) );
+ } else if ( check_nonreserved_kw ( "introspect" ) ) {
+ match_nonreserved_kw ( "introspect" );
+ std::string command = optional_identifier ( );
+ match ( cli::Lexer::TokenType::END );
+ return std::make_unique < IntrospectionCommand > ( std::move ( command ) );
} else {
throw exception::CommonException ( "Mismatched set while expanding param rule." );
}
diff --git a/alib2cli/src/parser/Parser.h b/alib2cli/src/parser/Parser.h
index 829024d65f..e1096c3b28 100644
--- a/alib2cli/src/parser/Parser.h
+++ b/alib2cli/src/parser/Parser.h
@@ -84,7 +84,7 @@ public:
void result ( std::shared_ptr < StatementList > & list );
- std::string help_parameter ( );
+ std::string optional_identifier ( );
std::unique_ptr < Command > parse ( );
diff --git a/alib2common/src/abstraction/AlgorithmRegistry.hpp b/alib2common/src/abstraction/AlgorithmRegistry.hpp
index 79d6b70075..1f8289913c 100644
--- a/alib2common/src/abstraction/AlgorithmRegistry.hpp
+++ b/alib2common/src/abstraction/AlgorithmRegistry.hpp
@@ -102,6 +102,24 @@ public:
bool normalize;
return getAbstraction ( std::move ( name ), paramTypes, downcast, normalize );
}
+
+ static void listOverloads ( const std::string & algorithm ) {
+ auto group = getEntries ( ).find ( algorithm );
+ if ( group == getEntries ( ).end ( ) )
+ throw exception::CommonException ( "Entry " + algorithm + " not available" );
+
+ for ( const std::pair < const std::vector < std::type_index >, std::unique_ptr < Entry > > & overloads : group->second ) {
+ for ( const std::type_index & param : overloads.first ) {
+ std::cout << param << " " << std::endl;
+ }
+ }
+ }
+
+ static void list ( ) {
+ for ( const std::pair < const std::string, std::map < std::vector < std::type_index >, std::unique_ptr < Entry > > > & entry : getEntries ( ) ) {
+ std::cout << entry.first << std::endl;
+ }
+ }
};
} /* namespace abstraction */
diff --git a/alib2common/src/abstraction/Registry.cpp b/alib2common/src/abstraction/Registry.cpp
index 25cd777c4c..3602f5c326 100644
--- a/alib2common/src/abstraction/Registry.cpp
+++ b/alib2common/src/abstraction/Registry.cpp
@@ -18,6 +18,14 @@
namespace abstraction {
+void Registry::listAlgorithmOverloads ( const std::string & algorithm ) {
+ AlgorithmRegistry::listOverloads ( algorithm );
+}
+
+void Registry::listAlgorithms ( ) {
+ AlgorithmRegistry::list ( );
+}
+
std::shared_ptr < abstraction::OperationAbstraction > Registry::getAlgorithmAbstraction ( std::string name, const std::vector < std::type_index > & paramTypes ) {
return AlgorithmRegistry::getAbstraction ( std::move ( name ), paramTypes );
}
diff --git a/alib2common/src/abstraction/Registry.h b/alib2common/src/abstraction/Registry.h
index e61f1d5075..af45365e53 100644
--- a/alib2common/src/abstraction/Registry.h
+++ b/alib2common/src/abstraction/Registry.h
@@ -14,6 +14,9 @@ namespace abstraction {
class Registry {
public:
+ static void listAlgorithmOverloads ( const std::string & algorithm );
+ static void listAlgorithms ( );
+
static std::shared_ptr < abstraction::OperationAbstraction > getAlgorithmAbstraction ( std::string name, const std::vector < std::type_index > & paramTypes );
static std::shared_ptr < abstraction::OperationAbstraction > getAlgorithmAbstraction ( std::string name, const std::vector < std::type_index > & paramTypes, bool & unwrap, bool & normalize );
static std::shared_ptr < abstraction::OperationAbstraction > getCastAbstraction ( std::string target, std::string param );
--
GitLab