Changeset 9141 for trunk/MagicSoft/Mars/mbase

Timestamp:

10/13/08 15:54:30 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MArgs.cc (modified) (9 diffs)
• MArgs.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MArgs.cc

@@ -31 +31 @@
 //
 // Arguments beginning with a trailing '-' are called 'options'.
+//
 // Arguments without a trailing '-' are considered 'arguments'
+//
+// All arguments appearing after '--' on the commandline are
+//  also cosidered as 'arguments'
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -57 +61 @@
 //  fArgv: A TList containing all other command line arguments
 //
-//  If root==kFALSE all root commandline options are deleted from
-//  the list, namely: -b
-//
-MArgs::MArgs(int argc, char **argv, Bool_t root) : fArgc(argc)
+MArgs::MArgs(int argc, char **argv) : fArgc(argc)
 {
     TString cmdline;
@@ -76 +77 @@
         fArgv.Add(new MArgsEntry(argv[i]));
     }
-
-    if (root)
-        return;
-
-    HasOnlyAndRemove("-b");
+}
+
+// --------------------------------------------------------------------------
+//
+//  Remove all root commandline options from the list,
+//  namely: -b, -n, -q, -l, -?, -h, --help, -config
+//
+//  Returns the number of found root options (max 8)
+//
+Int_t MArgs::RemoveRootArgs()
+{
+    Int_t n = 0;
+
+    n += HasOnlyAndRemove("-b");
+    n += HasOnlyAndRemove("-n");
+    n += HasOnlyAndRemove("-q");
+    n += HasOnlyAndRemove("-l");
+    n += HasOnlyAndRemove("-?");
+    n += HasOnlyAndRemove("-h");
+    n += HasOnlyAndRemove("--help");
+    n += HasOnlyAndRemove("-config");
+
+    return n;
 }
 
@@ -109 +128 @@
         TString *s = NULL;
         while ((s=dynamic_cast<TString*>(Next())))
-            if (s->BeginsWith("-"))
+            if (*s!="--" && s->BeginsWith("-"))
                 gLog << *s << endl;
         return;
@@ -119 +138 @@
         TString *s = NULL;
         while ((s=dynamic_cast<TString*>(Next())))
-            if (!s->BeginsWith("-"))
+            if (*s!="--" && !s->BeginsWith("-"))
                 gLog << *s << endl;
         return;
@@ -283 +302 @@
     Int_t num = 0;
 
-    TIter Next(&fArgv);
-    TString *s = NULL;
-    while ((s=dynamic_cast<TString*>(Next())))
-    {
-        if (s->BeginsWith("-"))
+    Bool_t allarg = kFALSE;
+
+    TIter Next(&fArgv);
+    TString *s = NULL;
+    while ((s=dynamic_cast<TString*>(Next())))
+    {
+        if (*s=="--")
+        {
+            allarg = kTRUE;
+            continue;
+        }
+
+        if (s->BeginsWith("-") && !allarg)
             continue;
 
@@ -305 +332 @@
     Int_t num = 0;
 
-    TIter Next(&fArgv);
-    TString *s = NULL;
-    while ((s=dynamic_cast<TString*>(Next())))
-        if (!s->BeginsWith("-"))
-            num++;
+    Bool_t allarg = kFALSE;
+
+    TIter Next(&fArgv);
+    TString *s = NULL;
+    while ((s=dynamic_cast<TString*>(Next())))
+    {
+        if (*s=="--")
+        {
+            allarg = kTRUE;
+            continue;
+        }
+
+        if (s->BeginsWith("-") && !allarg)
+            continue;
+
+        num++;
+    }
 
     return num;
@@ -325 +364 @@
     TString *s = NULL;
     while ((s=dynamic_cast<TString*>(Next())))
+    {
+        if (*s=="--")
+            return num;
+
         if (s->BeginsWith("-"))
             num++;
+    }
 
     return num;
@@ -337 +381 @@
 Int_t MArgs::GetNumEntries() const
 {
-    return fArgv.GetSize();
+    return fArgv.FindObject("--") ? fArgv.GetSize()-1 : fArgv.GetSize();
 }
 

trunk/MagicSoft/Mars/mbase/MArgs.h

@@ -31 +31 @@
 
 public:
-    MArgs(int argc, char **argv, Bool_t root=kFALSE);
+    MArgs(int argc, char **argv);
 
     // TObject
@@ -40 +40 @@
 
     // MArgs
+    Int_t    RemoveRootArgs();
+
     Int_t    GetInt(const TString name) const;
     Double_t GetFloat(const TString name) const;