Re: Bug#455070: zsh: make completion: please add support for -include

Re: Bug#455070: zsh: make completion: please add support for -include

[Clint Adams]

On Sat, Dec 08, 2007 at 08:58:17PM +0100, Vincent Lefevre wrote:
> As shown below, "make" completion supports "include",
> but not "-include".
> 
> vin:~> head -99 Makefile*
> ==> Makefile <==
> test.b: test.a
>         touch $@
> 
> include Makefile-2
> 
> -include Makefile-3
> 
> ==> Makefile-2 <==
> test.c: test.b
>         touch $@
> 
> ==> Makefile-3 <==
> test.d: test.c
>         touch $@
> vin:~> make [TAB]
> Completing make target
> test.b  test.c

Could you give this completely-untested patch a try?

Index: Completion/Unix/Command/_make
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_make,v
retrieving revision 1.19
diff -u -r1.19 _make
--- Completion/Unix/Command/_make	10 Nov 2006 09:59:27 -0000	1.19
+++ Completion/Unix/Command/_make	8 Dec 2007 21:06:29 -0000
@@ -125,7 +125,7 @@
 _pick_variant -r is_gnu gnu=GNU unix -v -f
 
 if [[ $is_gnu = gnu ]]; then
-    incl=include
+    incl="(-|)include"
 else
     incl=.include
 fi

Re: Bug#455070: zsh: make completion: please add support for -include

[Vincent Lefevre]

On 2007-12-08 16:07:25 -0500, Clint Adams wrote:
> Could you give this completely-untested patch a try?

It doesn't work. "include" is even no longer matched.

-- 
Vincent Lefèvre <vincent@vinc17.org> - Web: <http://www.vinc17.org/>
100% accessible validated (X)HTML - Blog: <http://www.vinc17.org/blog/>
Work: CR INRIA - computer arithmetic / Arenaire project (LIP, ENS-Lyon)

Re: Bug#455070: zsh: make completion: please add support for -include

[Vincent Lefevre]

On 2007-12-09 02:12:47 +0100, Vincent Lefevre wrote:
> On 2007-12-08 16:07:25 -0500, Clint Adams wrote:
> > Could you give this completely-untested patch a try?
> 
> It doesn't work. "include" is even no longer matched.

If I understand the zshexpn(1) man page[*] correctly (but it is not
clear about how the parameter expansion is done in the pattern field),
I think this is a bug:

prunille:~> incl="(-|)include"
prunille:~> echo ${input##(-|)include ##}
foo
prunille:~> echo ${input##$incl ##}
include foo

[*]
  In the expansions discussed below that require a pattern, the form of
  the pattern is the same as that used for filename generation; see the
  section `Filename Generation'.  Note that these patterns, along  with
  the  replacement text of any substitutions, are themselves subject to
  parameter expansion, command substitution, and arithmetic expansion.

-- 
Vincent Lefèvre <vincent@vinc17.org> - Web: <http://www.vinc17.org/>
100% accessible validated (X)HTML - Blog: <http://www.vinc17.org/blog/>
Work: CR INRIA - computer arithmetic / Arenaire project (LIP, ENS-Lyon)

Re: Bug#455070: zsh: make completion: please add support for -include

[Vincent Lefevre]

[-- Attachment #1: Type: text/plain, Size: 515 bytes --]

On 2007-12-09 02:26:58 +0100, Vincent Lefevre wrote:
> prunille:~> incl="(-|)include"
> prunille:~> echo ${input##(-|)include ##}
> foo
> prunille:~> echo ${input##$incl ##}
> include foo

But:

prunille:~> echo ${input##${~incl} ##}
foo

The attached patch works, but I'm not sure it is correct.

-- 
Vincent Lefèvre <vincent@vinc17.org> - Web: <http://www.vinc17.org/>
100% accessible validated (X)HTML - Blog: <http://www.vinc17.org/blog/>
Work: CR INRIA - computer arithmetic / Arenaire project (LIP, ENS-Lyon)

[-- Attachment #2: _make.diff --]
[-- Type: text/plain, Size: 566 bytes --]

--- functions/Completion/Unix/_make	2007-12-09 02:08:38.000000000 +0100
+++ share/zsh/site-functions/_make	2007-12-09 02:32:49.000000000 +0100
@@ -81,8 +81,8 @@
 	    input=${input%%:*}
 	    print $(expandVars 10 $input)
 	    ;;
-	($incl *)
-	    local f=${input##$incl ##}
+	(${~incl} *)
+	    local f=${input##${~incl} ##}
 	    if [[ $incl = '.include' ]]; then
 		f=${f#[\"<]}
 		f=${f%[\">]}
@@ -125,7 +125,7 @@
 _pick_variant -r is_gnu gnu=GNU unix -v -f
 
 if [[ $is_gnu = gnu ]]; then
-    incl=include
+    incl="(-|)include"
 else
     incl=.include
 fi