Changeset 2083 for trunk/base

Timestamp:

Feb 26, 2003, 10:06:12 AM (21 years ago)

Author:

kevin

Message:

Minor bugfixes.

Location:

trunk/base/src/darwinports1.0

Files:

• darwinports_dlist.tcl (modified) (5 diffs)
• test_dlist.tcl (modified) (1 diff)

trunk/base/src/darwinports1.0/darwinports_dlist.tcl

@@ -133 +133 @@
 #       value - the value to append to the key
 
-proc ditem_append {ditem key value} {
-        return [darwinports_dlist::ditem_append $ditem $key $value]
+proc ditem_append {ditem key args} {
+        eval "return \[darwinports_dlist::ditem_append $ditem $key $args\]"
 }
 
@@ -143 +143 @@
 #       key   - the key to examine
 #       value - optional value to search for in the key
-proc ditem_contains {ditem key {value}} {
-        eval "return [darwinports_dlist::ditem_contains $ditem $key $value]"
+proc ditem_contains {ditem key args} {
+        eval "return \[darwinports_dlist::ditem_contains $ditem $key $args\]"
 }
 
@@ -253 +253 @@
                         # statusdict notation is 1 for success
                         if {[catch {$handler $ditem} result]} {
-                                # debug puts the result?
-                                set result 1
+                                puts $result
+                                return $dlist
                         }
                         # No news is good news at this point.
@@ -305 +305 @@
 }
 
-proc ditem_append {ditem key value} {
+proc ditem_append {ditem key args} {
         variable $ditem
         set x [lindex [array get $ditem $key] 1]
         if {$x != {}} {
-                eval "lappend x $value"
+                eval "lappend x $args"
         } else {
-                set x $value
+                set x $args
         }
         array set $ditem [list $key $x]
@@ -317 +317 @@
 }
 
-proc ditem_contains {ditem key {value}} {
+proc ditem_contains {ditem key args} {
         variable $ditem
-        if {![info exists value]} {
-                return [info exists ${ditem}($key)]
+        if {[llength $args] == 0} {
+                eval "return \[info exists ${ditem}($key)\]"
         } else {
                 set x [lindex [array get $ditem $key] 1]
-                if {[llength $x] > 0 && [lsearch -exact $x $value] != -1} {
+                if {[llength $x] > 0 && [lsearch -exact $x [lindex $args 0]] != -1} {
                         return 1
                 } else {

trunk/base/src/darwinports1.0/test_dlist.tcl

@@ -35 +35 @@
 
 puts -nonewline "Checking ditem_contains... "
+set value2 ""
 if {[catch {ditem_contains $ditem provides "foo"} value] || $value != 1 ||
         [catch {ditem_contains $ditem provides "zzz"} value2] || $value2 != 0} {