X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=x2p%2Fwalk.c;h=4d5f1d3a5e636645bb4361485965f20bdb1353e3;hb=80ffb5f93608b52314883335103c8837769171e3;hp=6f425a4845fe29a929b17039272a67636a771006;hpb=748a93069b3d16374a9859d1456065dd3ae11394;p=p5sagit%2Fp5-mst-13.2.git diff --git a/x2p/walk.c b/x2p/walk.c index 6f425a4..4d5f1d3 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, 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. @@ -12,12 +12,6 @@ #include "a2p.h" #include "util.h" -static void tab(); -static void fixtab(); -static void addsemi(); -static void emit_split(); -static void numericize(); - bool exitval = FALSE; bool realexit = FALSE; bool saw_getline = FALSE; @@ -32,22 +26,23 @@ char *limit; STR *subs; STR *curargs = Nullstr; -void addsemi _(( STR *str )); -void emit_split _(( STR *str, int level )); -void fixtab _(( STR *str, int lvl )); -void numericize _(( int node )); -int prewalk _(( int numit, int level, int node, int *numericptr )); -void tab _(( STR *str, int lvl )); -STR * walk _(( int useval, int level, int node, int *numericptr, int minprec )); +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 ); 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) + + + + + /* minimum precedence without parens */ { register int len; register STR *str; @@ -57,7 +52,7 @@ int minprec; /* minimum precedence without parens */ STR *tmp2str; STR *tmp3str; char *t; - char *d, *s; + char *d, *s = 0; int numarg; int numeric = FALSE; STR *fstr; @@ -74,12 +69,12 @@ int minprec; /* minimum precedence without parens */ 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); } @@ -138,7 +133,7 @@ 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); } if (do_split) @@ -150,7 +145,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; @@ -195,7 +190,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)) { @@ -246,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++; @@ -594,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,'_')) @@ -755,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; @@ -868,7 +863,7 @@ sub Pick {\n\ str_scat(tmp3str,tmp2str); str_cat(tmp3str,").'\"') =~ s/&/\\$&/g, "); str_set(tmp2str,"eval $s_"); - s = (*s == 'g' ? "ge" : "e"); + s = (char*)(*s == 'g' ? "ge" : "e"); i++; } type = ops[ops[node+1].ival].ival; @@ -1125,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,'_')) @@ -1162,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,'_')) @@ -1224,7 +1219,7 @@ sub Pick {\n\ } tmpstr = walk(1+(type==OPRINT),level,ops[node+1].ival,&numarg,P_MIN); if (!*tmpstr->str_ptr && lval_field) { - t = saw_OFS ? "$," : "' '"; + t = (char*)(saw_OFS ? "$," : "' '"); if (split_to_array) { sprintf(tokenbuf,"join(%s,@Fld)",t); str_cat(tmpstr,tokenbuf); @@ -1297,10 +1292,10 @@ sub Pick {\n\ if (len > 0) tmpstr = walk(1,level,ops[node+1].ival,&numarg,P_MIN); else - tmpstr = str_new(0);; + tmpstr = str_new(0); if (!tmpstr->str_ptr || !*tmpstr->str_ptr) { if (lval_field) { - t = saw_OFS ? "$," : "' '"; + t = (char*)(saw_OFS ? "$," : "' '"); if (split_to_array) { sprintf(tokenbuf,"join(%s,@Fld)",t); str_cat(tmpstr,tokenbuf); @@ -1422,7 +1417,7 @@ sub Pick {\n\ 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->str_cur; str_cat(str," while ("); str_scat(str,fstr=walk(0,level,ops[node+2].ival,&numarg,P_MIN)); str_free(fstr); @@ -1435,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) @@ -1468,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; @@ -1561,9 +1556,7 @@ sub Pick {\n\ } static void -tab(str,lvl) -register STR *str; -register int lvl; +tab(register STR *str, register int lvl) { while (lvl > 1) { str_cat(str,"\t"); @@ -1574,9 +1567,7 @@ register int lvl; } static void -fixtab(str,lvl) -register STR *str; -register int lvl; +fixtab(register STR *str, register int lvl) { register char *s; @@ -1594,8 +1585,7 @@ register int lvl; } static void -addsemi(str) -register STR *str; +addsemi(register STR *str) { register char *s; @@ -1606,10 +1596,8 @@ register STR *str; str_cat(str,";"); } -void -emit_split(str,level) -register STR *str; -int level; +static void +emit_split(register STR *str, int level) { register int i; @@ -1642,11 +1630,7 @@ int level; } int -prewalk(numit,level,node,numericptr) -int numit; -int level; -register int node; -int *numericptr; +prewalk(int numit, int level, register int node, int *numericptr) { register int len; register int type; @@ -2063,8 +2047,7 @@ int *numericptr; } static void -numericize(node) -register int node; +numericize(register int node) { register int len; register int type;