PROCINFO sorting only if not posix. Doc updates.

6 files changed, 154 insertions, 144 deletions

diff --git a/ChangeLog b/ChangeLog
index 5c439df7..c1275dba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May  5 21:22:44 2011  Arnold D. Robbins  <arnold@skeeve.com>
+
+	* eval.c (r_interpret): PROCINFO sorting only takes effect
+	if not do_posix.
+
 Wed May  4 23:31:14 2011  Arnold D. Robbins  <arnold@skeeve.com>
 
 	Move array sorting to using predefined strings, add value sorting
diff --git a/doc/gawk.1 b/doc/gawk.1
index f7ec6d18..c11c59e7 100644
--- a/doc/gawk.1
+++ b/doc/gawk.1
@@ -14,7 +14,7 @@
 .		if \w'\(rq' .ds rq "\(rq
 .	\}
 .\}
-.TH GAWK 1 "Apr 29 2011" "Free Software Foundation" "Utility Commands"
+.TH GAWK 1 "May 5 2011" "Free Software Foundation" "Utility Commands"
 .SH NAME
 gawk \- pattern scanning and processing language
 .SH SYNOPSIS
@@ -1088,17 +1088,18 @@ are traversed in
 .B for
 loops.
 Supported values are
-\fB"ascending index string"\fR,
-\fB"ascending index number"\fR,
-\fB"ascending value string"\fR,
-\fB"ascending value number"\fR,
-\fB"descending index string"\fR,
-\fB"descending index number"\fR,
-\fB"descending value string"\fR,
-\fB"descending value number"\fR, and
-\fB"unsorted"\fR.
-The order specification words can be truncated, or omitted (provided
-that at least one is present), or given in any order.
+\fB"@ind_str_asc"\fR,
+\fB"@ind_num_asc"\fR,
+\fB"@val_type_asc"\fR,
+\fB"@val_str_asc"\fR,
+\fB"@val_num_asc"\fR,
+\fB"@ind_str_desc"\fR,
+\fB"@ind_num_desc"\fR,
+\fB"@val_type_desc"\fR,
+\fB"@val_str_desc"\fR,
+\fB"@val_num_desc"\fR,
+and
+\fB"@unsorted"\fR.
 The value can also be the name of any comparison function defined
 as follows:
 .PP
@@ -2494,11 +2495,8 @@ controls the direction and the comparsion mode.
 Valid values for
 .I how
 are
-\fB"ascending string"\fR,
-\fB"ascending number"\fR,
-\fB"descending string\fR"
-and
-\fB"descending number"\fR.
+any of the strings valid for
+\fBPROCINFO["sorted_in"]\fR.
 It can also be the name of a user-defined
 comparison function as described in
 \fBPROCINFO["sorted_in"]\fR.
diff --git a/eval.c b/eval.c
index 8e0eff99..02ca13e3 100644
--- a/eval.c
+++ b/eval.c
@@ -2197,8 +2197,11 @@ post:
 				sorted_in = make_string("sorted_in", 9);
 
 			sort_str = NULL;
-			/* if there's no PROCINFO[], there's no ["sorted_in"], so no sorting */
-			if (PROCINFO_node != NULL)
+			/*
+			 * If posix, or if there's no PROCINFO[],
+			 * there's no ["sorted_in"], so no sorting
+			 */
+			if (! do_posix && PROCINFO_node != NULL)
 				sort_str = in_array(PROCINFO_node, sorted_in);
 
 			if (sort_str != NULL) {
@@ -2209,9 +2212,11 @@ post:
 
 			list = assoc_list(array, how_to_sort, SORTED_IN);
 
-			list[num_elems] = array;      /* actual array for use in
-			                               * lint warning in Op_arrayfor_incr
-			                               */
+			/*
+			 * Actual array for use in lint warning
+			 * in Op_arrayfor_incr
+                         */
+			list[num_elems] = array;
 
 arrayfor:
 			getnode(r);
diff --git a/test/Makefile.am b/test/Makefile.am
index 8564abe8..5c4b8d25 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -744,70 +744,70 @@ TESTS_WE_ARE_NOT_DOING_YET_FIXME_ONE_DAY = longdbl
 CLEANFILES = core core.* fmtspcl.ok
 
 # try to keep these sorted
-BASIC_TESTS = addcomma anchgsub argarray arrayparm arrayprm2 arrayprm3 \
+BASIC_TESTS = \
+	addcomma anchgsub argarray arrayparm arrayprm2 arrayprm3 \
 	arrayref arrymem1 arryref2 arryref3 arryref4 arryref5 arynasty \
 	arynocls aryprm1 aryprm2 aryprm3 aryprm4 aryprm5 aryprm6 aryprm7 \
 	aryprm8 arysubnm asgext awkpath back89 backgsub childin clobber \
-	closebad clsflnam compare compare2 concat1 concat2 concat3 concat4 \
-	convfmt datanonl defref delarpm2 delarprm delfunc dynlj eofsplit \
-	exit \
-	exitval1 exitval2 fcall_exit fcall_exit2 fldchg fldchgnf fnamedat \
-	fnarray fnarray2 fnaryscl fnasgnm fnmisc fordel forref forsimp \
-	fsbs fsrs fsspcoln fstabplus funsemnl funsmnam funstack getline \
-	getline2 getline3 getlnbuf getnr2tb getnr2tm gsubasgn gsubtest gsubtst2 \
-	gsubtst3 gsubtst4 gsubtst5 gsubtst6 hex hsprint inputred intest intprec iobug1 \
-	leaddig leadnl litoct longsub longwrds manglprm math membug1 messages \
-	minusstr mmap8k mtchi18n nasty nasty2 negexp negrange nested next \
-	nfldstr nfneg \
+	closebad clsflnam compare compare2 concat1 concat2 concat3 \
+	concat4 convfmt datanonl defref delarpm2 delarprm delfunc dynlj \
+	eofsplit exit exitval1 exitval2 fcall_exit fcall_exit2 fldchg \
+	fldchgnf fnamedat fnarray fnarray2 fnaryscl fnasgnm fnmisc fordel \
+	forref forsimp fsbs fsrs fsspcoln fstabplus funsemnl funsmnam \
+	funstack getline getline2 getline3 getlnbuf getnr2tb getnr2tm \
+	gsubasgn gsubtest gsubtst2 gsubtst3 gsubtst4 gsubtst5 gsubtst6 \
+	hex hsprint inputred intest intprec iobug1 leaddig leadnl litoct \
+	longsub longwrds manglprm math membug1 messages minusstr mmap8k \
+	mtchi18n nasty nasty2 negexp negrange nested next nfldstr nfneg \
 	nfset nlfldsep nlinstr nlstrina noeffect nofile nofmtch noloop1 \
-	noloop2 nonl noparms nors nulrsend numindex numsubstr octsub ofmt ofmta \
-	ofmtbig ofmtfidl ofmts onlynl opasnidx opasnslf paramdup paramres \
-	paramtyp parse1 parsefld parseme pcntplus prdupval prec printf0 \
-	printf1 prmarscl prmreuse prt1eval prtoeval posix2008sub rand range1 \
-	rebt8b1 \
-	redfilnm regeq reindops reparse resplit rs rsnul1nl rsnulbig rsnulbig2 \
-	rstest1 rstest2 rstest3 rstest4 rstest5 rswhite scalar sclforin sclifin \
-	sortempty splitargv splitarr splitdef splitvar splitwht strcat1 strnum1 \
-	strtod subamp subi18n subsepnm subslash substr swaplns synerr1 synerr2 \
-	tradanch tweakfld uninit2 uninit3 uninit4 uninit5 uninitialized unterm \
-	uparrfs wideidx wideidx2 widesub widesub2 widesub3 widesub4 wjposer1 \
-	zero2 zeroe0 zeroflag
-
-UNIX_TESTS = fflush getlnhd localenl pid pipeio1 pipeio2 poundbang space strftlng
+	noloop2 nonl noparms nors nulrsend numindex numsubstr octsub ofmt \
+	ofmta ofmtbig ofmtfidl ofmts onlynl opasnidx opasnslf paramdup \
+	paramres paramtyp parse1 parsefld parseme pcntplus posix2008sub \
+	prdupval prec printf0 printf1 prmarscl prmreuse prt1eval prtoeval \
+	rand range1 rebt8b1 redfilnm regeq reindops reparse resplit rs \
+	rsnul1nl rsnulbig rsnulbig2 rstest1 rstest2 rstest3 rstest4 \
+	rstest5 rswhite scalar sclforin sclifin sortempty splitargv \
+	splitarr splitdef splitvar splitwht strcat1 strnum1 strtod subamp \
+	subi18n subsepnm subslash substr swaplns synerr1 synerr2 tradanch \
+	tweakfld uninit2 uninit3 uninit4 uninit5 uninitialized unterm \
+	uparrfs wideidx wideidx2 widesub widesub2 widesub3 widesub4 \
+	wjposer1 zero2 zeroe0 zeroflag
+
+UNIX_TESTS = \
+	fflush getlnhd localenl pid pipeio1 pipeio2 poundbang space strftlng
 
 GAWK_EXT_TESTS = \
-	aadelete1 aadelete2 aarray1 aasort aasorti \
-	arraysort \
-	argtest backw badargs beginfile1 binmode1 clos1way \
-	delsub devfd devfd1 devfd2 dumpvars \
-	fieldwdth fpat1 funlen fsfwfs fwtest fwtest2 gensub gensub2 getlndir \
-	gnuops2 gnuops3 gnureops \
-	icasefs icasers igncdym igncfs ignrcas2 ignrcase indirectcall lint \
-	lintwarn \
-	lintold manyfiles match1 match2 match3 mbstr1 nondec \
-	nastyparm nondec2 patsplit \
-	posix profile1 profile2 profile3 printfbad1 printfbad2 \
-	procinfs rebuf regx8bit reint reint2 rsstart1 rsstart2 rsstart3 \
+	aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort backw \
+	badargs beginfile1 binmode1 clos1way delsub devfd devfd1 devfd2 \
+	dumpvars fieldwdth fpat1 fsfwfs funlen fwtest fwtest2 gensub \
+	gensub2 getlndir gnuops2 gnuops3 gnureops icasefs icasers igncdym \
+	igncfs ignrcas2 ignrcase indirectcall lint lintold lintwarn \
+	manyfiles match1 match2 match3 mbstr1 nastyparm nondec nondec2 \
+	patsplit posix printfbad1 printfbad2 procinfs profile1 profile2 \
+	profile3 rebuf regx8bit reint reint2 rsstart1 rsstart2 rsstart3 \
 	rstest6 shadow sortfor sortu splitarg4 strftime strtonum switch2
 
-EXTRA_TESTS = regtest inftest
+EXTRA_TESTS = inftest regtest
 
-INET_TESTS = inetechu inetecht inetdayu inetdayt
+INET_TESTS = inetdayu inetdayt inetechu inetecht
 
 MACHINE_TESTS = double1 double2 fmtspcl intformat
 
-LOCALE_CHARSET_TESTS = asort asorti fmttest fnarydel fnparydl lc_num1 mbfw1 \
+LOCALE_CHARSET_TESTS = \
+	asort asorti fmttest fnarydel fnparydl lc_num1 mbfw1 \
 	mbprintf1 mbprintf2 mbprintf3 rebt8b2 sort1 sprintfc
 
 # List of the tests which should be run with --lint option:
-NEED_LINT = defref fmtspcl lintwarn noeffect nofmtch shadow \
+NEED_LINT = \
+	defref fmtspcl lintwarn noeffect nofmtch shadow \
 	uninit2 uninit3 uninit4 uninit5 uninitialized
 
 # List of the tests which should be run with --lint-old option:
 NEED_LINT_OLD = lintold
 
 # List of the tests which fail with EXIT CODE 1
-FAIL_CODE1 = fnarray2 fnmisc gsubasgn mixed1 noparms paramdup synerr1 synerr2 unterm
+FAIL_CODE1 = \
+	fnarray2 fnmisc gsubasgn mixed1 noparms paramdup synerr1 synerr2 unterm
 
 # List of the files that appear in manual tests or are for reserve testing:
 GENTESTS_UNUSED = Makefile.in gtlnbufv.awk printfloat.awk
diff --git a/test/Makefile.in b/test/Makefile.in
index 4fd76480..c085fdbe 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -929,60 +929,60 @@ TESTS_WE_ARE_NOT_DOING_YET_FIXME_ONE_DAY = longdbl
 CLEANFILES = core core.* fmtspcl.ok
 
 # try to keep these sorted
-BASIC_TESTS = addcomma anchgsub argarray arrayparm arrayprm2 arrayprm3 \
+BASIC_TESTS = \
+	addcomma anchgsub argarray arrayparm arrayprm2 arrayprm3 \
 	arrayref arrymem1 arryref2 arryref3 arryref4 arryref5 arynasty \
 	arynocls aryprm1 aryprm2 aryprm3 aryprm4 aryprm5 aryprm6 aryprm7 \
 	aryprm8 arysubnm asgext awkpath back89 backgsub childin clobber \
-	closebad clsflnam compare compare2 concat1 concat2 concat3 concat4 \
-	convfmt datanonl defref delarpm2 delarprm delfunc dynlj eofsplit \
-	exit \
-	exitval1 exitval2 fcall_exit fcall_exit2 fldchg fldchgnf fnamedat \
-	fnarray fnarray2 fnaryscl fnasgnm fnmisc fordel forref forsimp \
-	fsbs fsrs fsspcoln fstabplus funsemnl funsmnam funstack getline \
-	getline2 getline3 getlnbuf getnr2tb getnr2tm gsubasgn gsubtest gsubtst2 \
-	gsubtst3 gsubtst4 gsubtst5 gsubtst6 hex hsprint inputred intest intprec iobug1 \
-	leaddig leadnl litoct longsub longwrds manglprm math membug1 messages \
-	minusstr mmap8k mtchi18n nasty nasty2 negexp negrange nested next \
-	nfldstr nfneg \
+	closebad clsflnam compare compare2 concat1 concat2 concat3 \
+	concat4 convfmt datanonl defref delarpm2 delarprm delfunc dynlj \
+	eofsplit exit exitval1 exitval2 fcall_exit fcall_exit2 fldchg \
+	fldchgnf fnamedat fnarray fnarray2 fnaryscl fnasgnm fnmisc fordel \
+	forref forsimp fsbs fsrs fsspcoln fstabplus funsemnl funsmnam \
+	funstack getline getline2 getline3 getlnbuf getnr2tb getnr2tm \
+	gsubasgn gsubtest gsubtst2 gsubtst3 gsubtst4 gsubtst5 gsubtst6 \
+	hex hsprint inputred intest intprec iobug1 leaddig leadnl litoct \
+	longsub longwrds manglprm math membug1 messages minusstr mmap8k \
+	mtchi18n nasty nasty2 negexp negrange nested next nfldstr nfneg \
 	nfset nlfldsep nlinstr nlstrina noeffect nofile nofmtch noloop1 \
-	noloop2 nonl noparms nors nulrsend numindex numsubstr octsub ofmt ofmta \
-	ofmtbig ofmtfidl ofmts onlynl opasnidx opasnslf paramdup paramres \
-	paramtyp parse1 parsefld parseme pcntplus prdupval prec printf0 \
-	printf1 prmarscl prmreuse prt1eval prtoeval posix2008sub rand range1 \
-	rebt8b1 \
-	redfilnm regeq reindops reparse resplit rs rsnul1nl rsnulbig rsnulbig2 \
-	rstest1 rstest2 rstest3 rstest4 rstest5 rswhite scalar sclforin sclifin \
-	sortempty splitargv splitarr splitdef splitvar splitwht strcat1 strnum1 \
-	strtod subamp subi18n subsepnm subslash substr swaplns synerr1 synerr2 \
-	tradanch tweakfld uninit2 uninit3 uninit4 uninit5 uninitialized unterm \
-	uparrfs wideidx wideidx2 widesub widesub2 widesub3 widesub4 wjposer1 \
-	zero2 zeroe0 zeroflag
-
-UNIX_TESTS = fflush getlnhd localenl pid pipeio1 pipeio2 poundbang space strftlng
+	noloop2 nonl noparms nors nulrsend numindex numsubstr octsub ofmt \
+	ofmta ofmtbig ofmtfidl ofmts onlynl opasnidx opasnslf paramdup \
+	paramres paramtyp parse1 parsefld parseme pcntplus posix2008sub \
+	prdupval prec printf0 printf1 prmarscl prmreuse prt1eval prtoeval \
+	rand range1 rebt8b1 redfilnm regeq reindops reparse resplit rs \
+	rsnul1nl rsnulbig rsnulbig2 rstest1 rstest2 rstest3 rstest4 \
+	rstest5 rswhite scalar sclforin sclifin sortempty splitargv \
+	splitarr splitdef splitvar splitwht strcat1 strnum1 strtod subamp \
+	subi18n subsepnm subslash substr swaplns synerr1 synerr2 tradanch \
+	tweakfld uninit2 uninit3 uninit4 uninit5 uninitialized unterm \
+	uparrfs wideidx wideidx2 widesub widesub2 widesub3 widesub4 \
+	wjposer1 zero2 zeroe0 zeroflag
+
+UNIX_TESTS = \
+	fflush getlnhd localenl pid pipeio1 pipeio2 poundbang space strftlng
+
 GAWK_EXT_TESTS = \
-	aadelete1 aadelete2 aarray1 aasort aasorti \
-	arraysort \
-	argtest backw badargs beginfile1 binmode1 clos1way \
-	delsub devfd devfd1 devfd2 dumpvars \
-	fieldwdth fpat1 funlen fsfwfs fwtest fwtest2 gensub gensub2 getlndir \
-	gnuops2 gnuops3 gnureops \
-	icasefs icasers igncdym igncfs ignrcas2 ignrcase indirectcall lint \
-	lintwarn \
-	lintold manyfiles match1 match2 match3 mbstr1 nondec \
-	nastyparm nondec2 patsplit \
-	posix profile1 profile2 profile3 printfbad1 printfbad2 \
-	procinfs rebuf regx8bit reint reint2 rsstart1 rsstart2 rsstart3 \
+	aadelete1 aadelete2 aarray1 aasort aasorti argtest arraysort backw \
+	badargs beginfile1 binmode1 clos1way delsub devfd devfd1 devfd2 \
+	dumpvars fieldwdth fpat1 fsfwfs funlen fwtest fwtest2 gensub \
+	gensub2 getlndir gnuops2 gnuops3 gnureops icasefs icasers igncdym \
+	igncfs ignrcas2 ignrcase indirectcall lint lintold lintwarn \
+	manyfiles match1 match2 match3 mbstr1 nastyparm nondec nondec2 \
+	patsplit posix printfbad1 printfbad2 procinfs profile1 profile2 \
+	profile3 rebuf regx8bit reint reint2 rsstart1 rsstart2 rsstart3 \
 	rstest6 shadow sortfor sortu splitarg4 strftime strtonum switch2
 
-EXTRA_TESTS = regtest inftest
-INET_TESTS = inetechu inetecht inetdayu inetdayt
+EXTRA_TESTS = inftest regtest
+INET_TESTS = inetdayu inetdayt inetechu inetecht
 MACHINE_TESTS = double1 double2 fmtspcl intformat
-LOCALE_CHARSET_TESTS = asort asorti fmttest fnarydel fnparydl lc_num1 mbfw1 \
+LOCALE_CHARSET_TESTS = \
+	asort asorti fmttest fnarydel fnparydl lc_num1 mbfw1 \
 	mbprintf1 mbprintf2 mbprintf3 rebt8b2 sort1 sprintfc
 
 
 # List of the tests which should be run with --lint option:
-NEED_LINT = defref fmtspcl lintwarn noeffect nofmtch shadow \
+NEED_LINT = \
+	defref fmtspcl lintwarn noeffect nofmtch shadow \
 	uninit2 uninit3 uninit4 uninit5 uninitialized
 
 
@@ -990,7 +990,9 @@ NEED_LINT = defref fmtspcl lintwarn noeffect nofmtch shadow \
 NEED_LINT_OLD = lintold
 
 # List of the tests which fail with EXIT CODE 1
-FAIL_CODE1 = fnarray2 fnmisc gsubasgn mixed1 noparms paramdup synerr1 synerr2 unterm
+FAIL_CODE1 = \
+	fnarray2 fnmisc gsubasgn mixed1 noparms paramdup synerr1 synerr2 unterm
+
 
 # List of the files that appear in manual tests or are for reserve testing:
 GENTESTS_UNUSED = Makefile.in gtlnbufv.awk printfloat.awk
@@ -2292,6 +2294,11 @@ pcntplus:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+posix2008sub:
+	@echo posix2008sub
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 prdupval:
 	@echo prdupval
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2327,11 +2334,6 @@ prtoeval:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
-posix2008sub:
-	@echo posix2008sub
-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
-
 rand:
 	@echo rand
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2612,13 +2614,13 @@ fpat1:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
-funlen:
-	@echo funlen
+fsfwfs:
+	@echo fsfwfs
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
-fsfwfs:
-	@echo fsfwfs
+funlen:
+	@echo funlen
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
@@ -2697,16 +2699,16 @@ lint:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
-lintwarn:
-	@echo lintwarn
-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
-
 lintold:
 	@echo lintold
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  --lint-old < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+lintwarn:
+	@echo lintwarn
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 match1:
 	@echo match1
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -2722,13 +2724,13 @@ match3:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
-nondec:
-	@echo nondec
+nastyparm:
+	@echo nastyparm
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
-nastyparm:
-	@echo nastyparm
+nondec:
+	@echo nondec
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
diff --git a/test/Maketests b/test/Maketests
index 638f64f9..90a3f856 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -580,6 +580,11 @@ pcntplus:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+posix2008sub:
+	@echo posix2008sub
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 prdupval:
 	@echo prdupval
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -615,11 +620,6 @@ prtoeval:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
-posix2008sub:
-	@echo posix2008sub
-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
-
 rand:
 	@echo rand
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -900,13 +900,13 @@ fpat1:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
-funlen:
-	@echo funlen
+fsfwfs:
+	@echo fsfwfs
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
-fsfwfs:
-	@echo fsfwfs
+funlen:
+	@echo funlen
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
@@ -985,16 +985,16 @@ lint:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
-lintwarn:
-	@echo lintwarn
-	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
-	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
-
 lintold:
 	@echo lintold
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  --lint-old < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
+lintwarn:
+	@echo lintwarn
+	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  --lint >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
+	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
+
 match1:
 	@echo match1
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
@@ -1010,13 +1010,13 @@ match3:
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  < $(srcdir)/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
-nondec:
-	@echo nondec
+nastyparm:
+	@echo nastyparm
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@
 
-nastyparm:
-	@echo nastyparm
+nondec:
+	@echo nondec
 	@AWKPATH=$(srcdir) $(AWK) -f $@.awk  >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
 	@-$(CMP) $(srcdir)/$@.ok _$@ && rm -f _$@