Changeset 10345

Timestamp:

Apr 5, 2015, 5:32:40 PM (10 years ago)

Author:

landauf

Message:

wrap CommandLineArguments in StaticallyInitializedInstances

Location:

code/branches/core7/src

Files:

• libraries/core/Core.cc (modified) (2 diffs)
• libraries/core/PathConfig.cc (modified) (1 diff)
• libraries/core/commandline/CommandLineIncludes.h (added)
• libraries/core/commandline/CommandLineParser.cc (modified) (1 diff)
• libraries/core/commandline/CommandLineParser.h (modified) (5 diffs)
• libraries/core/input/InputManager.cc (modified) (1 diff)
• orxonox/LevelManager.cc (modified) (1 diff)
• orxonox/Main.cc (modified) (1 diff)
• orxonox/gamestates/GSClient.cc (modified) (1 diff)
• orxonox/gamestates/GSServer.cc (modified) (1 diff)

code/branches/core7/src/libraries/core/Core.cc

@@ -60 +60 @@
 #include "util/SignalHandler.h"
 #include "PathConfig.h"
-#include "commandline/CommandLineParser.h"
+#include "commandline/CommandLineIncludes.h"
 #include "config/ConfigFileManager.h"
 #include "config/ConfigValueIncludes.h"
@@ -140 +140 @@
         }
 
+        // TODO: initialize CommandLineParser here
         ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances();
 

code/branches/core7/src/libraries/core/PathConfig.cc

@@ -53 +53 @@
 #include "util/Output.h"
 #include "util/Exception.h"
-#include "commandline/CommandLineParser.h"
+#include "commandline/CommandLineIncludes.h"
 
 // Differentiate Boost Filesystem v2 and v3

code/branches/core7/src/libraries/core/commandline/CommandLineParser.cc

@@ -338 +338 @@
         }
     }
+
+    /**
+    @brief
+        Adds a new CommandLineArgument to the internal map.
+        Note that only such arguments are actually valid.
+    */
+    void CommandLineParser::addArgument(CommandLineArgument* argument)
+    {
+        OrxAssert(!_getInstance().existsArgument(argument->getName()),
+            "Cannot add a command line argument with name '" + argument->getName() + "' twice.");
+        OrxAssert(!argument->getDefaultValue().isType<bool>() || argument->getDefaultValue().get<bool>() != true,
+               "Boolean command line arguments with positive default values are not supported." << endl
+            << "Please use SetCommandLineSwitch and adjust your argument: " << argument->getName());
+
+        _getInstance().cmdLineArgs_[argument->getName()] = argument;
+    }
 }

code/branches/core7/src/libraries/core/commandline/CommandLineParser.h

@@ -49 +49 @@
 #include "util/MultiType.h"
 
-#define SetCommandLineArgument(name, defaultValue) \
-    orxonox::CommandLineArgument& CmdArgumentDummyBoolVar##name \
-    = orxonox::CommandLineParser::addArgument(#name, defaultValue)
-#define SetCommandLineSwitch(name) \
-    orxonox::CommandLineArgument& CmdArgumentDummyBoolVar##name \
-    = orxonox::CommandLineParser::addArgument(#name, false)
-
 namespace orxonox
 {
@@ -80 +73 @@
 
     public:
+        //! Constructor initialises both value_ and defaultValue_ with defaultValue.
+        CommandLineArgument(const std::string& name, const MultiType& defaultValue)
+            : bHasDefaultValue_(true)
+            , name_(name)
+            , value_(defaultValue)
+            , defaultValue_(defaultValue)
+        { }
+        ~CommandLineArgument() { }
+
         //! Tells whether the value has been changed by the command line.
         bool hasDefaultValue() const { return bHasDefaultValue_; }
@@ -104 +106 @@
 
     private:
-        //! Constructor initialises both value_ and defaultValue_ with defaultValue.
-        CommandLineArgument(const std::string& name, const MultiType& defaultValue)
-            : bHasDefaultValue_(true)
-            , name_(name)
-            , value_(defaultValue)
-            , defaultValue_(defaultValue)
-        { }
-
         //! Undefined copy constructor
         CommandLineArgument(const CommandLineArgument& instance);
-        ~CommandLineArgument() { }
 
         //! Parses the value string of a command line argument.
@@ -158 +151 @@
         static const MultiType& getValue(const std::string& name)
         { return getArgument(name)->getValue(); }
-        template <class T>
-        static CommandLineArgument& addArgument(const std::string& name, T defaultValue);
+        static void addArgument(CommandLineArgument* argument);
 
         static bool existsArgument(const std::string& name)
@@ -202 +194 @@
         *value = getArgument(name)->getValue().get<std::string>();
     }
-
-    /**
-    @brief
-        Adds a new CommandLineArgument to the internal map.
-        Note that only such arguments are actually valid.
-    @param name
-        Name of the argument. Shortcut can be added later.
-    @param defaultValue
-        Default value that is used when argument was not given.
-    */
-    template <class T>
-    CommandLineArgument& CommandLineParser::addArgument(const std::string& name, T defaultValue)
-    {
-        OrxAssert(!_getInstance().existsArgument(name),
-            "Cannot add a command line argument with name '" + name + "' twice.");
-        OrxAssert(!MultiType(defaultValue).isType<bool>() || MultiType(defaultValue).get<bool>() != true,
-               "Boolean command line arguments with positive default values are not supported." << endl
-            << "Please use SetCommandLineSwitch and adjust your argument: " << name);
-
-        return *(_getInstance().cmdLineArgs_[name] = new CommandLineArgument(name, defaultValue));
-    }
 }
 

code/branches/core7/src/libraries/core/input/InputManager.cc

@@ -48 +48 @@
 #include "core/GraphicsManager.h"
 #include "core/config/ConfigValueIncludes.h"
-#include "core/commandline/CommandLineParser.h"
+#include "core/commandline/CommandLineIncludes.h"
 #include "core/command/ConsoleCommand.h"
 #include "core/command/Functor.h"

code/branches/core7/src/orxonox/LevelManager.cc

@@ -37 +37 @@
 
 #include "util/ScopedSingletonManager.h"
-#include "core/commandline/CommandLineParser.h"
+#include "core/commandline/CommandLineIncludes.h"
 #include "core/config/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"

code/branches/core7/src/orxonox/Main.cc

@@ -36 +36 @@
 #include "Main.h"
 
-#include "core/commandline/CommandLineParser.h"
+#include "core/commandline/CommandLineIncludes.h"
 #include "core/Game.h"
 #include "core/LuaState.h"

code/branches/core7/src/orxonox/gamestates/GSClient.cc

@@ -30 +30 @@
 
 #include "util/Exception.h"
-#include "core/commandline/CommandLineParser.h"
+#include "core/commandline/CommandLineIncludes.h"
 #include "core/Game.h"
 #include "core/GameMode.h"

code/branches/core7/src/orxonox/gamestates/GSServer.cc

@@ -30 +30 @@
 
 #include "util/Output.h"
-#include "core/commandline/CommandLineParser.h"
+#include "core/commandline/CommandLineIncludes.h"
 #include "core/Game.h"
 #include "core/GameMode.h"