MainSpaceParser class has been renamed to MainOptionsParser

src/mainoptions/mainoptionsparser.cpp

@@ -36,7 +36,7 @@
  */
 
 
-#include "mainspaceparser.h"
+#include "mainoptionsparser.h"
 #include "utf8/utf8.h"
 #include <string.h>
 
@@ -47,7 +47,7 @@ namespace PT
 
 
 
-MainSpaceParser::MainSpaceParser()
+MainOptionsParser::MainOptionsParser()
 {
 	space = 0;
 	arguments_required_space = 0;
@@ -58,36 +58,36 @@ MainSpaceParser::MainSpaceParser()
 
 
 
-MainSpaceParser::~MainSpaceParser()
+MainOptionsParser::~MainOptionsParser()
 {
 }
 
 
-void MainSpaceParser::use_utf8(bool utf8)
+void MainOptionsParser::use_utf8(bool utf8)
 {
 	should_use_utf8 = utf8;
 }
 
 
-void MainSpaceParser::set_non_options_arguments_name(const wchar_t * name)
+void MainOptionsParser::set_non_options_arguments_name(const wchar_t * name)
 {
 	non_option_arguments_name = name;
 }
 
 
-void MainSpaceParser::set_non_options_arguments_name(const std::wstring & name)
+void MainOptionsParser::set_non_options_arguments_name(const std::wstring & name)
 {
 	non_option_arguments_name = name;
 }
 
 
 
-std::wstring & MainSpaceParser::get_wrong_option()
+std::wstring & MainOptionsParser::get_wrong_option()
 {
 	return last_error_option;
 }
 
-MainSpaceParser::Status MainSpaceParser::parse(int argc, const char ** argv, Space & out_space)
+MainOptionsParser::Status MainOptionsParser::parse(int argc, const char ** argv, Space & out_space)
 {
 	space = &out_space;
 	arguments_required_space = nullptr;
@@ -96,7 +96,7 @@ MainSpaceParser::Status MainSpaceParser::parse(int argc, const char ** argv, Spa
 }
 
 
-MainSpaceParser::Status MainSpaceParser::parse(int argc, const char ** argv, Space & out_space, const Space & arguments)
+MainOptionsParser::Status MainOptionsParser::parse(int argc, const char ** argv, Space & out_space, const Space & arguments)
 {
 	space = &out_space;
 	arguments_required_space = &arguments;;
@@ -105,7 +105,7 @@ MainSpaceParser::Status MainSpaceParser::parse(int argc, const char ** argv, Spa
 }
 
 
-MainSpaceParser::Status MainSpaceParser::parse(int argc, const char ** argv)
+MainOptionsParser::Status MainOptionsParser::parse(int argc, const char ** argv)
 {
 	last_status = status_ok;
 	last_error_option.clear();
@@ -125,7 +125,7 @@ MainSpaceParser::Status MainSpaceParser::parse(int argc, const char ** argv)
 }
 
 
-void MainSpaceParser::parse(size_t argc, const char ** argv, size_t & argv_index)
+void MainOptionsParser::parse(size_t argc, const char ** argv, size_t & argv_index)
 {
 	const char * pchar = argv[argv_index];
 
@@ -161,7 +161,7 @@ void MainSpaceParser::parse(size_t argc, const char ** argv, size_t & argv_index
 }
 
 
-void MainSpaceParser::convert_str(const char * src, std::wstring & dst)
+void MainOptionsParser::convert_str(const char * src, std::wstring & dst)
 {
 	if( should_use_utf8 )
 	{
@@ -177,7 +177,7 @@ void MainSpaceParser::convert_str(const char * src, std::wstring & dst)
 }
 
 
-void MainSpaceParser::convert_str(const char * src, size_t len, std::wstring & dst)
+void MainOptionsParser::convert_str(const char * src, size_t len, std::wstring & dst)
 {
 	if( should_use_utf8 )
 	{
@@ -193,7 +193,7 @@ void MainSpaceParser::convert_str(const char * src, size_t len, std::wstring & d
 }
 
 
-void MainSpaceParser::convert_str(const std::wstring & src, Space & space)
+void MainOptionsParser::convert_str(const std::wstring & src, Space & space)
 {
 	if( should_use_utf8 )
 	{
@@ -213,7 +213,7 @@ void MainSpaceParser::convert_str(const std::wstring & src, Space & space)
 }
 
 
-void MainSpaceParser::parse_short_option(size_t argc, const char ** argv, size_t & argv_index)
+void MainOptionsParser::parse_short_option(size_t argc, const char ** argv, size_t & argv_index)
 {
 	convert_str(argv[argv_index] + 1, options);
 	const wchar_t * options_pchar = options.c_str();
@@ -247,7 +247,7 @@ void MainSpaceParser::parse_short_option(size_t argc, const char ** argv, size_t
 }
 
 
-void MainSpaceParser::parse_long_option(size_t argc, const char ** argv, size_t & argv_index)
+void MainOptionsParser::parse_long_option(size_t argc, const char ** argv, size_t & argv_index)
 {
 	const char * option_begin = argv[argv_index] + 2; // skip first two hyphens --
 	const char * option_end = option_begin;
@@ -312,7 +312,7 @@ void MainSpaceParser::parse_long_option(size_t argc, const char ** argv, size_t
 }
 
 
-void MainSpaceParser::parse_arguments(size_t argc, const char ** argv, size_t & argv_index, size_t args_len)
+void MainOptionsParser::parse_arguments(size_t argc, const char ** argv, size_t & argv_index, size_t args_len)
 {
 	for( ; args_len > 0 && argv_index < argc ; --args_len, ++argv_index)
 	{
@@ -329,7 +329,7 @@ void MainSpaceParser::parse_arguments(size_t argc, const char ** argv, size_t &
 
 
 
-void MainSpaceParser::parse_non_option_arguments(size_t argc, const char ** argv, size_t & argv_index)
+void MainOptionsParser::parse_non_option_arguments(size_t argc, const char ** argv, size_t & argv_index)
 {
 	Space * table_with_args = new Space();
 	table_with_args->set_empty_table();
@@ -344,7 +344,7 @@ void MainSpaceParser::parse_non_option_arguments(size_t argc, const char ** argv
 }
 
 
-void MainSpaceParser::add_option_to_space(const std::wstring & option, const std::vector<std::wstring> & arguments)
+void MainOptionsParser::add_option_to_space(const std::wstring & option, const std::vector<std::wstring> & arguments)
 {
 	Space * option_table = space->get_object_field(option);
 
@@ -372,7 +372,7 @@ void MainSpaceParser::add_option_to_space(const std::wstring & option, const std
 
 
 
-size_t MainSpaceParser::how_many_arguments_required(const std::wstring & arg)
+size_t MainOptionsParser::how_many_arguments_required(const std::wstring & arg)
 {
 	size_t res = 0;
 

src/mainoptions/mainoptionsparser.h

@@ -35,8 +35,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef headerfile_picotools_mainspaceparser_mainparser
-#define headerfile_picotools_mainspaceparser_mainparser
+#ifndef headerfile_picotools_mainoptions_mainoptionsparser
+#define headerfile_picotools_mainoptions_mainoptionsparser
 
 #include "space/space.h"
 #include <string>
@@ -52,12 +52,12 @@ namespace PT
  *
  *
  */
-class MainSpaceParser
+class MainOptionsParser
 {
 public:
 
-	MainSpaceParser();
-	~MainSpaceParser();
+	MainOptionsParser();
+	~MainOptionsParser();
 
 
 	/*