X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=x2p%2Fwalk.c;h=d3d5f9189d3147ac229797000b0b0a92788996fe;hb=f3365a56c42f2f31eed84ad55632f9786ee09044;hp=ca1214d488ec4f2cba747ceeab4f22d7bc1f98ad;hpb=663a0e373fc859394758ec18df61983d1fad6d0a;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/x2p/walk.c b/x2p/walk.c
index ca1214d..d3d5f91 100644
--- a/x2p/walk.c
+++ b/x2p/walk.c
@@ -1,29 +1,15 @@
-/* $Header: walk.c,v 3.0.1.3 89/12/21 20:32:35 lwall Locked $
+/*    walk.c
  *
- *    Copyright (c) 1989, Larry Wall
+ *    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1997, 1998, 1999,
+ *    2000, 2001, 2002, 2005 by Larry Wall and others
  *
- *    You may distribute under the terms of the GNU General Public License
- *    as specified in the README file that comes with the perl 3.0 kit.
- *
- * $Log:	walk.c,v $
- * Revision 3.0.1.3  89/12/21  20:32:35  lwall
- * patch7: in a2p, user-defined functions didn't work on some machines
- * 
- * Revision 3.0.1.2  89/11/17  15:53:00  lwall
- * patch5: on Pyramids, index(s, '}' + 128) doesn't find meta-}
- * 
- * Revision 3.0.1.1  89/11/11  05:09:33  lwall
- * patch2: in a2p, awk script with no line actions still needs main loop
- * 
- * Revision 3.0  89/10/18  15:35:48  lwall
- * 3.0 baseline
- * 
+ *    You may distribute under the terms of either the GNU General Public
+ *    License or the Artistic License, as specified in the README file.
  */
 
-#include "handy.h"
 #include "EXTERN.h"
-#include "util.h"
 #include "a2p.h"
+#include "util.h"
 
 bool exitval = FALSE;
 bool realexit = FALSE;
@@ -31,19 +17,30 @@ bool saw_getline = FALSE;
 bool subretnum = FALSE;
 bool saw_FNR = FALSE;
 bool saw_argv0 = FALSE;
+bool saw_fh = FALSE;
 int maxtmp = 0;
-char *lparen;
-char *rparen;
+const char *lparen;
+const char *rparen;
+const char *limit;
 STR *subs;
-STR *curargs = Nullstr;
+STR *curargs = NULL;
+
+static void addsemi ( STR *str );
+static void emit_split ( STR *str, int level );
+static void fixtab ( STR *str, int lvl );
+static void numericize ( int node );
+static void tab ( STR *str, int lvl );
+
+int prewalk ( int numit, int level, int node, int *numericptr );
+STR * walk ( int useval, int level, int node, int *numericptr, int minprec );
+#ifdef NETWARE
+char *savestr(char *str);
+char *cpytill(register char *to, register char *from, register int delim);
+char *instr(char *big, const char *little);
+#endif
 
 STR *
-walk(useval,level,node,numericptr,minprec)
-int useval;
-int level;
-register int node;
-int *numericptr;
-int minprec;			/* minimum precedence without parens */
+walk(int useval, int level, register int node, int *numericptr, int minprec)
 {
     register int len;
     register STR *str;
@@ -58,7 +55,6 @@ int minprec;			/* minimum precedence without parens */
     int numeric = FALSE;
     STR *fstr;
     int prec = P_MAX;		/* assume no parens needed */
-    char *index();
 
     if (!node) {
 	*numericptr = 0;
@@ -69,6 +65,20 @@ int minprec;			/* minimum precedence without parens */
     type &= 255;
     switch (type) {
     case OPROG:
+	arymax = 0;
+	if (namelist) {
+	    while (isALPHA(*namelist)) {
+		for (d = tokenbuf,s=namelist;
+		  isALPHA(*s) || isDIGIT(*s) || *s == '_';
+		  *d++ = *s++) ;
+		*d = '\0';
+		while (*s && !isALPHA(*s)) s++;
+		namelist = s;
+		nameary[++arymax] = savestr(tokenbuf);
+	    }
+	}
+	if (maxfld < arymax)
+	    maxfld = arymax;
 	opens = str_new(0);
 	subs = str_new(0);
 	str = walk(0,level,ops[node+1].ival,&numarg,P_MIN);
@@ -87,7 +97,7 @@ int minprec;			/* minimum precedence without parens */
 	    do_chop = TRUE;
 	if (fswitch) {
 	    str_cat(str,"$FS = '");
-	    if (index("*+?.[]()|^$\\",fswitch))
+	    if (strchr("*+?.[]()|^$\\",fswitch))
 		str_cat(str,"\\");
 	    sprintf(tokenbuf,"%c",fswitch);
 	    str_cat(str,tokenbuf);
@@ -121,23 +131,9 @@ int minprec;			/* minimum precedence without parens */
 	    if (saw_FS && !const_FS)
 		do_chop = TRUE;
 	    if (do_chop) {
-		str_cat(str,"chop;\t# strip record separator\n");
+		str_cat(str,"chomp;\t# strip record separator\n");
 		tab(str,level);
 	    }
-	    arymax = 0;
-	    if (namelist) {
-		while (isalpha(*namelist)) {
-		    for (d = tokenbuf,s=namelist;
-		      isalpha(*s) || isdigit(*s) || *s == '_';
-		      *d++ = *s++) ;
-		    *d = '\0';
-		    while (*s && !isalpha(*s)) s++;
-		    namelist = s;
-		    nameary[++arymax] = savestr(tokenbuf);
-		}
-	    }
-	    if (maxfld < arymax)
-		maxfld = arymax;
 	    if (do_split)
 		emit_split(str,level);
 	    str_scat(str,fstr);
@@ -147,7 +143,7 @@ int minprec;			/* minimum precedence without parens */
 	    if (saw_FNR)
 		str_cat(str,"continue {\n    $FNRbase = $. if eof;\n}\n");
 	}
-	else
+	else if (old_awk)
 	    str_cat(str,"while (<>) { }		# (no line actions)\n");
 	if (ops[node+4].ival) {
 	    realexit = TRUE;
@@ -158,7 +154,7 @@ int minprec;			/* minimum precedence without parens */
 	    str_cat(str,"\n");
 	}
 	if (exitval)
-	    str_cat(str,"exit ExitValue;\n");
+	    str_cat(str,"exit $ExitValue;\n");
 	if (subs->str_ptr) {
 	    str_cat(str,"\n");
 	    str_scat(str,subs);
@@ -179,7 +175,7 @@ int minprec;			/* minimum precedence without parens */
 			    str_cat(str,"    $FNRbase = $. if eof;\n");
 		    }
 		    if (len & 1)
-			str_cat(str,"    local($_)\n");
+			str_cat(str,"    local($_);\n");
 		    if (len & 2)
 			str_cat(str,
 			  "    if ($getline_ok = (($_ = <$fh>) ne ''))");
@@ -192,7 +188,7 @@ int minprec;			/* minimum precedence without parens */
 		    i = 0;
 		    if (do_chop) {
 			i++;
-			str_cat(str,"chop;\t# strip record separator\n");
+			str_cat(str,"chomp;\t# strip record separator\n");
 			tab(str,level);
 		    }
 		    if (do_split && !(len & 1)) {
@@ -211,11 +207,8 @@ int minprec;			/* minimum precedence without parens */
 	    str_cat(str,"\n\
 sub Pick {\n\
     local($mode,$name,$pipe) = @_;\n\
-    $fh = $opened{$name};\n\
-    if (!$fh) {\n\
-	$fh = $opened{$name} = 'fh_' . ($nextfh++ + 0);\n\
-	open($fh,$mode.$name.$pipe);\n\
-    }\n\
+    $fh = $name;\n\
+    open($name,$mode.$name.$pipe) unless $opened{$name}++;\n\
 }\n\
 ");
 	}
@@ -246,7 +239,7 @@ sub Pick {\n\
 	tmpstr=walk(0,level,ops[node+1].ival,&numarg,P_MIN);
 	/* translate \nnn to [\nnn] */
 	for (s = tmpstr->str_ptr, d = tokenbuf; *s; s++, d++) {
-	    if (*s == '\\' && isdigit(s[1]) && isdigit(s[2]) && isdigit(s[3])){
+	    if (*s == '\\' && isDIGIT(s[1]) && isDIGIT(s[2]) && isDIGIT(s[3])){
 		*d++ = '[';
 		*d++ = *s++;
 		*d++ = *s++;
@@ -259,7 +252,7 @@ sub Pick {\n\
 	}
 	*d = '\0';
 	for (d=tokenbuf; *d; d++)
-	    *d += 128;
+           *d += (char)128;
 	str_cat(str,tokenbuf);
 	str_free(tmpstr);
 	str_cat(str,"/");
@@ -324,6 +317,16 @@ sub Pick {\n\
 	str_scat(str,fstr=walk(1,level,ops[node+1].ival,&numarg,prec));
 	str_free(fstr);
 	break;
+    case OCOND:
+	prec = P_COND;
+	str = walk(1,level,ops[node+1].ival,&numarg,prec);
+	str_cat(str," ? ");
+	str_scat(str,fstr=walk(1,level,ops[node+2].ival,&numarg,prec+1));
+	str_free(fstr);
+	str_cat(str," : ");
+	str_scat(str,fstr=walk(1,level,ops[node+3].ival,&numarg,prec+1));
+	str_free(fstr);
+	break;
     case OCPAREN:
 	str = str_new(0);
 	str_set(str,"(");
@@ -382,8 +385,8 @@ sub Pick {\n\
 		str_set(tmpstr,"gt");
 	    else if (strEQ(t,">="))
 		str_set(tmpstr,"ge");
-	    if (!index(tmpstr->str_ptr,'\'') && !index(tmpstr->str_ptr,'"') &&
-	      !index(tmp2str->str_ptr,'\'') && !index(tmp2str->str_ptr,'"') )
+	    if (!strchr(tmpstr->str_ptr,'\'') && !strchr(tmpstr->str_ptr,'"') &&
+	      !strchr(tmp2str->str_ptr,'\'') && !strchr(tmp2str->str_ptr,'"') )
 		numeric |= 2;
 	}
 	if (numeric & 2) {
@@ -458,6 +461,8 @@ sub Pick {\n\
 	str_scat(str,fstr=walk(1,level,ops[node+3].ival,&numarg,prec));
 	str_free(fstr);
 	numeric |= numarg;
+	if (strEQ(str->str_ptr,"$/ = ''"))
+	    str_set(str, "$/ = \"\\n\\n\"");
 	break;
     case OADD:
 	prec = P_ADD;
@@ -560,10 +565,9 @@ sub Pick {\n\
 	if (useval)
 	    str_cat(str,"(");
 	if (len > 0) {
-	    str_cat(str,"$");
 	    str_scat(str,fstr=walk(1,level,ops[node+1].ival,&numarg,P_MIN));
 	    if (!*fstr->str_ptr) {
-		str_cat(str,"_");
+		str_cat(str,"$_");
 		len = 2;		/* a legal fiction */
 	    }
 	    str_free(fstr);
@@ -583,11 +587,13 @@ sub Pick {\n\
 		s = savestr(tokenbuf);
 		for (t = tokenbuf; *t; t++) {
 		    *t &= 127;
-		    if (!isalpha(*t) && !isdigit(*t))
+		    if (isLOWER(*t))
+			*t = toUPPER(*t);
+		    if (!isALPHA(*t) && !isDIGIT(*t))
 			*t = '_';
 		}
-		if (!index(tokenbuf,'_'))
-		    strcpy(t,"_fh");
+		if (!strchr(tokenbuf,'_'))
+		    strcpy(t,"_FH");
 		tmp3str = hfetch(symtab,tokenbuf);
 		if (!tmp3str) {
 		    do_opens = TRUE;
@@ -647,13 +653,11 @@ sub Pick {\n\
 	str_cat(str,", ");
 	str_scat(str,fstr=walk(1,level,ops[node+2].ival,&numarg,P_COMMA+1));
 	str_free(fstr);
-	str_cat(str,", ");
 	if (len == 3) {
+	    str_cat(str,", ");
 	    str_scat(str,fstr=walk(1,level,ops[node+3].ival,&numarg,P_COMMA+1));
 	    str_free(fstr);
 	}
-	else
-	    str_cat(str,"999999");
 	str_cat(str,")");
 	break;
     case OSTRING:
@@ -662,6 +666,7 @@ sub Pick {\n\
 	break;
     case OSPLIT:
 	str = str_new(0);
+	limit = ", -1)";
 	numeric = 1;
 	tmpstr = walk(1,level,ops[node+2].ival,&numarg,P_MIN);
 	if (useval)
@@ -674,8 +679,10 @@ sub Pick {\n\
 	    fstr = walk(1,level,ops[node+3].ival,&numarg,P_COMMA+1);
 	    if (str_len(fstr) == 3 && *fstr->str_ptr == '\'') {
 		i = fstr->str_ptr[1] & 127;
-		if (index("*+?.[]()|^$\\",i))
+		if (strchr("*+?.[]()|^$\\",i))
 		    sprintf(tokenbuf,"/\\%c/",i);
+		else if (i == ' ')
+		    sprintf(tokenbuf,"' '");
 		else
 		    sprintf(tokenbuf,"/%c/",i);
 		str_cat(str,tokenbuf);
@@ -690,12 +697,14 @@ sub Pick {\n\
 	}
 	else if (saw_FS)
 	    str_cat(str,"$FS");
-	else
+	else {
 	    str_cat(str,"' '");
+	    limit = ")";
+	}
 	str_cat(str,", ");
 	str_scat(str,fstr=walk(1,level,ops[node+1].ival,&numarg,P_COMMA+1));
 	str_free(fstr);
-	str_cat(str,", 999)");
+	str_cat(str,limit);
 	if (useval) {
 	    str_cat(str,")");
 	}
@@ -732,12 +741,12 @@ sub Pick {\n\
 	str_cat(curargs,",");
 	tmp2str=walk(1,level,ops[node+5].ival,&numarg,P_MIN);
 	str_free(curargs);
-	curargs = Nullstr;
+	curargs = NULL;
 	level--;
 	subretnum |= numarg;
-	s = Nullch;
+	s = NULL;
 	t = tmp2str->str_ptr;
-	while (t = instr(t,"return "))
+	while ((t = instr(t,"return ")))
 	    s = t++;
 	if (s) {
 	    i = 0;
@@ -809,11 +818,8 @@ sub Pick {\n\
 	str_cat(str,")");
 	break;
     case OGSUB:
-    case OSUB:
-	if (type == OGSUB)
-	    s = "g";
-	else
-	    s = "";
+    case OSUB: {
+	int gsub = type == OGSUB ? 1 : 0;
 	str = str_new(0);
 	tmpstr = str_new(0);
 	i = 0;
@@ -832,26 +838,31 @@ sub Pick {\n\
 	len = type >> 8;
 	type &= 255;
 	tmp3str = str_new(0);
-	if (type == OSTR) {
+	{
+	  const char *s;
+	  if (type == OSTR) {
 	    tmp2str=walk(1,level,ops[ops[node+2].ival+1].ival,&numarg,P_MIN);
 	    for (t = tmp2str->str_ptr, d=tokenbuf; *t; d++,t++) {
 		if (*t == '&')
-		    *d++ = '$' + 128;
-		else if (*t == '$')
-		    *d++ = '\\' + 128;
+                   *d++ = '$' + (char)128;
+		else if (*t == '$' || *t == '/')
+                   *d++ = '\\' + (char)128;
 		*d = *t + 128;
 	    }
 	    *d = '\0';
 	    str_set(tmp2str,tokenbuf);
-	}
-	else {
+	    s = (gsub ? "/g" : "/");
+	  }
+	  else {
 	    tmp2str=walk(1,level,ops[node+2].ival,&numarg,P_MIN);
 	    str_set(tmp3str,"($s_ = '\"'.(");
 	    str_scat(tmp3str,tmp2str);
 	    str_cat(tmp3str,").'\"') =~ s/&/\\$&/g, ");
 	    str_set(tmp2str,"eval $s_");
-	    s = (*s == 'g' ? "ge" : "e");
+	    s = (gsub ? "/ge" : "/e");
 	    i++;
+	  }
+	  str_cat(tmp2str,s);
 	}
 	type = ops[ops[node+1].ival].ival;
 	len = type >> 8;
@@ -864,8 +875,6 @@ sub Pick {\n\
 	    str_scat(str,tmpstr);
 	    str_scat(str,fstr);
 	    str_scat(str,tmp2str);
-	    str_cat(str,"/");
-	    str_cat(str,s);
 	}
 	else if ((type == OFLD && !split_to_array) || (type == OVAR && len == 1)) {
 	    if (useval && i)
@@ -876,8 +885,6 @@ sub Pick {\n\
 	    str_scat(str,fstr);
 	    str_cat(str,"/");
 	    str_scat(str,tmp2str);
-	    str_cat(str,"/");
-	    str_cat(str,s);
 	}
 	else {
 	    i++;
@@ -890,8 +897,6 @@ sub Pick {\n\
 	    str_scat(str,tmpstr);
 	    str_cat(str,"/$s/");
 	    str_scat(str,tmp2str);
-	    str_cat(str,"/");
-	    str_cat(str,s);
 	}
 	if (useval && i)
 	    str_cat(str,")");
@@ -900,35 +905,37 @@ sub Pick {\n\
 	str_free(tmp2str);
 	str_free(tmp3str);
 	numeric = 1;
-	break;
+	break; }
     case ONUM:
 	str = walk(1,level,ops[node+1].ival,&numarg,P_MIN);
 	numeric = 1;
 	break;
     case OSTR:
 	tmpstr = walk(1,level,ops[node+1].ival,&numarg,P_MIN);
-	s = "'";
-	for (t = tmpstr->str_ptr, d=tokenbuf; *t; d++,t++) {
+	{
+	  const char *s = "'";
+	  for (t = tmpstr->str_ptr, d=tokenbuf; *t; d++,t++) {
 	    if (*t == '\'')
 		s = "\"";
 	    else if (*t == '\\') {
 		s = "\"";
 		*d++ = *t++ + 128;
 		switch (*t) {
-		case '\\': case '"': case 'n': case 't':
+		case '\\': case '"': case 'n': case 't': case '$':
 		    break;
 		default:	/* hide this from perl */
-		    *d++ = '\\' + 128;
+                   *d++ = '\\' + (char)128;
 		}
 	    }
 	    *d = *t + 128;
+	  }
+	  *d = '\0';
+	  str = str_new(0);
+	  str_set(str,s);
+	  str_cat(str,tokenbuf);
+	  str_free(tmpstr);
+	  str_cat(str,s);
 	}
-	*d = '\0';
-	str = str_new(0);
-	str_set(str,s);
-	str_cat(str,tokenbuf);
-	str_free(tmpstr);
-	str_cat(str,s);
 	break;
     case ODEFINED:
 	prec = P_UNI;
@@ -995,7 +1002,7 @@ sub Pick {\n\
 		    strcpy(tokenbuf,"]");
 		else
 		    strcpy(tokenbuf,"}");
-		*tokenbuf += 128;
+               *tokenbuf += (char)128;
 		str_cat(str,tokenbuf);
 	    }
 	}
@@ -1047,7 +1054,7 @@ sub Pick {\n\
 	str_set(str,";");
 	tmpstr = walk(0,level,ops[node+1].ival,&numarg,P_MIN);
 	for (s = tmpstr->str_ptr; *s && *s != '\n'; s++)
-	    *s += 128;
+           *s += (char)128;
 	str_scat(str,tmpstr);
 	str_free(tmpstr);
 	tab(str,level);
@@ -1056,7 +1063,7 @@ sub Pick {\n\
 	str = str_new(0);
 	tmpstr = walk(0,level,ops[node+1].ival,&numarg,P_MIN);
 	for (s = tmpstr->str_ptr; *s && *s != '\n'; s++)
-	    *s += 128;
+           *s += (char)128;
 	str_scat(str,tmpstr);
 	str_free(tmpstr);
 	tab(str,level);
@@ -1107,19 +1114,21 @@ sub Pick {\n\
 	    s = savestr(tokenbuf);
 	    for (t = tokenbuf; *t; t++) {
 		*t &= 127;
-		if (!isalpha(*t) && !isdigit(*t))
+		if (isLOWER(*t))
+		    *t = toUPPER(*t);
+		if (!isALPHA(*t) && !isDIGIT(*t))
 		    *t = '_';
 	    }
-	    if (!index(tokenbuf,'_'))
-		strcpy(t,"_fh");
+	    if (!strchr(tokenbuf,'_'))
+		strcpy(t,"_FH");
 	    str_free(tmpstr);
 	    safefree(s);
 	    str_set(str,"close ");
 	    str_cat(str,tokenbuf);
 	}
 	else {
-	    sprintf(tokenbuf,"$fh = delete $opened{%s} && close($fh)",
-	       tmpstr->str_ptr);
+	    sprintf(tokenbuf,"delete $opened{%s} && close(%s)",
+	       tmpstr->str_ptr, tmpstr->str_ptr);
 	    str_free(tmpstr);
 	    str_set(str,tokenbuf);
 	}
@@ -1142,11 +1151,13 @@ sub Pick {\n\
 		s = savestr(tokenbuf);
 		for (t = tokenbuf; *t; t++) {
 		    *t &= 127;
-		    if (!isalpha(*t) && !isdigit(*t))
+		    if (isLOWER(*t))
+			*t = toUPPER(*t);
+		    if (!isALPHA(*t) && !isDIGIT(*t))
 			*t = '_';
 		}
-		if (!index(tokenbuf,'_'))
-		    strcpy(t,"_fh");
+		if (!strchr(tokenbuf,'_'))
+		    strcpy(t,"_FH");
 		tmp3str = hfetch(symtab,tokenbuf);
 		if (!tmp3str) {
 		    str_cat(opens,"open(");
@@ -1192,14 +1203,17 @@ sub Pick {\n\
 	    str_cat(str,"printf");
 	else
 	    str_cat(str,"print");
+	saw_fh = 0;
 	if (len == 3 || do_fancy_opens) {
-	    if (*tokenbuf)
+	    if (*tokenbuf) {
 		str_cat(str," ");
+		saw_fh = 1;
+	    }
 	    str_cat(str,tokenbuf);
 	}
 	tmpstr = walk(1+(type==OPRINT),level,ops[node+1].ival,&numarg,P_MIN);
 	if (!*tmpstr->str_ptr && lval_field) {
-	    t = saw_OFS ? "$," : "' '";
+	    const char *t = (saw_OFS ? "$," : "' '");
 	    if (split_to_array) {
 		sprintf(tokenbuf,"join(%s,@Fld)",t);
 		str_cat(tmpstr,tokenbuf);
@@ -1221,7 +1235,13 @@ sub Pick {\n\
 	}
 	if (*tmpstr->str_ptr) {
 	    str_cat(str," ");
-	    str_scat(str,tmpstr);
+	    if (!saw_fh && *tmpstr->str_ptr == '(') {
+		str_cat(str,"(");
+		str_scat(str,tmpstr);
+		str_cat(str,")");
+	    }
+	    else
+		str_scat(str,tmpstr);
 	}
 	else {
 	    str_cat(str," $_");
@@ -1266,10 +1286,10 @@ sub Pick {\n\
 	if (len > 0)
 	    tmpstr = walk(1,level,ops[node+1].ival,&numarg,P_MIN);
 	else
-	    tmpstr = str_new(0);;
-	if (!*tmpstr->str_ptr) {
+	    tmpstr = str_new(0);
+	if (!tmpstr->str_ptr || !*tmpstr->str_ptr) {
 	    if (lval_field) {
-		t = saw_OFS ? "$," : "' '";
+		const char *t = (saw_OFS ? "$," : "' '");
 		if (split_to_array) {
 		    sprintf(tokenbuf,"join(%s,@Fld)",t);
 		    str_cat(tmpstr,tokenbuf);
@@ -1327,7 +1347,7 @@ sub Pick {\n\
 	}
 	else {
 	    if (len == 1) {
-		str_set(str,"ExitValue = ");
+		str_set(str,"$ExitValue = ");
 		exitval = TRUE;
 		str_scat(str,
 		  fstr=walk(1,level,ops[node+1].ival,&numarg,P_ASSIGN));
@@ -1385,6 +1405,18 @@ sub Pick {\n\
 	str_scat(str,fstr=walk(0,level,ops[node+2].ival,&numarg,P_MIN));
 	str_free(fstr);
 	break;
+    case ODO:
+	str = str_new(0);
+	str_set(str,"do ");
+	str_scat(str,fstr=walk(1,level,ops[node+1].ival,&numarg,P_MIN));
+	str_free(fstr);
+	if (str->str_ptr[str->str_cur - 1] == '\n')
+	    --str->str_cur;
+	str_cat(str," while (");
+	str_scat(str,fstr=walk(0,level,ops[node+2].ival,&numarg,P_MIN));
+	str_free(fstr);
+	str_cat(str,");");
+	break;
     case OFOR:
 	str = str_new(0);
 	str_set(str,"for (");
@@ -1392,7 +1424,7 @@ sub Pick {\n\
 	i = numarg;
 	if (i) {
 	    t = s = tmpstr->str_ptr;
-	    while (isalpha(*t) || isdigit(*t) || *t == '$' || *t == '_')
+	    while (isALPHA(*t) || isDIGIT(*t) || *t == '$' || *t == '_')
 		t++;
 	    i = t - s;
 	    if (i < 2)
@@ -1400,7 +1432,7 @@ sub Pick {\n\
 	}
 	str_cat(str,"; ");
 	fstr=walk(1,level,ops[node+2].ival,&numarg,P_MIN);
-	if (i && (t = index(fstr->str_ptr,0377))) {
+	if (i && (t = strchr(fstr->str_ptr,0377))) {
 	    if (strnEQ(fstr->str_ptr,s,i))
 		*t = ' ';
 	}
@@ -1416,16 +1448,16 @@ sub Pick {\n\
 	break;
     case OFORIN:
 	tmpstr = walk(0,level,ops[node+1].ival,&numarg,P_MIN);
-	d = index(tmpstr->str_ptr,'$');
+	d = strchr(tmpstr->str_ptr,'$');
 	if (!d)
 	    fatal("Illegal for loop: %s",tmpstr->str_ptr);
-	s = index(d,'{');
+	s = strchr(d,'{');
 	if (!s)
-	    s = index(d,'[');
+	    s = strchr(d,'[');
 	if (!s)
 	    fatal("Illegal for loop: %s",d);
 	*s++ = '\0';
-	for (t = s; i = *t; t++) {
+	for (t = s; (i = *t); t++) {
 	    i &= 127;
 	    if (i == '}' || i == ']')
 		break;
@@ -1438,7 +1470,7 @@ sub Pick {\n\
 	tmp2str = hfetch(symtab,str->str_ptr);
 	if (tmp2str && atoi(tmp2str->str_ptr)) {
 	    sprintf(tokenbuf,
-	      "foreach %s (@%s) ",
+	      "foreach %s ($[ .. $#%s) ",
 	      s,
 	      d+1);
 	}
@@ -1484,7 +1516,7 @@ sub Pick {\n\
 	    }
 	}
 	else {
-	    str = Nullstr;
+	    str = NULL;
 	}
 	break;
     }
@@ -1517,9 +1549,8 @@ sub Pick {\n\
     return str;
 }
 
-tab(str,lvl)
-register STR *str;
-register int lvl;
+static void
+tab(register STR *str, register int lvl)
 {
     while (lvl > 1) {
 	str_cat(str,"\t");
@@ -1529,9 +1560,8 @@ register int lvl;
 	str_cat(str,"    ");
 }
 
-fixtab(str,lvl)
-register STR *str;
-register int lvl;
+static void
+fixtab(register STR *str, register int lvl)
 {
     register char *s;
 
@@ -1548,8 +1578,8 @@ register int lvl;
     tab(str,lvl);
 }
 
-addsemi(str)
-register STR *str;
+static void
+addsemi(register STR *str)
 {
     register char *s;
 
@@ -1560,9 +1590,8 @@ register STR *str;
 	str_cat(str,";");
 }
 
-emit_split(str,level)
-register STR *str;
-int level;
+static void
+emit_split(register STR *str, int level)
 {
     register int i;
 
@@ -1584,27 +1613,22 @@ int level;
 	str_cat(str,tokenbuf);
     }
     if (const_FS) {
-	sprintf(tokenbuf," = split(/[%c\\n]/, $_, 999);\n",const_FS);
+	sprintf(tokenbuf," = split(/[%c\\n]/, $_, -1);\n",const_FS);
 	str_cat(str,tokenbuf);
     }
     else if (saw_FS)
-	str_cat(str," = split($FS, $_, 999);\n");
+	str_cat(str," = split($FS, $_, -1);\n");
     else
-	str_cat(str," = split(' ', $_, 999);\n");
+	str_cat(str," = split(' ', $_, -1);\n");
     tab(str,level);
 }
 
-prewalk(numit,level,node,numericptr)
-int numit;
-int level;
-register int node;
-int *numericptr;
+int
+prewalk(int numit, int level, register int node, int *numericptr)
 {
     register int len;
     register int type;
     register int i;
-    char *t;
-    char *d, *s;
     int numarg;
     int numeric = FALSE;
     STR *tmpstr;
@@ -1724,7 +1748,7 @@ int *numericptr;
 	prewalk(0,level,ops[node+2].ival,&numarg);
 	prewalk(0,level,ops[node+1].ival,&numarg);
 	prewalk(0,level,ops[node+3].ival,&numarg);
-	if (numarg || strlen(ops[ops[node+1].ival+1].cval) > 1) {
+	if (numarg || strlen(ops[ops[node+1].ival+1].cval) > (Size_t)1) {
 	    numericize(ops[node+2].ival);
 	    if (!numarg)
 		numericize(ops[node+3].ival);
@@ -2016,12 +2040,11 @@ int *numericptr;
     return 1;
 }
 
-numericize(node)
-register int node;
+static void
+numericize(register int node)
 {
     register int len;
     register int type;
-    register int i;
     STR *tmpstr;
     STR *tmp2str;
     int numarg;