<!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>[147361] trunk/base/src/port/port.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/147361">147361</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2016-04-02 09:04:00 -0700 (Sat, 02 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>port: use switch -matchvar from Tcl 8.5</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcportporttcl">trunk/base/src/port/port.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcportporttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port/port.tcl (147360 => 147361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port/port.tcl        2016-04-02 14:17:52 UTC (rev 147360)
+++ trunk/base/src/port/port.tcl        2016-04-02 16:04:00 UTC (rev 147361)
</span><span class="lines">@@ -1259,7 +1259,7 @@
</span><span class="cx"> array unset options
</span><span class="cx">
</span><span class="cx"> set token [lookahead]
</span><del>- switch -regex -- $token {
</del><ins>+ switch -regex -matchvar matchvar -- $token {
</ins><span class="cx"> ^\\)$ -
</span><span class="cx"> ^\; -
</span><span class="cx"> ^_EOF_$ { # End of expression/cmd/file
</span><span class="lines">@@ -1273,59 +1273,60 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ^all(@.*)?$ -
- ^installed(@.*)?$ -
- ^uninstalled(@.*)?$ -
- ^active(@.*)?$ -
- ^inactive(@.*)?$ -
- ^actinact(@.*)?$ -
- ^leaves(@.*)?$ -
- ^outdated(@.*)?$ -
- ^obsolete(@.*)?$ -
- ^requested(@.*)?$ -
- ^unrequested(@.*)?$ -
- ^current(@.*)?$ {
</del><ins>+ ^(all)(@.*)?$ -
+ ^(installed)(@.*)?$ -
+ ^(uninstalled)(@.*)?$ -
+ ^(active)(@.*)?$ -
+ ^(inactive)(@.*)?$ -
+ ^(actinact)(@.*)?$ -
+ ^(leaves)(@.*)?$ -
+ ^(outdated)(@.*)?$ -
+ ^(obsolete)(@.*)?$ -
+ ^(requested)(@.*)?$ -
+ ^(unrequested)(@.*)?$ -
+ ^(current)(@.*)?$ {
</ins><span class="cx"> # A simple pseudo-port name
</span><span class="cx"> advance
</span><span class="cx">
</span><span class="cx"> # Break off the version component, if there is one
</span><del>- regexp {^(\w+)(@.*)?} $token matchvar name remainder
</del><ins>+ set name [lindex $matchvar 1]
+ set remainder [lindex $matchvar 2]
</ins><span class="cx">
</span><span class="cx"> add_multiple_ports reslist [get_${name}_ports] $remainder
</span><span class="cx">
</span><span class="cx"> set el 1
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ^variants: -
- ^variant: -
- ^description: -
- ^portdir: -
- ^homepage: -
- ^epoch: -
- ^platforms: -
- ^platform: -
- ^name: -
- ^long_description: -
- ^maintainers: -
- ^maintainer: -
- ^categories: -
- ^category: -
- ^version: -
- ^depends_lib: -
- ^depends_build: -
- ^depends_run: -
- ^depends_extract: -
- ^depends_fetch: -
- ^depends_test: -
- ^replaced_by: -
- ^revision: -
- ^subport: -
- ^subports: -
- ^license: { # Handle special port selectors
</del><ins>+ ^(variants):(.*) -
+ ^(variant):(.*) -
+ ^(description):(.*) -
+ ^(portdir):(.*) -
+ ^(homepage):(.*) -
+ ^(epoch):(.*) -
+ ^(platforms):(.*) -
+ ^(platform):(.*) -
+ ^(name):(.*) -
+ ^(long_description):(.*) -
+ ^(maintainers):(.*) -
+ ^(maintainer):(.*) -
+ ^(categories):(.*) -
+ ^(category):(.*) -
+ ^(version):(.*) -
+ ^(depends_lib):(.*) -
+ ^(depends_build):(.*) -
+ ^(depends_run):(.*) -
+ ^(depends_extract):(.*) -
+ ^(depends_fetch):(.*) -
+ ^(depends_test):(.*) -
+ ^(replaced_by):(.*) -
+ ^(revision):(.*) -
+ ^(subport):(.*) -
+ ^(subports):(.*) -
+ ^(license):(.*) { # Handle special port selectors
</ins><span class="cx"> advance
</span><span class="cx">
</span><del>- # Break up the token, because older Tcl switch doesn't support -matchvar
- regexp {^(\w+):(.*)} $token matchvar field pat
</del><ins>+ set field [lindex $matchvar 1]
+ set pat [lindex $matchvar 2]
</ins><span class="cx">
</span><span class="cx"> # Remap friendly names to actual names
</span><span class="cx"> set field [map_friendly_field_names $field]
</span><span class="lines">@@ -1334,11 +1335,11 @@
</span><span class="cx"> set el 1
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ^depends: { # A port selector shorthand for depends_{lib,build,run,fetch,extract}
</del><ins>+ ^(depends):(.*) { # A port selector shorthand for depends_{lib,build,run,fetch,extract}
</ins><span class="cx"> advance
</span><span class="cx">
</span><del>- # Break up the token, because older Tcl switch doesn't support -matchvar
- regexp {^(\w+):(.*)} $token matchvar field pat
</del><ins>+ set field [lindex $matchvar 1]
+ set pat [lindex $matchvar 2]
</ins><span class="cx">
</span><span class="cx"> add_multiple_ports reslist [get_matching_ports $pat no regexp "depends_lib"]
</span><span class="cx"> add_multiple_ports reslist [get_matching_ports $pat no regexp "depends_build"]
</span><span class="lines">@@ -1350,12 +1351,12 @@
</span><span class="cx"> set el 1
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ^dependentof: -
- ^rdependentof: {
</del><ins>+ ^(dependentof):(.*) -
+ ^(rdependentof):(.*) {
</ins><span class="cx"> advance
</span><span class="cx">
</span><del>- # Break up the token, because older Tcl switch doesn't support -matchvar
- regexp {^(\w+):(.*)} $token matchvar selector portname
</del><ins>+ set selector [lindex $matchvar 1]
+ set portname [lindex $matchvar 2]
</ins><span class="cx">
</span><span class="cx"> set recursive [string equal $selector "rdependentof"]
</span><span class="cx"> add_multiple_ports reslist [get_dependent_ports $portname $recursive]
</span><span class="lines">@@ -1363,12 +1364,12 @@
</span><span class="cx"> set el 1
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ^depof: -
- ^rdepof: {
</del><ins>+ ^(depof):(.*) -
+ ^(rdepof):(.*) {
</ins><span class="cx"> advance
</span><span class="cx">
</span><del>- # Break up the token, because older Tcl switch doesn't support -matchvar
- regexp {^(\w+):(.*)} $token matchvar selector portname
</del><ins>+ set selector [lindex $matchvar 1]
+ set portname [lindex $matchvar 2]
</ins><span class="cx">
</span><span class="cx"> set recursive [string equal $selector "rdepof"]
</span><span class="cx"> add_multiple_ports reslist [get_dep_ports $portname $recursive]
</span><span class="lines">@@ -1376,11 +1377,11 @@
</span><span class="cx"> set el 1
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ^subportof: {
</del><ins>+ ^(subportof):(.*) {
</ins><span class="cx"> advance
</span><span class="cx">
</span><del>- # Break up the token, because older Tcl switch doesn't support -matchvar
- regexp {^(\w+):(.*)} $token matchvar selector portname
</del><ins>+ set selector [lindex $matchvar 1]
+ set portname [lindex $matchvar 2]
</ins><span class="cx">
</span><span class="cx"> add_multiple_ports reslist [get_subports $portname]
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>