Changeset 1024 for trunk/base

Timestamp:

Oct 10, 2002, 1:26:26 AM (22 years ago)

Author:

kevin

Message:

create the procedure for a variant earlier in the process.
trying to store it as a variable made the quoting un-manageable.

File:

• trunk/base/src/port1.0/portutil.tcl (modified) (3 diffs)

trunk/base/src/port1.0/portutil.tcl

@@ -235 +235 @@
     $obj append provides $provides
     $obj append requires $requires
-    $obj set code $code
+
+        # make a user procedure named variant-blah-blah
+        # well will call this procedure during variant-run
+        makeuserproc $name \{$code\}
     lappend all_variants $obj
     
@@ -380 +383 @@
 # thought of any other way to do this.
 proc makeuserproc {name body} {
-    regsub -- "^\{(.*?)" $body "\{ \n eval \"global \[info globals\]\" \n \\1" body
+    regsub -- "^\{(.*?)" $body "\{ \n foreach g \[info globals\] \{ \n global \$g \n \} \n \\1" body
     eval "proc $name {} $body"
 }
@@ -743 +746 @@
     set name [$this get name]
     ui_debug "Executing $name provides [$this get provides]"
-    makeuserproc ${name}-code "[$this get code]"
-    if ([catch ${name}-code result]) {
+    # execute proc with same name as variant.
+        if {[catch ${name} result]} {
         ui_error "Error executing $name: $result"
         return 1