X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=x2p%2Fa2py.c;h=cd396a28de2061a3d59feb8619c7ca66786c58cb;hb=03e60089f91d0a4a765dc827f0f6b27465941491;hp=202d5921e011d2ce724d9465e795ba642db88f69;hpb=f0f333f45536802923a359d930d1dcfd5b4589ea;p=p5sagit%2Fp5-mst-13.2.git diff --git a/x2p/a2py.c b/x2p/a2py.c index 202d592..cd396a2 100644 --- a/x2p/a2py.c +++ b/x2p/a2py.c @@ -8,7 +8,13 @@ * $Log: a2py.c,v $ */ -#ifdef OS2 +#if defined(OS2) || defined(WIN32) || defined(NETWARE) +#if defined(WIN32) +#include +#endif +#if defined(NETWARE) +#include "../netware/clibstuf.h" +#endif #include "../patchlevel.h" #endif #include "util.h" @@ -26,11 +32,13 @@ int oper4(int type, int arg1, int arg2, int arg3, int arg4); int oper5(int type, int arg1, int arg2, int arg3, int arg4, int arg5); STR *walk(int useval, int level, register int node, int *numericptr, int minprec); -#ifdef OS2 +#if defined(OS2) || defined(WIN32) || defined(NETWARE) +static void usage(void); + static void usage() { - printf("\nThis is the AWK to PERL translator, version 5.0, patchlevel %d\n", PATCHLEVEL); + printf("\nThis is the AWK to PERL translator, revision %d.0, version %d\n", PERL_REVISION, PERL_VERSION); printf("\nUsage: %s [-D] [-F] [-n] [-] filename\n", myname); printf("\n -D sets debugging flags." "\n -F the awk script to translate is always invoked with" @@ -50,18 +58,21 @@ main(register int argc, register char **argv, register char **env) int i; STR *tmpstr; + #ifdef NETWARE + fnInitGpfGlobals(); // For importing the CLIB calls in place of Watcom calls + #endif /* NETWARE */ + myname = argv[0]; linestr = str_new(80); str = str_new(0); /* first used for -I flags */ for (argc--,argv++; argc; argc--,argv++) { if (argv[0][0] != '-' || !argv[0][1]) break; - reswitch: switch (argv[0][1]) { #ifdef DEBUGGING case 'D': debug = atoi(argv[0]+2); -#ifdef YYDEBUG +#if YYDEBUG yydebug = (debug & 1); #endif break; @@ -86,9 +97,11 @@ main(register int argc, register char **argv, register char **env) case 0: break; default: - fatal("Unrecognized switch: %s\n",argv[0]); -#ifdef OS2 +#if defined(OS2) || defined(WIN32) || defined(NETWARE) + fprintf(stderr, "Unrecognized switch: %s\n",argv[0]); usage(); +#else + fatal("Unrecognized switch: %s\n",argv[0]); #endif } } @@ -97,7 +110,7 @@ main(register int argc, register char **argv, register char **env) /* open script */ if (argv[0] == Nullch) { -#ifdef OS2 +#if defined(OS2) || defined(WIN32) || defined(NETWARE) if ( isatty(fileno(stdin)) ) usage(); #endif @@ -187,6 +200,8 @@ main(register int argc, register char **argv, register char **env) "The operation I've selected may be wrong for the operand types.\n"); } exit(0); + /* by ANSI specs return is needed. This also shuts up VC++ and his warnings */ + return(0); } #define RETURN(retval) return (bufptr = s,retval) @@ -204,12 +219,13 @@ yylex(void) register int tmp; retry: -#ifdef YYDEBUG - if (yydebug) +#if YYDEBUG + if (yydebug) { if (strchr(s,'\n')) fprintf(stderr,"Tokener at %s",s); else fprintf(stderr,"Tokener at %s\n",s); + } #endif switch (*s) { default: @@ -266,11 +282,15 @@ yylex(void) case ':': tmp = *s++; XOP(tmp); +#ifdef EBCDIC + case 7: +#else case 127: +#endif s++; XTERM('}'); case '}': - for (d = s + 1; isspace(*d); d++) ; + for (d = s + 1; isSPACE(*d); d++) ; if (!*d) s = d - 1; *s = 127; @@ -372,7 +392,7 @@ yylex(void) #define SNARFWORD \ d = tokenbuf; \ - while (isalpha(*s) || isdigit(*s) || *s == '_') \ + while (isALPHA(*s) || isDIGIT(*s) || *s == '_') \ *d++ = *s++; \ *d = '\0'; \ d = tokenbuf; \ @@ -391,8 +411,8 @@ yylex(void) ID("0"); } do_split = TRUE; - if (isdigit(*s)) { - for (d = s; isdigit(*s); s++) ; + if (isDIGIT(*s)) { + for (d = s; isDIGIT(*s); s++) ; yylval = string(d,s-d); tmp = atoi(d); if (tmp > maxfld) @@ -462,15 +482,15 @@ yylex(void) XTERM(FUN1); } if (strEQ(d,"chdir")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"crypt")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"chop")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"chmod")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"chown")) - *d = toupper(*d); + *d = toUPPER(*d); ID(d); case 'd': case 'D': SNARFWORD; @@ -479,7 +499,7 @@ yylex(void) if (strEQ(d,"delete")) XTERM(DELETE); if (strEQ(d,"die")) - *d = toupper(*d); + *d = toUPPER(*d); ID(d); case 'e': case 'E': SNARFWORD; @@ -496,26 +516,26 @@ yylex(void) XTERM(FUN1); } if (strEQ(d,"elsif")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"eq")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"eval")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"eof")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"each")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"exec")) - *d = toupper(*d); + *d = toUPPER(*d); ID(d); case 'f': case 'F': SNARFWORD; if (strEQ(d,"FS")) { saw_FS++; if (saw_FS == 1 && in_begin) { - for (d = s; *d && isspace(*d); d++) ; + for (d = s; *d && isSPACE(*d); d++) ; if (*d == '=') { - for (d++; *d && isspace(*d); d++) ; + for (d++; *d && isSPACE(*d); d++) ; if (*d == '"' && d[2] == '"') const_FS = d[1]; } @@ -529,13 +549,13 @@ yylex(void) if (strEQ(d,"FILENAME")) d = "ARGV"; if (strEQ(d,"foreach")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"format")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"fork")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"fh")) - *d = toupper(*d); + *d = toUPPER(*d); ID(d); case 'g': case 'G': SNARFWORD; @@ -544,18 +564,18 @@ yylex(void) if (strEQ(d,"gsub")) XTERM(GSUB); if (strEQ(d,"ge")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"gt")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"goto")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"gmtime")) - *d = toupper(*d); + *d = toUPPER(*d); ID(d); case 'h': case 'H': SNARFWORD; if (strEQ(d,"hex")) - *d = toupper(*d); + *d = toUPPER(*d); ID(d); case 'i': case 'I': SNARFWORD; @@ -575,14 +595,14 @@ yylex(void) case 'j': case 'J': SNARFWORD; if (strEQ(d,"join")) - *d = toupper(*d); + *d = toUPPER(*d); ID(d); case 'k': case 'K': SNARFWORD; if (strEQ(d,"keys")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"kill")) - *d = toupper(*d); + *d = toUPPER(*d); ID(d); case 'l': case 'L': SNARFWORD; @@ -595,17 +615,17 @@ yylex(void) XTERM(FUN1); } if (strEQ(d,"last")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"local")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"lt")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"le")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"locatime")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"link")) - *d = toupper(*d); + *d = toUPPER(*d); ID(d); case 'm': case 'M': SNARFWORD; @@ -614,7 +634,7 @@ yylex(void) XTERM(MATCH); } if (strEQ(d,"m")) - *d = toupper(*d); + *d = toUPPER(*d); ID(d); case 'n': case 'N': SNARFWORD; @@ -625,7 +645,7 @@ yylex(void) XTERM(NEXT); } if (strEQ(d,"ne")) - *d = toupper(*d); + *d = toUPPER(*d); ID(d); case 'o': case 'O': SNARFWORD; @@ -641,11 +661,11 @@ yylex(void) d = "#"; } if (strEQ(d,"open")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"ord")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"oct")) - *d = toupper(*d); + *d = toUPPER(*d); ID(d); case 'p': case 'P': SNARFWORD; @@ -656,9 +676,9 @@ yylex(void) XTERM(PRINTF); } if (strEQ(d,"push")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"pop")) - *d = toupper(*d); + *d = toUPPER(*d); ID(d); case 'q': case 'Q': SNARFWORD; @@ -676,11 +696,11 @@ yylex(void) if (strEQ(d,"return")) XTERM(RET); if (strEQ(d,"reset")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"redo")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"rename")) - *d = toupper(*d); + *d = toUPPER(*d); ID(d); case 's': case 'S': SNARFWORD; @@ -694,8 +714,15 @@ yylex(void) } if (strEQ(d,"sub")) XTERM(SUB); - if (strEQ(d,"sprintf")) - XTERM(SPRINTF); + if (strEQ(d,"sprintf")) { + /* In old awk, { print sprintf("str%sg"),"in" } prints + * "string"; in new awk, "in" is not considered an argument to + * sprintf, so the statement breaks. To support both, the + * grammar treats arguments to SPRINTF_OLD like old awk, + * SPRINTF_NEW like new. Here we return the appropriate one. + */ + XTERM(old_awk ? SPRINTF_OLD : SPRINTF_NEW); + } if (strEQ(d,"sqrt")) { yylval = OSQRT; XTERM(FUN1); @@ -716,73 +743,73 @@ yylex(void) XTERM(FUN1); } if (strEQ(d,"s")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"shift")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"select")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"seek")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"stat")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"study")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"sleep")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"symlink")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"sort")) - *d = toupper(*d); + *d = toUPPER(*d); ID(d); case 't': case 'T': SNARFWORD; if (strEQ(d,"tr")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"tell")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"time")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"times")) - *d = toupper(*d); + *d = toUPPER(*d); ID(d); case 'u': case 'U': SNARFWORD; if (strEQ(d,"until")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"unless")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"umask")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"unshift")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"unlink")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"utime")) - *d = toupper(*d); + *d = toUPPER(*d); ID(d); case 'v': case 'V': SNARFWORD; if (strEQ(d,"values")) - *d = toupper(*d); + *d = toUPPER(*d); ID(d); case 'w': case 'W': SNARFWORD; if (strEQ(d,"while")) XTERM(WHILE); if (strEQ(d,"write")) - *d = toupper(*d); + *d = toUPPER(*d); else if (strEQ(d,"wait")) - *d = toupper(*d); + *d = toUPPER(*d); ID(d); case 'x': case 'X': SNARFWORD; if (strEQ(d,"x")) - *d = toupper(*d); + *d = toUPPER(*d); ID(d); case 'y': case 'Y': SNARFWORD; if (strEQ(d,"y")) - *d = toupper(*d); + *d = toUPPER(*d); ID(d); case 'z': case 'Z': SNARFWORD; @@ -851,13 +878,13 @@ scannum(register char *s) case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': case '0' : case '.': d = tokenbuf; - while (isdigit(*s)) { + while (isDIGIT(*s)) { *d++ = *s++; } if (*s == '.') { - if (isdigit(s[1])) { + if (isDIGIT(s[1])) { *d++ = *s++; - while (isdigit(*s)) { + while (isDIGIT(*s)) { *d++ = *s++; } } @@ -868,7 +895,7 @@ scannum(register char *s) *d++ = *s++; if (*s == '+' || *s == '-') *d++ = *s++; - while (isdigit(*s)) + while (isDIGIT(*s)) *d++ = *s++; } *d = '\0'; @@ -1041,9 +1068,9 @@ fixup(STR *str) s++; } else if (*s == '\n') { - for (t = s+1; isspace(*t & 127); t++) ; + for (t = s+1; isSPACE(*t & 127); t++) ; t--; - while (isspace(*t & 127) && *t != '\n') t--; + while (isSPACE(*t & 127) && *t != '\n') t--; if (*t == '\n' && t-s > 1) { if (s[-1] == '{') s--; @@ -1076,7 +1103,7 @@ putlines(STR *str) if (pos > 78) { /* split a long line? */ *d-- = '\0'; newpos = 0; - for (t = tokenbuf; isspace(*t & 127); t++) { + for (t = tokenbuf; isSPACE(*t & 127); t++) { if (*t == '\t') newpos += 8; else @@ -1208,7 +1235,7 @@ fixfargs(int name, int arg, int prevargs) { int type; STR *str; - int numargs; + int numargs = 0; if (!arg) return prevargs;