get rid of old-style asgop syntax

SCCS-vsn: usr.bin/pascal/pxp/fdec.c 5.2
SCCS-vsn: usr.bin/pascal/pxp/main.c 5.2
SCCS-vsn: usr.bin/pascal/pxp/pp.c 5.2
SCCS-vsn: usr.bin/pascal/pxp/yycomm.c 5.2
SCCS-vsn: usr.bin/pascal/pxp/yyput.c 5.2

diff --git a/usr/src/usr.bin/pascal/pxp/fdec.c b/usr/src/usr.bin/pascal/pxp/fdec.c
index 7cd7e93..955be26 100644 (file)
--- a/usr/src/usr.bin/pascal/pxp/fdec.c
+++ b/usr/src/usr.bin/pascal/pxp/fdec.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)fdec.c     5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)fdec.c     5.2 (Berkeley) %G%";

 #endif not lint
 
 /*
 #endif not lint
 
 /*


@@ -29,8 +29,8 @@ funchdr(r)
        register **rl, *il;
 
        if (inpflist(r[2])) {
        register **rl, *il;
 
        if (inpflist(r[2])) {

-               optstk['z'-'a'] =<< 1;
-               optstk['z'-'a'] =| opts['z'-'a'];
+               optstk['z'-'a'] <<= 1;
+               optstk['z'-'a'] |= opts['z'-'a'];

                opts['z'-'a'] = 1;
        }
        cbn++;
                opts['z'-'a'] = 1;
        }
        cbn++;


@@ -224,7 +224,7 @@ funcend(fp, bundle, binfo)
                ppgoout(PRFN);
        if (inpflist(fp)) {
                opts['z'-'a'] = optstk['z'-'a'] & 1;
                ppgoout(PRFN);
        if (inpflist(fp)) {
                opts['z'-'a'] = optstk['z'-'a'] & 1;

-               optstk['z'-'a'] =>> 1;
+               optstk['z'-'a'] >>= 1;

        }
        if (cbn == 0) {
                flushcm();
        }
        if (cbn == 0) {
                flushcm();

diff --git a/usr/src/usr.bin/pascal/pxp/main.c b/usr/src/usr.bin/pascal/pxp/main.c
index 012762d..4e84c10 100644 (file)
--- a/usr/src/usr.bin/pascal/pxp/main.c
+++ b/usr/src/usr.bin/pascal/pxp/main.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     5.2 (Berkeley) %G%";

 #endif not lint
 
 /*
 #endif not lint
 
 /*


@@ -64,7 +64,7 @@ main(argc, argv)
        register c;
 
        if (argv[0][0] == 'a')
        register c;
 
        if (argv[0][0] == 'a')

-               howfile =+ 9;
+               howfile += 9;

        argc--, argv++;
        if (argc == 0) {
                execl("/bin/cat", "cat", howfile, 0);
        argc--, argv++;
        if (argc == 0) {
                execl("/bin/cat", "cat", howfile, 0);


@@ -194,8 +194,8 @@ usage:
 
                cp = (stdoutn = "/tmp/pxp00000") + 13;
                signal(2, onintr);
 
                cp = (stdoutn = "/tmp/pxp00000") + 13;
                signal(2, onintr);

-               for (c = getpid(); c; c =/ 10)
-                       *--cp =| (c % 10);
+               for (c = getpid(); c; c /= 10)
+                       *--cp |= (c % 10);

                if (freopen(stdoutn, "w", stdout) == NULL)
 bad:
                        perror(stdoutn), exit(1);
                if (freopen(stdoutn, "w", stdout) == NULL)
 bad:
                        perror(stdoutn), exit(1);

diff --git a/usr/src/usr.bin/pascal/pxp/pp.c b/usr/src/usr.bin/pascal/pxp/pp.c
index a245353..6d7a65e 100644 (file)
--- a/usr/src/usr.bin/pascal/pxp/pp.c
+++ b/usr/src/usr.bin/pascal/pxp/pp.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)pp.c       5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)pp.c       5.2 (Berkeley) %G%";

 #endif not lint
 
 /*
 #endif not lint
 
 /*


@@ -284,7 +284,7 @@ ppnumb(s)
 ppgoin(lv)
 {
 
 ppgoin(lv)
 {
 

-       pplev[lv] =+ unit;
+       pplev[lv] += unit;

 }
 
 ppgoout(lv)
 }
 
 ppgoout(lv)


@@ -344,8 +344,8 @@ putchar(c)
                        flush();
                        break;
                case '\t':
                        flush();
                        break;
                case '\t':

-                       outcol =+ 8;
-                       outcol =& ~07;
+                       outcol += 8;
+                       outcol &= ~07;

                        break;
                case '\b':
                        if (outcol)
                        break;
                case '\b':
                        if (outcol)

diff --git a/usr/src/usr.bin/pascal/pxp/yycomm.c b/usr/src/usr.bin/pascal/pxp/yycomm.c
index d26c4ad..4e4f889 100644 (file)
--- a/usr/src/usr.bin/pascal/pxp/yycomm.c
+++ b/usr/src/usr.bin/pascal/pxp/yycomm.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)yycomm.c   5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)yycomm.c   5.2 (Berkeley) %G%";

 #endif not lint
 
 /*
 #endif not lint
 
 /*


@@ -286,7 +286,7 @@ putcm()
        cp = cp->cmnext;
        while (cp->cmseqid < Seqid || cp->cmseqid == Seqid && cp->cml->cmcol < Col) {
                putone(cp);
        cp = cp->cmnext;
        while (cp->cmseqid < Seqid || cp->cmseqid == Seqid && cp->cml->cmcol < Col) {
                putone(cp);

-               i =| 1 << cp->cmjust;
+               i |= 1 << cp->cmjust;

                if (cp->cmnext == cp) {
                        cmhp = NIL;
                        break;
                if (cp->cmnext == cp) {
                        cmhp = NIL;
                        break;


@@ -397,8 +397,8 @@ oneline(margin, cml)
                                i++;
                                continue;
                        case '\t':
                                i++;
                                continue;
                        case '\t':

-                               i =+ 8;
-                               i =& ~7;
+                               i += 8;
+                               i &= ~7;

                                if (i < margin)
                                        continue;
                                ppop("\t");
                                if (i < margin)
                                        continue;
                                ppop("\t");

diff --git a/usr/src/usr.bin/pascal/pxp/yyput.c b/usr/src/usr.bin/pascal/pxp/yyput.c
index 61a2ad0..0793408 100644 (file)
--- a/usr/src/usr.bin/pascal/pxp/yyput.c
+++ b/usr/src/usr.bin/pascal/pxp/yyput.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)yyput.c    5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)yyput.c    5.2 (Berkeley) %G%";

 #endif not lint
 
 /*
 #endif not lint
 
 /*


@@ -260,7 +260,7 @@ yysetfile(file)
        if (lastname == file)
                return;
        if (file == filename && opt('n') && (printed & 02) == 0) {
        if (lastname == file)
                return;
        if (file == filename && opt('n') && (printed & 02) == 0) {

-               printed =| 02;
+               printed |= 02;

                header();
        } else
                yyputfn(file);
                header();
        } else
                yyputfn(file);