Changeset 37251 for trunk/base/src

Timestamp:

05/31/08 21:52:50 (6 months ago)

Author:

raimue@…

Message:

port/port.tcl:
Remove hardcoded values and use action_args_const instead

Files:

• trunk/base/src/port/port.tcl (modified) (4 diffs)

trunk/base/src/port/port.tcl

@@ -2503 +2503 @@
 # expects text arguments or wants an expanded list of ports
 # Return value:
-#   0   Does not expect any text argument
-#   1   Expects some strings as text argument
-#   2   Wants an expanded list of ports as text argument
+#   0 none        Does not expect any text argument
+#   1 strings     Expects some strings as text argument
+#   2 ports       Wants an expanded list of ports as text argument
+# Use action_args_const to translate them
 proc action_needs_portlist { action } {
     global action_array
@@ -2514 +2515 @@
     }
 
-    return [expr $ret > 2 ? 2 : $ret]
+    return $ret
 }
 
@@ -2750 +2751 @@
         }
 
-        # Does the port need text arguments?
+        # What kind of arguments does the command expect?
         set expand [action_needs_portlist $action]
 
@@ -2763 +2764 @@
             }
             default {
-                switch -- $expand {
-                    0 {
-                        ui_error "$action does not accept string arguments"
+                if {[action_args_const none] == $expand} {
+                    ui_error "$action does not accept string arguments"
+                    set action_status 1
+                    break
+                } elseif {[action_args_const strings] == $expand} {
+                    while { [moreargs] && ![match ";"] } {
+                        lappend portlist [lookahead]
+                        advance
+                    }
+                } elseif {[action_args_const ports] == $expand} {
+                    # Parse port specifications into portlist
+                    if {![portExpr portlist]} {
+                        ui_error "Improper expression syntax while processing parameters"
                         set action_status 1
                         break
-                    }
-                    1 {
-                        while { [moreargs] && ![match ";"] } {
-                            lappend portlist [lookahead]
-                            advance
-                        }
-                    }
-                    2 {
-                        # Parse port specifications into portlist
-                        if {![portExpr portlist]} {
-                            ui_error "Improper expression syntax while processing parameters"
-                            set action_status 1
-                            break
-                        }
                     }
                 }