1 files changed, 85 insertions, 85 deletions
diff --git a/tests/assoc.right b/tests/assoc.right
index 99143f00..90abb6d6 100644
--- a/tests/assoc.right
+++ b/tests/assoc.right
@@ -3,43 +3,43 @@ declare -A BASH_CMDS=()
 declare -A fluff
 declare -A BASH_ALIASES=()
 declare -A BASH_CMDS=()
-declare -A fluff=([bar]="two" [foo]="one" )
-declare -A fluff=([bar]="two" [foo]="one" )
+declare -A fluff=([foo]="one" [bar]="two" )
+declare -A fluff=([foo]="one" [bar]="two" )
 declare -A fluff=([bar]="two" )
 declare -A fluff=([bar]="newval" [qux]="assigned" )
 ./assoc.tests: line 26: chaff: four: must use subscript when assigning associative array
 declare -A BASH_ALIASES=()
 declare -A BASH_CMDS=()
-declare -Ai chaff=([one]="10" [zero]="5" )
-declare -Ar waste=([version]="4.0-devel" [source]="./assoc.tests" [lineno]="28" [pid]="42134" )
-declare -A wheat=([two]="b" [three]="c" [one]="a" [zero]="0" )
-declare -A chaff=([one]="10" ["hello world"]="flip" [zero]="5" )
+declare -Ai chaff=([zero]="5" [one]="10" )
+declare -Ar waste=([lineno]="28" [source]="./assoc.tests" [version]="4.0-devel" [pid]="42134" )
+declare -A wheat=([two]="b" [three]="c" [zero]="0" [one]="a" )
+declare -A chaff=(["hello world"]="flip" [zero]="5" [one]="10" )
 ./assoc.tests: line 38: waste: readonly variable
 ./assoc.tests: line 39: unset: waste: cannot unset: readonly variable
 ./assoc.tests: line 40: chaff[*]: bad array subscript
 ./assoc.tests: line 41: [*]=12: invalid associative array key
-declare -A chaff=([one]="a" ["hello world"]="flip" )
+declare -A chaff=(["hello world"]="flip" [one]="a" )
 flip
-argv[1] = <a>
+argv[1] = <multiple>
+argv[2] = <words>
+argv[3] = <flip>
+argv[4] = <a>
+argv[1] = <multiple words>
 argv[2] = <flip>
-argv[3] = <multiple>
-argv[4] = <words>
-argv[1] = <a>
-argv[2] = <flip>
-argv[3] = <multiple words>
-argv[1] = <a>
-argv[2] = <flip>
-argv[3] = <multiple>
-argv[4] = <words>
-argv[1] = <a flip multiple words>
+argv[3] = <a>
+argv[1] = <multiple>
+argv[2] = <words>
+argv[3] = <flip>
+argv[4] = <a>
+argv[1] = <multiple words flip a>
 ./assoc.tests: line 58: declare: chaff: cannot destroy array variables in this way
 ./assoc.tests: line 60: chaff[*]: bad array subscript
 ./assoc.tests: line 61: [*]=12: invalid associative array key
-declare -A wheat=([six]="6" ["foo bar"]="qux qix" )
+declare -A wheat=(["foo bar"]="qux qix" [six]="6" )
 argv[1] = <qux>
 argv[2] = <qix>
 argv[1] = <qux qix>
-declare -A wheat=([six]="6" ["foo bar"]="qux qix" )
+declare -A wheat=(["foo bar"]="qux qix" [six]="6" )
 argv[1] = <2>
 argv[1] = <7>
 argv[1] = <qux>
@@ -48,16 +48,16 @@ argv[3] = <blat>
 argv[1] = <qux qix blat>
 argv[1] = <16>
 argv[1] = <16>
-argv[1] = <6>
-argv[2] = <flix>
-argv[1] = <six>
-argv[2] = <foo>
-argv[3] = <bar>
-argv[1] = <six>
-argv[2] = <foo bar>
+argv[1] = <flix>
+argv[2] = <6>
+argv[1] = <foo>
+argv[2] = <bar>
+argv[3] = <six>
+argv[1] = <foo bar>
+argv[2] = <six>
 8
-. /sbin /usr/bin /bin /usr/ucb /usr/local/bin /bin /usr/sbin
-. sbin bin bin ucb bin bin sbin
+/sbin /usr/bin /bin /usr/ucb /usr/local/bin . /usr/sbin /bin
+sbin bin bin ucb bin . sbin bin
 bin
 / / / / / / /
 /
@@ -66,83 +66,83 @@ argv[1] = </>
 argv[1] = <sbin>
 argv[1] = </>
 8
-. /sbin /usr/bin /bin /usr/ucb /usr/local/bin /bin /usr/sbin
-. sbin bin bin ucb bin bin sbin
+/sbin /usr/bin /bin /usr/ucb /usr/local/bin . /usr/sbin /bin
+sbin bin bin ucb bin . sbin bin
 / / / / / / /
 8
 4 -- /bin
-. ^sbin ^usr^bin ^bin ^usr^ucb ^usr^local^bin ^bin ^usr^sbin
-. ^sbin ^usr^bin ^bin ^usr^ucb ^usr^local^bin ^bin ^usr^sbin
-. \sbin \usr/bin \bin \usr/ucb \usr/local/bin \bin \usr/sbin
-. \sbin \usr\bin \bin \usr\ucb \usr\local\bin \bin \usr\sbin
-. \sbin \usr\bin \bin \usr\ucb \usr\local\bin \bin \usr\sbin
+^sbin ^usr^bin ^bin ^usr^ucb ^usr^local^bin . ^usr^sbin ^bin
+^sbin ^usr^bin ^bin ^usr^ucb ^usr^local^bin . ^usr^sbin ^bin
+\sbin \usr/bin \bin \usr/ucb \usr/local/bin . \usr/sbin \bin
+\sbin \usr\bin \bin \usr\ucb \usr\local\bin . \usr\sbin \bin
+\sbin \usr\bin \bin \usr\ucb \usr\local\bin . \usr\sbin \bin
 ([a]=1)
 
-qux foo
-/usr/local/bin/qux /usr/sbin/foo
+foo qux
+/usr/sbin/foo /usr/local/bin/qux
 hits	command
    0	/sbin/blat
-   0	/usr/local/bin/qux
-   0	/bin/sh
    0	/usr/sbin/foo
-blat qux sh foo
-/sbin/blat /usr/local/bin/qux /bin/sh /usr/sbin/foo
+   0	/bin/sh
+   0	/usr/local/bin/qux
+blat foo sh qux
+/sbin/blat /usr/sbin/foo /bin/sh /usr/local/bin/qux
 
-qux foo
-argv[1] = </usr/local/bin/qux>
-argv[2] = <-l>
-argv[3] = </usr/sbin/foo>
+foo qux
+argv[1] = </usr/sbin/foo>
+argv[2] = </usr/local/bin/qux>
+argv[3] = <-l>
 alias blat='cd /blat ; echo $PWD'
 alias foo='/usr/sbin/foo'
 alias qux='/usr/local/bin/qux -l'
 alias sh='/bin/bash --login -o posix'
-blat qux sh foo
+blat foo sh qux
 argv[1] = <cd /blat ; echo $PWD>
-argv[2] = </usr/local/bin/qux -l>
+argv[2] = </usr/sbin/foo>
 argv[3] = </bin/bash --login -o posix>
-argv[4] = </usr/sbin/foo>
+argv[4] = </usr/local/bin/qux -l>
 outside: outside
 declare -A BASH_ALIASES=()
 declare -A BASH_CMDS=()
-declare -A afoo=([six]="six" ["foo bar"]="foo quux" )
+declare -A afoo=(["foo bar"]="foo quux" [six]="six" )
 argv[1] = <inside:>
-argv[2] = <six>
-argv[3] = <foo quux>
+argv[2] = <foo quux>
+argv[3] = <six>
 outside 2: outside
-argv[1] = <fooq//barq/>
-argv[1] = <fooq>
-argv[2] = <>
-argv[3] = <barq>
-argv[4] = <>
-argv[1] = <foo!//bar!/>
-argv[1] = <foo!>
-argv[2] = <>
-argv[3] = <bar!>
-argv[4] = <>
-argv[1] = <ooq//arq/>
-argv[1] = <ooq>
-argv[2] = <>
-argv[3] = <arq>
-argv[4] = <>
-argv[1] = <Fooq//Barq/>
-argv[1] = <Fooq>
-argv[2] = <>
-argv[3] = <Barq>
-argv[4] = <>
-argv[1] = <FOOQ//BARQ/>
-argv[1] = <FOOQ>
-argv[2] = <>
-argv[3] = <BARQ>
-argv[4] = <>
+argv[1] = </barq//fooq>
+argv[1] = <>
+argv[2] = <barq>
+argv[3] = <>
+argv[4] = <fooq>
+argv[1] = </bar!//foo!>
+argv[1] = <>
+argv[2] = <bar!>
+argv[3] = <>
+argv[4] = <foo!>
+argv[1] = </arq//ooq>
+argv[1] = <>
+argv[2] = <arq>
+argv[3] = <>
+argv[4] = <ooq>
+argv[1] = </Barq//Fooq>
+argv[1] = <>
+argv[2] = <Barq>
+argv[3] = <>
+argv[4] = <Fooq>
+argv[1] = </BARQ//FOOQ>
+argv[1] = <>
+argv[2] = <BARQ>
+argv[3] = <>
+argv[4] = <FOOQ>
 abc
 def
 def
 ./assoc5.sub: line 13: declare: `myarray[foo[bar]=bleh': not a valid identifier
-bleh abc def
-myarray=(["a]=test1;#a"]="123" [foo]="bleh" ["a]a"]="abc" ["]"]="def" )
+bleh def abc
+myarray=([foo]="bleh" ["]"]="def" ["a]=test1;#a"]="123" ["a]a"]="abc" )
 
 123
-myarray=(["a]=test1;#a"]="123" [foo]="bleh" ["a]a"]="abc" ["a]=test2;#a"]="def" ["]"]="def" )
+myarray=([foo]="bleh" ["]"]="def" ["a]=test2;#a"]="def" ["a]=test1;#a"]="123" ["a]a"]="abc" )
 bar"bie
 doll
 declare -A foo=(["bar\"bie"]="doll" )
@@ -195,15 +195,15 @@ declare -A assoc=([0]="assoc" )
 assoc
 declare -A assoc=([two]="twoless" [three]="three" [one]="onemore" )
 declare -Ar assoc=([two]="twoless" [three]="three" [one]="onemore" )
-declare -A b=(["\""]="" [")"]="" ["\\"]="" ["]"]="" ["\`"]="" )
+declare -A b=([")"]="" ["\""]="" ["]"]="" ["\\"]="" ["\`"]="" )
 declare -A b=(["]"]="" ["\`"]="" )
-declare -A dict=(["\""]="1" ["'"]="3" ["\\"]="4" ["\`"]="2" )
-./assoc9.sub: line 23: unset: `dict["]': not a valid identifier
+declare -A dict=(["'"]="3" ["\""]="1" ["\\"]="4" ["\`"]="2" )
 ./assoc9.sub: line 23: unset: `dict[']': not a valid identifier
+./assoc9.sub: line 23: unset: `dict["]': not a valid identifier
 ./assoc9.sub: line 23: unset: `dict[\]': not a valid identifier
 ./assoc9.sub: line 23: unset: `dict[`]': not a valid identifier
-declare -A dict=(["\""]="1" ["'"]="3" ["\\"]="4" ["\`"]="2" )
-declare -A dict=(["\""]="1" ["'"]="3" ["\\"]="4" ["\`"]="2" )
+declare -A dict=(["'"]="3" ["\""]="1" ["\\"]="4" ["\`"]="2" )
+declare -A dict=(["'"]="3" ["\""]="1" ["\\"]="4" ["\`"]="2" )
 declare -A dict=()
 4
 4