Patches to Encode 2.38 to match current test layout

[p5sagit/p5-mst-13.2.git] / x2p / a2py.c

diff --git a/x2p/a2py.c b/x2p/a2py.c
index b6497af..286f7cc 100644 (file)
--- a/x2p/a2py.c
+++ b/x2p/a2py.c
@@ -117,7 +117,7 @@ main(register int argc, register const char **argv, register const char **env)
 
     /* open script */
 
-    if (argv[0] == Nullch) {
+    if (argv[0] == NULL) {
 #if defined(OS2) || defined(WIN32) || defined(NETWARE)
        if ( isatty(fileno(stdin)) )
            usage();
@@ -132,7 +132,7 @@ main(register int argc, register const char **argv, register const char **env)
        rsfp = stdin;
     else
        rsfp = fopen(argv[0],"r");
-    if (rsfp == Nullfp)
+    if (rsfp == NULL)
        fatal("Awk script \"%s\" doesn't seem to exist.\n",filename);
 
     /* init tokener */
@@ -253,10 +253,10 @@ yylex(void)
        if (!rsfp)
            RETURN(0);
        line++;
-       if ((s = str_gets(linestr, rsfp)) == Nullch) {
+       if ((s = str_gets(linestr, rsfp)) == NULL) {
            if (rsfp != stdin)
                fclose(rsfp);
-           rsfp = Nullfp;
+           rsfp = NULL;
            s = str_get(linestr);
            RETURN(0);
        }
@@ -428,7 +428,7 @@ yylex(void)
        }
        for (d = s; isALPHA(*s) || isDIGIT(*s) || *s == '_'; )
            s++;
-       split_to_array = set_array_base = TRUE;
+       split_to_array = TRUE;
        if (d != s)
        {
            yylval = string(d,s-d);
@@ -464,8 +464,6 @@ yylex(void)
 
     case 'a': case 'A':
        SNARFWORD;
-       if (strEQ(d,"ARGC"))
-           set_array_base = TRUE;
        if (strEQ(d,"ARGV")) {
            yylval=numary(string("ARGV",0));
            XOP(VAR);
@@ -598,7 +596,6 @@ yylex(void)
        if (strEQ(d,"in"))
            XTERM(IN);
        if (strEQ(d,"index")) {
-           set_array_base = TRUE;
            XTERM(INDEX);
        }
        if (strEQ(d,"int")) {
@@ -644,7 +641,6 @@ yylex(void)
     case 'm': case 'M':
        SNARFWORD;
        if (strEQ(d,"match")) {
-           set_array_base = TRUE;
            XTERM(MATCH);
        }
        if (strEQ(d,"m"))
@@ -653,7 +649,7 @@ yylex(void)
     case 'n': case 'N':
        SNARFWORD;
        if (strEQ(d,"NF"))
-           do_chop = do_split = split_to_array = set_array_base = TRUE;
+           do_chop = do_split = split_to_array = TRUE;
        if (strEQ(d,"next")) {
            saw_line_op = TRUE;
            XTERM(NEXT);
@@ -719,11 +715,9 @@ yylex(void)
     case 's': case 'S':
        SNARFWORD;
        if (strEQ(d,"split")) {
-           set_array_base = TRUE;
            XOP(SPLIT);
        }
        if (strEQ(d,"substr")) {
-           set_array_base = TRUE;
            XTERM(SUBSTR);
        }
        if (strEQ(d,"sub"))
@@ -1204,7 +1198,6 @@ numary(int arg)
     str_cat(key,"[]");
     hstore(symtab,key->str_ptr,str_make("1"));
     str_free(key);
-    set_array_base = TRUE;
     return arg;
 }