Re: PATCH: fixing ${1+"$@"} when word-splitting

[Peter Stephenson <pws@csr.com>]

Wayne Davison wrote:
> > % fn() { local IFS=.-; print -l ${=1:-$ZSH_VERSION}; }
> > % fn
> > 4.3.0-dev-3
> 
> The attached patch fixes this by temporarily setting SHWORDSPLIT
> during the multsub() call when '=' was specified.  I also tested
> that this change works properly with ${=1:-"$ZSH_VERSION"} (i.e.
> giving the output above).

is-at-least is now happy.

Here's an add-on test that handles a lot of the possibilities.  I think
the results are all correct.

--- Test/D04parameter.ztst.old	2006-02-13 19:21:32.000000000 +0000
+++ Test/D04parameter.ztst	2006-02-13 19:31:10.000000000 +0000
@@ -549,7 +549,7 @@
 
   set Make sure "this test keeps" on "preserving all" quoted whitespace
   print -l ${=1+"$@"}
-0:Regression test of unfixed ${=1+"$@"} bug
+0:Regression test of ${=1+"$@"} bug
 >Make
 >sure
 >this test keeps
@@ -558,6 +558,103 @@
 >quoted
 >whitespace
 
+  splitfn() {
+    local IFS=.-
+    local foo=1-2.3-4
+    #
+    print "Called with argument '$1'"
+    print "No quotes"
+    print -l ${=1:-1-2.3-4} ${=1:-$foo}
+    print "With quotes on default argument only"
+    print -l ${=1:-"1-2.3-4"} ${=1:-"$foo"}
+  }
+  print 'Using "="'
+  splitfn
+  splitfn 5.6-7.8
+  #
+  splitfn() {
+    emulate -L zsh
+    setopt shwordsplit
+    local IFS=.-
+    local foo=1-2.3-4
+    #
+    print "Called with argument '$1'"
+    print "No quotes"
+    print -l ${1:-1-2.3-4} ${1:-$foo}
+    print "With quotes on default argument only"
+    print -l ${1:-"1-2.3-4"} ${1:-"$foo"}
+  }
+  print Using shwordsplit
+  splitfn
+  splitfn 5.6-7.8
+0:Test of nested word splitting with and without quotes
+>Using "="
+>Called with argument ''
+>No quotes
+>1
+>2
+>3
+>4
+>1
+>2
+>3
+>4
+>With quotes on default argument only
+>1-2.3-4
+>1-2.3-4
+>Called with argument '5.6-7.8'
+>No quotes
+>5
+>6
+>7
+>8
+>5
+>6
+>7
+>8
+>With quotes on default argument only
+>5
+>6
+>7
+>8
+>5
+>6
+>7
+>8
+>Using shwordsplit
+>Called with argument ''
+>No quotes
+>1
+>2
+>3
+>4
+>1
+>2
+>3
+>4
+>With quotes on default argument only
+>1-2.3-4
+>1-2.3-4
+>Called with argument '5.6-7.8'
+>No quotes
+>5
+>6
+>7
+>8
+>5
+>6
+>7
+>8
+>With quotes on default argument only
+>5
+>6
+>7
+>8
+>5
+>6
+>7
+>8
+
   unset SHLVL
   (( SHLVL++ ))
   print $SHLVL

-- 
Peter Stephenson <pws@csr.com>                  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