Changeset 1914

Timestamp:

Sep 23, 2010 3:22:35 AM (14 years ago)

Author:

dkearney

Message:

updating getopts to handle cases where you have extra -'d arguments after a list argument.

Example:
in your tcl file if you specify an flags like:

proc fxn {args} {

Rappture::getopts args params {

list -tests "all"
list -dirs "."

}

...

and call your function like this:

fxn -tests a b c -dirs d e

in previouse versions of getopts, $params(-tests) would have the list
a b c -dirs d e
and $params(-dirs) would have the default value "."

in the new version of getopts, $params(-tests) should have the list
a b c
and $params(-dirs) should have the list
d e

this feature is used in hubchecki::runTests

File:

• trunk/gui/scripts/getopts.tcl (modified) (1 diff)

trunk/gui/scripts/getopts.tcl

@@ -128 +128 @@
                     error "missing value for option $first"
                 }
-                set params($first) [lrange $args 1 end]
-                set args ""
+                foreach arg [lrange $args 1 end] {
+                    if {[string index $arg 0] == "-"} {
+                        break
+                    }
+                }
+                set idx [lsearch -exact $args $arg]
+                if {$idx == [expr [llength $args] - 1]} {
+                    # reached the end of the $args list
+                    # with no other -'d arguments
+                    set params($first) [lrange $args 1 end]
+                    set args ""
+                } else {
+                    # there are further -'d arguments to process
+                    set params($first) [lrange $args 1 [expr $idx-1]]
+                    set args [lrange $args $idx end]
+                }
             }
         }