Re: bug : _make and special parameters

[Peter Stephenson <pws@xxxxxxx>]

Peter Stephenson <pws@xxxxxxx> wrote:
> parseMakefile can
> run recursively, because it handles include declarations, so the
> variables need to go in the top-level namespace.  There's no easy way of
> ensuring this, unfortunately, since there's no way of making the
> parameter local (necessary since the global parameter is special) but at
> a particular level.  So I'll commit your patch for now.

Here's another version: only variables that match existing specials are
declared as local and hidden.

I wrote this just to hedge my bets, leaving everything working for most
variables but fixing arno's problem if they happen to match specials, but
it's actually slightly better: the first "local" will hide the special and
the ${(tP)$var} won't show up a special any more, so the hiding variable
won't subsequently be relocalised.  However, you still lose the scope if
the variable was first mentioned in an included makefile, so it's not a
complete fix.  You could do that with two scans, but it doesn't seem worth
it.

Index: Completion/Unix/Command/_make
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_make,v
retrieving revision 1.18
diff -u -r1.18 _make
--- Completion/Unix/Command/_make	9 Nov 2006 10:52:46 -0000	1.18
+++ Completion/Unix/Command/_make	10 Nov 2006 09:56:03 -0000
@@ -51,6 +51,12 @@
     done
 }
 
+# parseMakefile only runs inside $(...), so it doesn't matter that
+# it pollutes the global namespace, setting zsh variables to
+# make variables.  The difficult case is where a make variable
+# is special in zsh; we use local -h to hide those.  This
+# isn't a complete solution since it means variables defined in
+# included Makefiles are undefined before returning to the parent.
 parseMakefile() {
     local input var val TAB=$'\t' dir=$1
 
@@ -60,7 +66,7 @@
 	    var=${input%%[ $TAB]#=*}
 	    val=${input#*=}
 	    val=${val##[ $TAB]#}
-	    local -h $var
+	    [[ ${(tP)var} = *special ]] && local -h $var
 	    eval $var=\$val
 	    ;;
 	([[:alnum:]][[:alnum:]_]#[ $TAB]#:=*)
@@ -68,7 +74,7 @@
 	    val=${input#*=}
 	    val=${val##[ $TAB]#}
 	    val=$(expandVars 10 $val)
-	    local -h $var
+	    [[ ${(tP)var} = *special ]] && local -h $var
 	    eval $var=\$val
 	    ;;
 	([[:alnum:]][^$TAB:=]#:[^=]*)

-- 
Peter Stephenson <pws@xxxxxxx>                  Software Engineer
CSR PLC, Churchill House, Cambridge Business Park, Cowley Road
Cambridge, CB4 0WZ, UK                          Tel: +44 (0)1223 692070


To access the latest news from CSR copy this link into a web browser:  http://www.csr.com/email_sig.php