Changeset 1060 for trunk/bin/Parameter.h

Timestamp:

Jun 2, 2010, 3:56:35 AM (11 years ago)

Author:

Peter Johansson

Message:

refs #307

Splittin the Parameter class into two separate classes and a base
class holding the common parts. The output of '--help' is not sorted
as before otherwise everything should be the same. The sort will
require some ammendment in yat.

File:

• trunk/bin/Parameter.h (modified) (2 diffs)

trunk/bin/Parameter.h

@@ -47 +47 @@
   class Parameter {
   public:
-    Parameter( int argc, char *argv[]);
+    Parameter(void);
     virtual ~Parameter(void);
-    const yat::utility::OptionArg<std::string>& anchor_format(void) const;
+    void parse( int argc, char *argv[]);
+
     std::string config_file(void) const;
     
-    bool copyright(void) const;
     bool force(void) const;
     bool generate_config(void) const ;
     bool ignore_cache(void) const;
-    const yat::utility::OptionArg<std::string>& format(void) const;
-    bool report(void) const;
-    bool revisions(void) const;
     /// @return absolute path to root directory
     std::string root(void) const;
-    /// @return absolute path to target directory
-    std::string targetdir(void) const;
     bool verbose(void) const;
 
-  private:
-    void analyse(void);
+  protected:
+    yat::utility::CommandLine cmd_;
+    yat::utility::OptionHelp help_;
+
     // throw cmd_error if path doesn't exist
     void check_existence(std::string path) const;
@@ -74 +71 @@
     void check_readable(std::string path) const;
 
+  private:
+    void analyse(void);
+    virtual void analyse2(void)=0;
     void init(void);
+    // called at end of init(void)
+    virtual void init2(void) = 0;
+    void set_default(void);
+    virtual void set_default2(void)=0;
 
-    yat::utility::CommandLine cmd_;
-    yat::utility::OptionArg<std::string> anchor_format_;
     yat::utility::OptionArg<std::string> config_file_;
-    yat::utility::OptionSwitch copyright_;
     yat::utility::OptionSwitch force_;
     yat::utility::OptionSwitch generate_config_;
-    yat::utility::OptionHelp help_;
     yat::utility::OptionSwitch ignore_cache_;
-    yat::utility::OptionArg<std::string> format_;
-    yat::utility::OptionSwitch report_;
-    yat::utility::OptionSwitch revisions_;
     yat::utility::OptionArg<std::string> root_;
-    yat::utility::OptionArg<std::string> target_;
     yat::utility::OptionSwitch verbose_;
+  protected:
     OptionVersion version_;