From 16684952fbea39879dcbd4356c8d20acad4912b0 Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@zsh.org>
Date: Fri, 4 Dec 2015 15:39:53 +0000
Subject: 37305: typeset -p can now output arrays on one line

---
 Test/A06assign.ztst  |  3 +--
 Test/B02typeset.ztst | 16 +++++-----------
 Test/V10private.ztst |  9 +++------
 3 files changed, 9 insertions(+), 19 deletions(-)

(limited to 'Test')

diff --git a/Test/A06assign.ztst b/Test/A06assign.ztst
index 1e3d2ede9..90fac555b 100644
--- a/Test/A06assign.ztst
+++ b/Test/A06assign.ztst
@@ -437,8 +437,7 @@
  typeset -p i n x f)
 0:GLOB_ASSIGN with numeric types
 >typeset -i i=0
->typeset -a n
->n=( tmpfile1 tmpfile2 )
+>typeset -a n=( tmpfile1 tmpfile2 )
 >typeset x=tmpfile2
 >typeset -E f=4.000000000e+00
 
diff --git a/Test/B02typeset.ztst b/Test/B02typeset.ztst
index fc8b3e46e..7d65cc8a7 100644
--- a/Test/B02typeset.ztst
+++ b/Test/B02typeset.ztst
@@ -454,8 +454,7 @@
  fn() { typeset -p array nonexistent; }
  fn
 1:declare -p shouldn't create scoped values
->typeset -a array
->array=( foo bar )
+>typeset -a array=( foo bar )
 ?fn:typeset: no such variable: nonexistent
 
  unsetopt typesetsilent
@@ -508,11 +507,8 @@
   typeset -pm 'a[12]'
   typeset -pm 'r[12]'
 0:readonly -p output
->typeset -a a1
->a1=( one two )
->typeset -ar a1
->typeset -a a2
->a2=( three four )
+>typeset -ar a1=( one two )
+>typeset -a a2=( three four )
 >typeset -r r1=yes
 >typeset -r r2=no
 
@@ -707,8 +703,6 @@
   fn
   print $array
 0:setting empty array in typeset
->typeset -a array
->array=( '' two '' four )
->typeset -a array
->array=( one '' three )
+>typeset -a array=( '' two '' four )
+>typeset -a array=( one '' three )
 >no really nothing here
diff --git a/Test/V10private.ztst b/Test/V10private.ztst
index 513a3c43d..320e35764 100644
--- a/Test/V10private.ztst
+++ b/Test/V10private.ztst
@@ -127,12 +127,9 @@
  outer
  print ${(kv)hash_test}
 0:private hides value from surrounding scope in nested scope
->typeset -a hash_test
->hash_test=( top level )
->typeset -A hash_test
->hash_test=( in function )
->typeset -a hash_test
->hash_test=( top level )
+>typeset -a hash_test=( top level )
+>typeset -A hash_test=( in function )
+>typeset -a hash_test=( top level )
 >array-local top level
 >top level
 F:note "typeset" rather than "private" in output from outer
-- 
cgit 1.4.1