From 05620b8ebe619b5c5d85b739bbefd64b3140ffff Mon Sep 17 00:00:00 2001 From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz> Date: Wed, 4 Dec 2019 17:39:44 +0100 Subject: [PATCH] move commands under ast --- alib2cli/src/{command => ast}/Command.h | 2 +- .../command/AlgorithmsIntrospectionCommand.h | 2 +- .../command/BindingsIntrospectionCommand.h | 2 +- .../command/CastsIntrospectionCommand.h | 2 +- alib2cli/src/{ => ast}/command/CommandList.h | 2 +- .../src/{ => ast}/command/CommandResult.h | 0 .../command/DataTypesIntrospectionCommand.h | 2 +- alib2cli/src/{ => ast}/command/EOTCommand.h | 2 +- .../src/{ => ast}/command/ExecuteCommand.h | 2 +- alib2cli/src/{ => ast}/command/HelpCommand.h | 2 +- alib2cli/src/{ => ast}/command/LoadCommand.h | 2 +- .../command/OverloadsIntrospectionCommand.h | 2 +- alib2cli/src/{ => ast}/command/QuitCommand.h | 2 +- alib2cli/src/{ => ast}/command/SetCommand.h | 2 +- .../src/{ => ast}/command/UnloadCommand.h | 2 +- .../command/VariablesIntrospectionCommand.h | 2 +- alib2cli/src/environment/Environment.h | 2 +- alib2cli/src/parser/Parser.cpp | 26 +++++++++---------- alib2cli/src/parser/Parser.h | 2 +- 19 files changed, 30 insertions(+), 30 deletions(-) rename alib2cli/src/{command => ast}/Command.h (87%) rename alib2cli/src/{ => ast}/command/AlgorithmsIntrospectionCommand.h (98%) rename alib2cli/src/{ => ast}/command/BindingsIntrospectionCommand.h (96%) rename alib2cli/src/{ => ast}/command/CastsIntrospectionCommand.h (98%) rename alib2cli/src/{ => ast}/command/CommandList.h (96%) rename alib2cli/src/{ => ast}/command/CommandResult.h (100%) rename alib2cli/src/{ => ast}/command/DataTypesIntrospectionCommand.h (97%) rename alib2cli/src/{ => ast}/command/EOTCommand.h (91%) rename alib2cli/src/{ => ast}/command/ExecuteCommand.h (95%) rename alib2cli/src/{ => ast}/command/HelpCommand.h (99%) rename alib2cli/src/{ => ast}/command/LoadCommand.h (94%) rename alib2cli/src/{ => ast}/command/OverloadsIntrospectionCommand.h (98%) rename alib2cli/src/{ => ast}/command/QuitCommand.h (95%) rename alib2cli/src/{ => ast}/command/SetCommand.h (97%) rename alib2cli/src/{ => ast}/command/UnloadCommand.h (94%) rename alib2cli/src/{ => ast}/command/VariablesIntrospectionCommand.h (96%) diff --git a/alib2cli/src/command/Command.h b/alib2cli/src/ast/Command.h similarity index 87% rename from alib2cli/src/command/Command.h rename to alib2cli/src/ast/Command.h index 23cddb86b6..5e72db49fa 100644 --- a/alib2cli/src/command/Command.h +++ b/alib2cli/src/ast/Command.h @@ -1,7 +1,7 @@ #ifndef _CLI_COMMAND_H_ #define _CLI_COMMAND_H_ -#include <command/CommandResult.h> +#include <ast/command/CommandResult.h> namespace cli { diff --git a/alib2cli/src/command/AlgorithmsIntrospectionCommand.h b/alib2cli/src/ast/command/AlgorithmsIntrospectionCommand.h similarity index 98% rename from alib2cli/src/command/AlgorithmsIntrospectionCommand.h rename to alib2cli/src/ast/command/AlgorithmsIntrospectionCommand.h index 103c54256e..5babfa5478 100644 --- a/alib2cli/src/command/AlgorithmsIntrospectionCommand.h +++ b/alib2cli/src/ast/command/AlgorithmsIntrospectionCommand.h @@ -1,7 +1,7 @@ #ifndef _CLI_ALGORITHMS_INTROSPECTION_COMMAND_H_ #define _CLI_ALGORITHMS_INTROSPECTION_COMMAND_H_ -#include <command/Command.h> +#include <ast/Command.h> #include <environment/Environment.h> namespace cli { diff --git a/alib2cli/src/command/BindingsIntrospectionCommand.h b/alib2cli/src/ast/command/BindingsIntrospectionCommand.h similarity index 96% rename from alib2cli/src/command/BindingsIntrospectionCommand.h rename to alib2cli/src/ast/command/BindingsIntrospectionCommand.h index dec9393348..d09e020ce7 100644 --- a/alib2cli/src/command/BindingsIntrospectionCommand.h +++ b/alib2cli/src/ast/command/BindingsIntrospectionCommand.h @@ -1,7 +1,7 @@ #ifndef _CLI_BINDINGS_INTROSPECTION_COMMAND_H_ #define _CLI_BINDINGS_INTROSPECTION_COMMAND_H_ -#include <command/Command.h> +#include <ast/Command.h> #include <environment/Environment.h> namespace cli { diff --git a/alib2cli/src/command/CastsIntrospectionCommand.h b/alib2cli/src/ast/command/CastsIntrospectionCommand.h similarity index 98% rename from alib2cli/src/command/CastsIntrospectionCommand.h rename to alib2cli/src/ast/command/CastsIntrospectionCommand.h index d824c5c357..8f7c68878a 100644 --- a/alib2cli/src/command/CastsIntrospectionCommand.h +++ b/alib2cli/src/ast/command/CastsIntrospectionCommand.h @@ -1,7 +1,7 @@ #ifndef _CLI_CAST_INTROSPECTION_COMMAND_H_ #define _CLI_CAST_INTROSPECTION_COMMAND_H_ -#include <command/Command.h> +#include <ast/Command.h> #include <environment/Environment.h> #include <alib/list> diff --git a/alib2cli/src/command/CommandList.h b/alib2cli/src/ast/command/CommandList.h similarity index 96% rename from alib2cli/src/command/CommandList.h rename to alib2cli/src/ast/command/CommandList.h index 3babfa77ca..3b6719608e 100644 --- a/alib2cli/src/command/CommandList.h +++ b/alib2cli/src/ast/command/CommandList.h @@ -1,7 +1,7 @@ #ifndef _CLI_COMMAND_LIST_H_ #define _CLI_COMMAND_LIST_H_ -#include <command/Command.h> +#include <ast/Command.h> namespace cli { diff --git a/alib2cli/src/command/CommandResult.h b/alib2cli/src/ast/command/CommandResult.h similarity index 100% rename from alib2cli/src/command/CommandResult.h rename to alib2cli/src/ast/command/CommandResult.h diff --git a/alib2cli/src/command/DataTypesIntrospectionCommand.h b/alib2cli/src/ast/command/DataTypesIntrospectionCommand.h similarity index 97% rename from alib2cli/src/command/DataTypesIntrospectionCommand.h rename to alib2cli/src/ast/command/DataTypesIntrospectionCommand.h index fecd4ab9e1..203a0113ea 100644 --- a/alib2cli/src/command/DataTypesIntrospectionCommand.h +++ b/alib2cli/src/ast/command/DataTypesIntrospectionCommand.h @@ -1,7 +1,7 @@ #ifndef _CLI_DATA_TYPE_INTROSPECTION_COMMAND_H_ #define _CLI_DATA_TYPE_INTROSPECTION_COMMAND_H_ -#include <command/Command.h> +#include <ast/Command.h> #include <environment/Environment.h> #include <registry/XmlRegistry.h> diff --git a/alib2cli/src/command/EOTCommand.h b/alib2cli/src/ast/command/EOTCommand.h similarity index 91% rename from alib2cli/src/command/EOTCommand.h rename to alib2cli/src/ast/command/EOTCommand.h index 0c206fd80c..933b9bc220 100644 --- a/alib2cli/src/command/EOTCommand.h +++ b/alib2cli/src/ast/command/EOTCommand.h @@ -1,7 +1,7 @@ #ifndef _CLI_EOT_COMMAND_H_ #define _CLI_EOT_COMMAND_H_ -#include <command/Command.h> +#include <ast/Command.h> #include <environment/Environment.h> namespace cli { diff --git a/alib2cli/src/command/ExecuteCommand.h b/alib2cli/src/ast/command/ExecuteCommand.h similarity index 95% rename from alib2cli/src/command/ExecuteCommand.h rename to alib2cli/src/ast/command/ExecuteCommand.h index 41f84f46ba..1145eac138 100644 --- a/alib2cli/src/command/ExecuteCommand.h +++ b/alib2cli/src/ast/command/ExecuteCommand.h @@ -1,7 +1,7 @@ #ifndef _CLI_EXECUTE_COMMAND_H_ #define _CLI_EXECUTE_COMMAND_H_ -#include <command/Command.h> +#include <ast/Command.h> #include <environment/Environment.h> #include <ast/Statement.h> diff --git a/alib2cli/src/command/HelpCommand.h b/alib2cli/src/ast/command/HelpCommand.h similarity index 99% rename from alib2cli/src/command/HelpCommand.h rename to alib2cli/src/ast/command/HelpCommand.h index 08ecc0493d..25a05a6c3a 100644 --- a/alib2cli/src/command/HelpCommand.h +++ b/alib2cli/src/ast/command/HelpCommand.h @@ -1,7 +1,7 @@ #ifndef _CLI_HELP_COMMAND_H_ #define _CLI_HELP_COMMAND_H_ -#include <command/Command.h> +#include <ast/Command.h> #include <environment/Environment.h> namespace cli { diff --git a/alib2cli/src/command/LoadCommand.h b/alib2cli/src/ast/command/LoadCommand.h similarity index 94% rename from alib2cli/src/command/LoadCommand.h rename to alib2cli/src/ast/command/LoadCommand.h index 7ec174ad94..cbae849868 100644 --- a/alib2cli/src/command/LoadCommand.h +++ b/alib2cli/src/ast/command/LoadCommand.h @@ -1,7 +1,7 @@ #ifndef _CLI_LOAD_COMMAND_H_ #define _CLI_LOAD_COMMAND_H_ -#include <command/Command.h> +#include <ast/Command.h> #include <environment/Environment.h> #include <common/LibraryLoader.h> diff --git a/alib2cli/src/command/OverloadsIntrospectionCommand.h b/alib2cli/src/ast/command/OverloadsIntrospectionCommand.h similarity index 98% rename from alib2cli/src/command/OverloadsIntrospectionCommand.h rename to alib2cli/src/ast/command/OverloadsIntrospectionCommand.h index ba004085bb..ffcd83478e 100644 --- a/alib2cli/src/command/OverloadsIntrospectionCommand.h +++ b/alib2cli/src/ast/command/OverloadsIntrospectionCommand.h @@ -1,7 +1,7 @@ #ifndef _CLI_OVERLOADS_INTROSPECTION_COMMAND_H_ #define _CLI_OVERLOADS_INTROSPECTION_COMMAND_H_ -#include <command/Command.h> +#include <ast/Command.h> #include <environment/Environment.h> namespace cli { diff --git a/alib2cli/src/command/QuitCommand.h b/alib2cli/src/ast/command/QuitCommand.h similarity index 95% rename from alib2cli/src/command/QuitCommand.h rename to alib2cli/src/ast/command/QuitCommand.h index f18374f108..e8aa5655b8 100644 --- a/alib2cli/src/command/QuitCommand.h +++ b/alib2cli/src/ast/command/QuitCommand.h @@ -1,7 +1,7 @@ #ifndef _CLI_QUIT_COMMAND_H_ #define _CLI_QUIT_COMMAND_H_ -#include <command/Command.h> +#include <ast/Command.h> #include <environment/Environment.h> #include <ast/Statement.h> diff --git a/alib2cli/src/command/SetCommand.h b/alib2cli/src/ast/command/SetCommand.h similarity index 97% rename from alib2cli/src/command/SetCommand.h rename to alib2cli/src/ast/command/SetCommand.h index bcdf4f6e19..91e7ca2334 100644 --- a/alib2cli/src/command/SetCommand.h +++ b/alib2cli/src/ast/command/SetCommand.h @@ -1,7 +1,7 @@ #ifndef _CLI_SET_COMMAND_H_ #define _CLI_SET_COMMAND_H_ -#include <command/Command.h> +#include <ast/Command.h> #include <environment/Environment.h> #include <global/GlobalData.h> #include <alib/random> diff --git a/alib2cli/src/command/UnloadCommand.h b/alib2cli/src/ast/command/UnloadCommand.h similarity index 94% rename from alib2cli/src/command/UnloadCommand.h rename to alib2cli/src/ast/command/UnloadCommand.h index 470cb629ec..bda3f450e0 100644 --- a/alib2cli/src/command/UnloadCommand.h +++ b/alib2cli/src/ast/command/UnloadCommand.h @@ -1,7 +1,7 @@ #ifndef _CLI_UNLOAD_COMMAND_H_ #define _CLI_UNLOAD_COMMAND_H_ -#include <command/Command.h> +#include <ast/Command.h> #include <environment/Environment.h> #include <common/LibraryLoader.h> diff --git a/alib2cli/src/command/VariablesIntrospectionCommand.h b/alib2cli/src/ast/command/VariablesIntrospectionCommand.h similarity index 96% rename from alib2cli/src/command/VariablesIntrospectionCommand.h rename to alib2cli/src/ast/command/VariablesIntrospectionCommand.h index 2059838b9b..b5167df2a0 100644 --- a/alib2cli/src/command/VariablesIntrospectionCommand.h +++ b/alib2cli/src/ast/command/VariablesIntrospectionCommand.h @@ -1,7 +1,7 @@ #ifndef _CLI_VARIABLES_INTROSPECTION_COMMAND_H_ #define _CLI_VARIABLES_INTROSPECTION_COMMAND_H_ -#include <command/Command.h> +#include <ast/Command.h> #include <environment/Environment.h> namespace cli { diff --git a/alib2cli/src/environment/Environment.h b/alib2cli/src/environment/Environment.h index 34822e85a7..2f1aa55543 100644 --- a/alib2cli/src/environment/Environment.h +++ b/alib2cli/src/environment/Environment.h @@ -11,7 +11,7 @@ #include <exception/CommonException.h> #include <abstraction/ValueHolder.hpp> -#include <command/CommandResult.h> +#include <ast/command/CommandResult.h> #include <lexer/CharSequence.h> namespace cli { diff --git a/alib2cli/src/parser/Parser.cpp b/alib2cli/src/parser/Parser.cpp index aba9526eba..9adf10bf62 100644 --- a/alib2cli/src/parser/Parser.cpp +++ b/alib2cli/src/parser/Parser.cpp @@ -15,19 +15,19 @@ #include <ast/args/BindedArg.h> #include <ast/args/ImmediateArg.h> -#include <command/ExecuteCommand.h> -#include <command/QuitCommand.h> -#include <command/EOTCommand.h> -#include <command/HelpCommand.h> -#include <command/AlgorithmsIntrospectionCommand.h> -#include <command/OverloadsIntrospectionCommand.h> -#include <command/DataTypesIntrospectionCommand.h> -#include <command/CastsIntrospectionCommand.h> -#include <command/BindingsIntrospectionCommand.h> -#include <command/VariablesIntrospectionCommand.h> -#include <command/SetCommand.h> -#include <command/LoadCommand.h> -#include <command/UnloadCommand.h> +#include <ast/command/ExecuteCommand.h> +#include <ast/command/QuitCommand.h> +#include <ast/command/EOTCommand.h> +#include <ast/command/HelpCommand.h> +#include <ast/command/AlgorithmsIntrospectionCommand.h> +#include <ast/command/OverloadsIntrospectionCommand.h> +#include <ast/command/DataTypesIntrospectionCommand.h> +#include <ast/command/CastsIntrospectionCommand.h> +#include <ast/command/BindingsIntrospectionCommand.h> +#include <ast/command/VariablesIntrospectionCommand.h> +#include <ast/command/SetCommand.h> +#include <ast/command/LoadCommand.h> +#include <ast/command/UnloadCommand.h> namespace cli { diff --git a/alib2cli/src/parser/Parser.h b/alib2cli/src/parser/Parser.h index eb66cd4d70..87a079185a 100644 --- a/alib2cli/src/parser/Parser.h +++ b/alib2cli/src/parser/Parser.h @@ -8,7 +8,7 @@ #include <ast/options/TypeOption.h> #include <ast/options/CategoryOption.h> -#include <command/CommandList.h> +#include <ast/command/CommandList.h> #include <ast/statements/StatementList.h> -- GitLab