[brlcad-commits] SF.net SVN: brlcad:[47289] brlcad/trunk/src/tclscripts/mged/reid.tcl

[<br...@us...>]

Revision: 47289
          http://brlcad.svn.sourceforge.net/brlcad/?rev=47289&view=rev
Author:   brlcad
Date:     2011-10-18 20:54:45 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
dry principle, put usage in only one place to reduce logic

Modified Paths:
--------------
    brlcad/trunk/src/tclscripts/mged/reid.tcl

Modified: brlcad/trunk/src/tclscripts/mged/reid.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/reid.tcl	2011-10-18 20:46:18 UTC (rev 47288)
+++ brlcad/trunk/src/tclscripts/mged/reid.tcl	2011-10-18 20:54:45 UTC (rev 47289)
@@ -23,6 +23,7 @@
 # some given region ID number.
 #
 
+
 proc  reid { args } {
 
     set extern_commands [list db get_regions attr]
@@ -35,12 +36,13 @@
 	}
     }
 
-    # much better arg parsing is needed.
+    set argc [llength $args]
+    if { ($argc != 2 && $argc != 4) || ($argc == 4 && [lindex $args 0] != "-n") } {
+	puts "Usage: reid \[-n <num>\] assembly regionID"
+	return
+    }
+
     if { [llength $args] == 4} {
-	if { [lindex $args 0] != "-n" } {
-	    puts "Usage: reid \[-n <num>\] assembly regionID"
-	    return
-	}
 	set incrval [lindex $args 1]
 	set name [lindex $args 2]
 	set regionid [lindex $args 3]
@@ -48,9 +50,6 @@
 	set incrval 1
 	set name [lindex $args 0]
 	set regionid [lindex $args 1]
-    } else {
-	puts "Usage: reid \[-n <num>\] assembly regionID"
-	return
     }
 
     set objData [db get $name]

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.