PATCH: _argument, a repeated local, again

PATCH: _argument, a repeated local, again

[Alexandre Duret-Lutz]

~ % rlogin foo<TAB>
~ % rlogin fooprefix=ant
suffix=''


That was a local left in a while loop.


--- _arguments.old	Mon Nov 22 17:49:39 1999
+++ _arguments	Mon Nov 22 17:52:13 1999
@@ -166,7 +166,7 @@
 if comparguments -i "$autod" "$@"; then
   local nm="$compstate[nmatches]" action noargs aret expl local
   local next direct odirect equal single match matched ws tmp1 tmp2
-  local opts subc
+  local opts subc prefix suffix
 
   if comparguments -D descr action; then
     comparguments -C subc
@@ -288,8 +288,6 @@
       fi
       if [[ -n "$opts" && -z "$aret$matched" &&
             nm -eq compstate[nmatches] ]]; then
-
-        local prefix suffix
 
         prefix="${PREFIX#*\=}"
         suffix="$SUFFIX"


-- 
Alexandre Duret-Lutz

Re: PATCH: _argument, a repeated local, again

[Bart Schaefer]

On Nov 22,  5:59pm, Alexandre Duret-Lutz wrote:
} Subject: PATCH: _argument, a repeated local, again
}
} That was a local left in a while loop.

I'm not sure which version of _arguments you were diffing against; the
line "nm -eq compstate[nmatches] ]]; then" was replaced at least as far
back as zsh-workers/8603, and isn't present in -pws-9.  Here's the diff
against -pws-9 plus zsh-workers/8722.

Index: Completion/Base/_arguments
===================================================================
@@ -166,7 +166,7 @@
 if comparguments -i "$autod" "$@"; then
   local nm="$compstate[nmatches]" action noargs aret expl local
   local next direct odirect equal single match matched ws tmp1 tmp2
-  local opts subc
+  local opts subc prefix suffix
 
   if comparguments -D descr action; then
     comparguments -C subc
@@ -289,8 +289,6 @@
       if [[ -n "$opts" && -z "$aret$matched" &&
             nm -ne compstate[nmatches] ]] &&
           _requested arguments; then
-
-        local prefix suffix
 
         prefix="${PREFIX#*\=}"
         suffix="$SUFFIX"

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com

Re: PATCH: _argument, a repeated local, again

[Bart Schaefer]

On Nov 22,  7:35pm, Alexandre Duret-Lutz wrote:
} Subject: Re: PATCH: _argument, a repeated local, again
}
} In 8728 I was patching over  3.1.6-pws-9 + 8716 + 8722,  perhaps you
} missed Sven'8716 wich says :

That's not 8716, it's 8715, which I don't ever seem to have received.

And the archive server at www.zsh.org/mla/ doesn't seem to have 8716 or 8717.
What's going on?

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com

Re: PATCH: _argument, a repeated local, again

[Bart Schaefer]

On Nov 22,  7:24pm, Bart Schaefer wrote:
} Subject: Re: PATCH: _argument, a repeated local, again
}
} On Nov 22,  7:35pm, Alexandre Duret-Lutz wrote:
} } Subject: Re: PATCH: _argument, a repeated local, again
} }
} } In 8728 I was patching over  3.1.6-pws-9 + 8716 + 8722,  perhaps you
} } missed Sven'8716 wich says :
} 
} That's not 8716, it's 8715, which I don't ever seem to have received.

I'm sorry; it is 8716, and that's the one that I never got.  I have another
account in another domain archiving zsh-workers mail, which appears to have
gotten all of them, but 8715 and 8716 are misordered in that archive, which
confused me.

} And the archive server at www.zsh.org/mla/ doesn't seem to have 8716 or 8717.

That's still true.

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com

Re: PATCH: _argument, a repeated local, again

[Alexandre Duret-Lutz]

>>> "AD" == Alexandre Duret-Lutz <alexandre.duret@greyc.ismra.fr> writes:
[...]
 AD> --- _arguments.old	Mon Nov 22 17:49:39 1999
 AD> +++ _arguments	Mon Nov 22 17:52:13 1999
        ^^ hoh, I am sorry I messed this :(

[...]

>>> "BS" == Bart Schaefer <schaefer@candle.brasslantern.com> writes:

 BS> On Nov 22,  5:59pm, Alexandre Duret-Lutz wrote:
 BS> } Subject: PATCH: _argument, a repeated local, again
 BS> }
 BS> } That was a local left in a while loop.

 BS> I'm not sure which version of _arguments you were diffing against; the
 BS> line "nm -eq compstate[nmatches] ]]; then" was replaced at least as far
 BS> back as zsh-workers/8603, and isn't present in -pws-9.  Here's the diff
 BS> against -pws-9 plus zsh-workers/8722.
[...]

In 8728 I was patching over  3.1.6-pws-9 + 8716 + 8722,  perhaps you
missed Sven'8716 wich says :
-            nm -ne compstate[nmatches] ]] &&
-          _requested arguments; then
+            nm -eq compstate[nmatches] ]]; then

-- 
Alexandre Duret-Lutz