X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=x2p%2Fwalk.c;h=f8fad55c3dc80c2e8e87761bae16f4ab547c8347;hb=c4fbe2471f42249bd57e1c071c99349d2331aea5;hp=3344688117d1b7660819a73aa97fd9e417ce0ae3;hpb=1d7c184104c076988718a01b77c8706aae05b092;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/x2p/walk.c b/x2p/walk.c
index 3344688..f8fad55 100644
--- a/x2p/walk.c
+++ b/x2p/walk.c
@@ -1,6 +1,6 @@
 /* $RCSfile: walk.c,v $$Revision: 4.1 $$Date: 92/08/07 18:29:31 $
  *
- *    Copyright (c) 1991-1997, Larry Wall
+ *    Copyright (c) 1991-2001, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -52,7 +52,7 @@ walk(int useval, int level, register int node, int *numericptr, int minprec)
     STR *tmp2str;
     STR *tmp3str;
     char *t;
-    char *d, *s;
+    char *d, *s = 0;
     int numarg;
     int numeric = FALSE;
     STR *fstr;
@@ -69,12 +69,12 @@ walk(int useval, int level, register int node, int *numericptr, int minprec)
     case OPROG:
 	arymax = 0;
 	if (namelist) {
-	    while (isalpha(*namelist)) {
+	    while (isALPHA(*namelist)) {
 		for (d = tokenbuf,s=namelist;
-		  isalpha(*s) || isdigit(*s) || *s == '_';
+		  isALPHA(*s) || isDIGIT(*s) || *s == '_';
 		  *d++ = *s++) ;
 		*d = '\0';
-		while (*s && !isalpha(*s)) s++;
+		while (*s && !isALPHA(*s)) s++;
 		namelist = s;
 		nameary[++arymax] = savestr(tokenbuf);
 	    }
@@ -241,7 +241,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++;
@@ -254,7 +254,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,"/");
@@ -589,9 +589,9 @@ sub Pick {\n\
 		s = savestr(tokenbuf);
 		for (t = tokenbuf; *t; t++) {
 		    *t &= 127;
-		    if (islower(*t))
-			*t = toupper(*t);
-		    if (!isalpha(*t) && !isdigit(*t))
+		    if (isLOWER(*t))
+			*t = toUPPER(*t);
+		    if (!isALPHA(*t) && !isDIGIT(*t))
 			*t = '_';
 		}
 		if (!strchr(tokenbuf,'_'))
@@ -750,7 +750,7 @@ sub Pick {\n\
 	subretnum |= numarg;
 	s = Nullch;
 	t = tmp2str->str_ptr;
-	while (t = instr(t,"return "))
+	while ((t = instr(t,"return ")))
 	    s = t++;
 	if (s) {
 	    i = 0;
@@ -849,9 +849,9 @@ sub Pick {\n\
 	    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;
+                   *d++ = '$' + (char)128;
 		else if (*t == '$')
-		    *d++ = '\\' + 128;
+                   *d++ = '\\' + (char)128;
 		*d = *t + 128;
 	    }
 	    *d = '\0';
@@ -931,7 +931,7 @@ sub Pick {\n\
 		case '\\': case '"': case 'n': case 't': case '$':
 		    break;
 		default:	/* hide this from perl */
-		    *d++ = '\\' + 128;
+                   *d++ = '\\' + (char)128;
 		}
 	    }
 	    *d = *t + 128;
@@ -1008,7 +1008,7 @@ sub Pick {\n\
 		    strcpy(tokenbuf,"]");
 		else
 		    strcpy(tokenbuf,"}");
-		*tokenbuf += 128;
+               *tokenbuf += (char)128;
 		str_cat(str,tokenbuf);
 	    }
 	}
@@ -1060,7 +1060,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);
@@ -1069,7 +1069,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);
@@ -1120,9 +1120,9 @@ sub Pick {\n\
 	    s = savestr(tokenbuf);
 	    for (t = tokenbuf; *t; t++) {
 		*t &= 127;
-		if (islower(*t))
-		    *t = toupper(*t);
-		if (!isalpha(*t) && !isdigit(*t))
+		if (isLOWER(*t))
+		    *t = toUPPER(*t);
+		if (!isALPHA(*t) && !isDIGIT(*t))
 		    *t = '_';
 	    }
 	    if (!strchr(tokenbuf,'_'))
@@ -1157,9 +1157,9 @@ sub Pick {\n\
 		s = savestr(tokenbuf);
 		for (t = tokenbuf; *t; t++) {
 		    *t &= 127;
-		    if (islower(*t))
-			*t = toupper(*t);
-		    if (!isalpha(*t) && !isdigit(*t))
+		    if (isLOWER(*t))
+			*t = toUPPER(*t);
+		    if (!isALPHA(*t) && !isDIGIT(*t))
 			*t = '_';
 		}
 		if (!strchr(tokenbuf,'_'))
@@ -1430,7 +1430,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)
@@ -1463,7 +1463,7 @@ sub Pick {\n\
 	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;