perldelta: reimport the 5.15.x internals sections

[perl5.git] / x2p / walk.c

diff --git a/x2p/walk.c b/x2p/walk.c
index 10546db..86419c1 100644 (file)
--- a/x2p/walk.c
+++ b/x2p/walk.c
@@ -1,11 +1,10 @@
-/* $RCSfile: walk.c,v $$Revision: 4.1 $$Date: 92/08/07 18:29:31 $
+/*    walk.c
  *
- *    Copyright (c) 1991-2001, 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 either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
- *
- * $Log:       walk.c,v $
  */
 
 #include "EXTERN.h"
@@ -20,11 +19,11 @@ bool saw_FNR = FALSE;
 bool saw_argv0 = FALSE;
 bool saw_fh = FALSE;
 int maxtmp = 0;
-char *lparen;
-char *rparen;
-char *limit;
+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 );
@@ -34,15 +33,14 @@ 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(int useval, int level, register int node, int *numericptr, int minprec)
-           
-          
-                  
-                
-                               /* minimum precedence without parens */
 {
     register int len;
     register STR *str;
@@ -52,7 +50,7 @@ walk(int useval, int level, register int node, int *numericptr, int minprec)
     STR *tmp2str;
     STR *tmp3str;
     char *t;
-    char *d, *s = 0;
+    char *d, *s;
     int numarg;
     int numeric = FALSE;
     STR *fstr;
@@ -69,12 +67,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);
            }
@@ -86,11 +84,6 @@ walk(int useval, int level, register int node, int *numericptr, int minprec)
        str = walk(0,level,ops[node+1].ival,&numarg,P_MIN);
        if (do_split && need_entire && !absmaxfld)
            split_to_array = TRUE;
-       if (do_split && split_to_array)
-           set_array_base = TRUE;
-       if (set_array_base) {
-           str_cat(str,"$[ = 1;\t\t\t# set array base to 1\n");
-       }
        if (fswitch && !const_FS)
            const_FS = fswitch;
        if (saw_FS > 1 || saw_RS)
@@ -241,7 +234,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 +247,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 +582,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,'_'))
@@ -652,16 +645,15 @@ sub Pick {\n\
        str_set(str,"substr(");
        str_scat(str,fstr=walk(1,level,ops[node+1].ival,&numarg,P_COMMA+1));
        str_free(fstr);
-       str_cat(str,", ");
+       str_cat(str,", (");
        str_scat(str,fstr=walk(1,level,ops[node+2].ival,&numarg,P_COMMA+1));
        str_free(fstr);
-       str_cat(str,", ");
+       str_cat(str,")-1");
        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:
@@ -670,7 +662,7 @@ sub Pick {\n\
        break;
     case OSPLIT:
        str = str_new(0);
-       limit = ", 9999)";
+       limit = ", -1)";
        numeric = 1;
        tmpstr = walk(1,level,ops[node+2].ival,&numarg,P_MIN);
        if (useval)
@@ -716,13 +708,13 @@ sub Pick {\n\
        break;
     case OINDEX:
        str = str_new(0);
-       str_set(str,"index(");
+       str_set(str,"(1+index(");
        str_scat(str,fstr=walk(1,level,ops[node+1].ival,&numarg,P_COMMA+1));
        str_free(fstr);
        str_cat(str,", ");
        str_scat(str,fstr=walk(1,level,ops[node+2].ival,&numarg,P_COMMA+1));
        str_free(fstr);
-       str_cat(str,")");
+       str_cat(str,"))");
        numeric = 1;
        break;
     case OMATCH:
@@ -733,7 +725,7 @@ sub Pick {\n\
        str_cat(str," =~ ");
        str_scat(str,fstr=walk(1,level,ops[node+2].ival,&numarg,P_MATCH+1));
        str_free(fstr);
-       str_cat(str," && ($RLENGTH = length($&), $RSTART = length($`)+1)");
+       str_cat(str," ? scalar($RLENGTH = length($&), $RSTART = length($`)+1) : 0");
        numeric = 1;
        break;
     case OUSERDEF:
@@ -745,10 +737,10 @@ 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 ")))
            s = t++;
@@ -822,11 +814,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;
@@ -845,26 +834,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 = (char*)(*s == 'g' ? "ge" : "e");
+           s = (gsub ? "/ge" : "/e");
            i++;
+         }
+         str_cat(tmp2str,s);
        }
        type = ops[ops[node+1].ival].ival;
        len = type >> 8;
@@ -877,8 +871,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)
@@ -889,8 +881,6 @@ sub Pick {\n\
            str_scat(str,fstr);
            str_cat(str,"/");
            str_scat(str,tmp2str);
-           str_cat(str,"/");
-           str_cat(str,s);
        }
        else {
            i++;
@@ -903,8 +893,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,")");
@@ -913,15 +901,16 @@ 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 == '\\') {
@@ -931,17 +920,18 @@ sub Pick {\n\
                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;
@@ -976,12 +966,12 @@ sub Pick {\n\
            }
            else if (strEQ(str->str_ptr,"$NF")) {
                numeric = 1;
-               str_set(str,"$#Fld");
+               str_set(str,"($#Fld+1)");
            }
            else if (strEQ(str->str_ptr,"$0"))
                str_set(str,"$_");
            else if (strEQ(str->str_ptr,"$ARGC"))
-               str_set(str,"($#ARGV+1)");
+               str_set(str,"($#ARGV+2)");
        }
        else {
 #ifdef NOTDEF
@@ -994,7 +984,7 @@ sub Pick {\n\
            str_cat(tmpstr,"[]");
            tmp2str = hfetch(symtab,tmpstr->str_ptr);
            if (tmp2str && atoi(tmp2str->str_ptr))
-               str_cat(str,"[");
+               str_cat(str,"[(");
            else
                str_cat(str,"{");
            str_scat(str,fstr=walk(1,level,ops[node+2].ival,&numarg,P_MIN));
@@ -1005,10 +995,10 @@ sub Pick {\n\
            }
            else {
                if (tmp2str && atoi(tmp2str->str_ptr))
-                   strcpy(tokenbuf,"]");
+                   strcpy(tokenbuf,")-1]");
                else
                    strcpy(tokenbuf,"}");
-               *tokenbuf += 128;
+               *tokenbuf += (char)128;
                str_cat(str,tokenbuf);
            }
        }
@@ -1018,10 +1008,10 @@ sub Pick {\n\
        str = str_new(0);
        if (split_to_array) {
            str_set(str,"$Fld");
-           str_cat(str,"[");
+           str_cat(str,"[(");
            str_scat(str,fstr=walk(1,level,ops[node+1].ival,&numarg,P_MIN));
            str_free(fstr);
-           str_cat(str,"]");
+           str_cat(str,")-1]");
        }
        else {
            i = atoi(walk(1,level,ops[node+1].ival,&numarg,P_MIN)->str_ptr);
@@ -1060,7 +1050,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 +1059,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 +1110,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 +1147,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,'_'))
@@ -1219,7 +1209,7 @@ sub Pick {\n\
        }
        tmpstr = walk(1+(type==OPRINT),level,ops[node+1].ival,&numarg,P_MIN);
        if (!*tmpstr->str_ptr && lval_field) {
-           t = (char*)(saw_OFS ? "$," : "' '");
+           const char *t = (saw_OFS ? "$," : "' '");
            if (split_to_array) {
                sprintf(tokenbuf,"join(%s,@Fld)",t);
                str_cat(tmpstr,tokenbuf);
@@ -1295,7 +1285,7 @@ sub Pick {\n\
            tmpstr = str_new(0);
        if (!tmpstr->str_ptr || !*tmpstr->str_ptr) {
            if (lval_field) {
-               t = (char*)(saw_OFS ? "$," : "' '");
+               const char *t = (saw_OFS ? "$," : "' '");
                if (split_to_array) {
                    sprintf(tokenbuf,"join(%s,@Fld)",t);
                    str_cat(tmpstr,tokenbuf);
@@ -1430,7 +1420,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)
@@ -1476,7 +1466,7 @@ sub Pick {\n\
        tmp2str = hfetch(symtab,str->str_ptr);
        if (tmp2str && atoi(tmp2str->str_ptr)) {
            sprintf(tokenbuf,
-             "foreach %s ($[ .. $#%s) ",
+             "foreach %s (0 .. $#%s) ",
              s,
              d+1);
        }
@@ -1522,7 +1512,7 @@ sub Pick {\n\
            }
        }
        else {
-           str = Nullstr;
+           str = NULL;
        }
        break;
     }
@@ -1619,13 +1609,13 @@ emit_split(register STR *str, int level)
        str_cat(str,tokenbuf);
     }
     if (const_FS) {
-       sprintf(tokenbuf," = split(/[%c\\n]/, $_, 9999);\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, $_, 9999);\n");
+       str_cat(str," = split($FS, $_, -1);\n");
     else
-       str_cat(str," = split(' ', $_, 9999);\n");
+       str_cat(str," = split(' ', $_, -1);\n");
     tab(str,level);
 }