fix per rob pike

SCCS-vsn: old/adb/adb.vax/expr.c 4.5
SCCS-vsn: old/adb/adb.vax/expr.c.bad 4.5

diff --git a/usr/src/old/adb/adb.vax/expr.c b/usr/src/old/adb/adb.vax/expr.c
index e45374d..e27bd1e 100644 (file)
--- a/usr/src/old/adb/adb.vax/expr.c
+++ b/usr/src/old/adb/adb.vax/expr.c
@@ -6,7 +6,7 @@
  */
 
 #include "defs.h"
  */
 
 #include "defs.h"

-static char sccsid[] = "@(#)expr.c 4.4 %G%";
+static char sccsid[] = "@(#)expr.c 4.5 %G%";

 
 MSG            BADSYM;
 MSG            BADVAR;
 
 MSG            BADSYM;
 MSG            BADVAR;


@@ -193,8 +193,7 @@ item(a)
        THEN    d=4; expv=0;
                WHILE quotchar()
                DO  IF d--
        THEN    d=4; expv=0;
                WHILE quotchar()
                DO  IF d--

-                   THEN IF d==1 THEN expv <<=16; FI
-                        expv |= ((d&1)?lastc:lastc<<8);
+                   THEN expv = (expv << 8) | lastc;

                    ELSE error(BADSYN);
                    FI
                OD
                    ELSE error(BADSYN);
                    FI
                OD

diff --git a/usr/src/old/adb/adb.vax/expr.c.bad b/usr/src/old/adb/adb.vax/expr.c.bad
index 3083a59..54416a8 100644 (file)
--- a/usr/src/old/adb/adb.vax/expr.c.bad
+++ b/usr/src/old/adb/adb.vax/expr.c.bad
@@ -6,7 +6,7 @@
  */
 
 #include "defs.h"
  */
 
 #include "defs.h"

-static char sccsid[] = "@(#)expr.c.bad 4.4 %G%";
+static char sccsid[] = "@(#)expr.c.bad 4.5 %G%";

 
 MSG            BADSYM;
 MSG            BADVAR;
 
 MSG            BADSYM;
 MSG            BADVAR;


@@ -193,8 +193,7 @@ item(a)
        THEN    d=4; expv=0;
                WHILE quotchar()
                DO  IF d--
        THEN    d=4; expv=0;
                WHILE quotchar()
                DO  IF d--

-                   THEN IF d==1 THEN expv <<=16; FI
-                        expv |= ((d&1)?lastc:lastc<<8);
+                   THEN expv = (expv << 8) | lastc;

                    ELSE error(BADSYN);
                    FI
                OD
                    ELSE error(BADSYN);
                    FI
                OD