<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[134833] trunk/base/src/port1.0/portutil.tcl</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/134833">134833</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2015-04-08 07:30:14 -0700 (Wed, 08 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>simplify makeuserproc and get rid of weird overquoting requirement (which probably only existed because someone called their argument 'args' in the calling procs without realising what that does)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcport10portutiltcl">trunk/base/src/port1.0/portutil.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcport10portutiltcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portutil.tcl (134832 => 134833)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portutil.tcl 2015-04-08 13:33:26 UTC (rev 134832)
+++ trunk/base/src/port1.0/portutil.tcl 2015-04-08 14:30:14 UTC (rev 134833)
</span><span class="lines">@@ -601,7 +601,7 @@
</span><span class="cx">
</span><span class="cx"> # make a user procedure named variant-blah-blah
</span><span class="cx"> # we will call this procedure during variant-run
</span><del>- makeuserproc "variant-[ditem_key $ditem name]" \{$code\}
</del><ins>+ makeuserproc variant-[ditem_key $ditem name] $code
</ins><span class="cx">
</span><span class="cx"> # Export provided variant to PortInfo
</span><span class="cx"> # (don't list it twice if the variant was already defined, which can happen
</span><span class="lines">@@ -1281,8 +1281,8 @@
</span><span class="cx"> # all the globals in its scope. This is undeniably ugly, but I haven't
</span><span class="cx"> # thought of any other way to do this.
</span><span class="cx"> proc makeuserproc {name body} {
</span><del>- regsub -- "^\{(.*?)" $body "\{ \n foreach g \[info globals\] \{ \n global \$g \n \} \n \\1" body
- eval "proc $name {} $body"
</del><ins>+ append modified_body {global {*}[info globals]\n} $body
+ proc $name {} $modified_body
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # backup
</span><span class="lines">@@ -2199,7 +2199,7 @@
</span><span class="cx"> set origproc [ditem_key $ditem procedure]
</span><span class="cx"> set ident [ditem_key $ditem name]
</span><span class="cx"> if {[info commands $target] eq ""} {
</span><del>- proc $target {args} "
</del><ins>+ proc $target {code} "
</ins><span class="cx"> variable proc_index
</span><span class="cx"> set proc_index \[llength \[ditem_key $ditem proc\]\]
</span><span class="cx"> ditem_key $ditem procedure proc-${ident}-${target}-\${proc_index}
</span><span class="lines">@@ -2211,10 +2211,10 @@
</span><span class="cx"> }
</span><span class="cx"> \"
</span><span class="cx"> proc do-$target {} { $origproc $target }
</span><del>- makeuserproc userproc-${ident}-${target}-\${proc_index} \$args
</del><ins>+ makeuserproc userproc-${ident}-${target}-\${proc_index} \$code
</ins><span class="cx"> "
</span><span class="cx"> }
</span><del>- proc pre-$target {args} "
</del><ins>+ proc pre-$target {code} "
</ins><span class="cx"> variable proc_index
</span><span class="cx"> set proc_index \[llength \[ditem_key $ditem pre\]\]
</span><span class="cx"> ditem_append $ditem pre proc-pre-${ident}-${target}-\${proc_index}
</span><span class="lines">@@ -2225,9 +2225,9 @@
</span><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx"> \"
</span><del>- makeuserproc userproc-pre-${ident}-${target}-\${proc_index} \$args
</del><ins>+ makeuserproc userproc-pre-${ident}-${target}-\${proc_index} \$code
</ins><span class="cx"> "
</span><del>- proc post-$target {args} "
</del><ins>+ proc post-$target {code} "
</ins><span class="cx"> variable proc_index
</span><span class="cx"> set proc_index \[llength \[ditem_key $ditem post\]\]
</span><span class="cx"> ditem_append $ditem post proc-post-${ident}-${target}-\${proc_index}
</span><span class="lines">@@ -2238,7 +2238,7 @@
</span><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx"> \"
</span><del>- makeuserproc userproc-post-${ident}-${target}-\${proc_index} \$args
</del><ins>+ makeuserproc userproc-post-${ident}-${target}-\${proc_index} \$code
</ins><span class="cx"> "
</span><span class="cx"> }
</span><span class="cx"> ditem_append $ditem provides {*}$args
</span></span></pre>
</div>
</div>
</body>
</html>