[svn] r5820: nemerle/trunk/lib/getopt.n

[nazgul]

Log:
Give response char option priority over :

Author: nazgul
Date: Fri Oct 14 23:57:53 2005
New Revision: 5820

Modified:
   nemerle/trunk/lib/getopt.n

Modified: nemerle/trunk/lib/getopt.n
==============================================================================
--- nemerle/trunk/lib/getopt.n	(original)
+++ nemerle/trunk/lib/getopt.n	Fri Oct 14 23:57:53 2005
@@ -159,17 +159,17 @@
         when (s [0] == '/') 
           s = "-" + s.Substring (1);
 
-        if (s.IndexOf (':') != -1) s.Substring (0, s.IndexOf (':'))
-        else if (s.IndexOf ('@') != -1) s.Substring (0, s.IndexOf ('@') + 1)
+        if (s.IndexOf ('@') != -1) s.Substring (0, s.IndexOf ('@') + 1)
+        else if (s.IndexOf (':') != -1) s.Substring (0, s.IndexOf (':'))
         else if (s.EndsWith ("+") || s.EndsWith ("-")) s.Substring (0, s.Length - 1)
         else s
       }
 
       def argument_name (opt : string) {
-        if (opt.IndexOf (':') != -1)
-          Some (opt.Substring (opt.IndexOf (':') + 1))
-        else if (opt.IndexOf ('@') != -1)
+        if (opt.IndexOf ('@') != -1)
           Some (opt.Substring (opt.IndexOf ('@') + 1))
+        else if (opt.IndexOf (':') != -1)
+          Some (opt.Substring (opt.IndexOf (':') + 1))
         else if (opt.EndsWith ("+")) Some ("+")
         else if (opt.EndsWith ("-")) Some ("-")
         else