update from John Gilmore for gcc

SCCS-vsn: usr.bin/pascal/libpc/SIN.c 1.2
SCCS-vsn: usr.bin/pascal/libpc/ATAN.c 1.2
SCCS-vsn: usr.bin/pascal/libpc/CHR.c 1.5
SCCS-vsn: usr.bin/pascal/libpc/COS.c 1.2
SCCS-vsn: usr.bin/pascal/libpc/CTTOT.c 1.5
SCCS-vsn: usr.bin/pascal/libpc/EXP.c 1.2
SCCS-vsn: usr.bin/pascal/libpc/FNIL.c 1.4
SCCS-vsn: usr.bin/pascal/libpc/LN.c 1.5
SCCS-vsn: usr.bin/pascal/libpc/MAX.c 1.5
SCCS-vsn: usr.bin/pascal/libpc/NAM.c 1.4
SCCS-vsn: usr.bin/pascal/libpc/NIL.c 1.4
SCCS-vsn: usr.bin/pascal/libpc/PRED.c 1.5
SCCS-vsn: usr.bin/pascal/libpc/RANG4.c 1.5
SCCS-vsn: usr.bin/pascal/libpc/READ4.c 1.9
SCCS-vsn: usr.bin/pascal/libpc/READ8.c 1.10
SCCS-vsn: usr.bin/pascal/libpc/READC.c 1.3
SCCS-vsn: usr.bin/pascal/libpc/READE.c 1.7
SCCS-vsn: usr.bin/pascal/libpc/RSNG4.c 1.5
SCCS-vsn: usr.bin/pascal/libpc/SQRT.c 1.4
SCCS-vsn: usr.bin/pascal/libpc/SUBSC.c 1.5
SCCS-vsn: usr.bin/pascal/libpc/SUBSCZ.c 1.5
SCCS-vsn: usr.bin/pascal/libpc/SUCC.c 1.5

diff --git a/usr/src/usr.bin/pascal/libpc/ATAN.c b/usr/src/usr.bin/pascal/libpc/ATAN.c
index 64e0929..852c4f7 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/ATAN.c
+++ b/usr/src/usr.bin/pascal/libpc/ATAN.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1982 Regents of the University of California */
 
 /* Copyright (c) 1982 Regents of the University of California */
 

-static char sccsid[] = "@(#)ATAN.c 1.1 %G%";
+static char sccsid[] = "@(#)ATAN.c 1.2 %G%";

 
 #include <math.h>
 extern int errno;
 
 #include <math.h>
 extern int errno;


@@ -15,7 +15,6 @@ ATAN(value)
        result = atan(value);
        if (errno != 0) {
                ERROR("Argument %e is out of the domain of atan\n", value);
        result = atan(value);
        if (errno != 0) {
                ERROR("Argument %e is out of the domain of atan\n", value);

-               return;

        }
        return result;
 }
        }
        return result;
 }

diff --git a/usr/src/usr.bin/pascal/libpc/CHR.c b/usr/src/usr.bin/pascal/libpc/CHR.c
index 8e0c829..61108cb 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/CHR.c
+++ b/usr/src/usr.bin/pascal/libpc/CHR.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 /* Copyright (c) 1979 Regents of the University of California */
 

-static char sccsid[] = "@(#)CHR.c 1.4 %G%";
+static char sccsid[] = "@(#)CHR.c 1.5 %G%";

 
 char ECHR[] = "Argument to chr of %D is out of range\n";
 
 
 char ECHR[] = "Argument to chr of %D is out of range\n";
 


@@ -10,7 +10,6 @@ CHR(value)
 {
        if (value > 127) {
                ERROR(ECHR, value);
 {
        if (value > 127) {
                ERROR(ECHR, value);

-               return;

        }
        return (char)value;
 }
        }
        return (char)value;
 }

diff --git a/usr/src/usr.bin/pascal/libpc/COS.c b/usr/src/usr.bin/pascal/libpc/COS.c
index 4c9e255..28dbaec 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/COS.c
+++ b/usr/src/usr.bin/pascal/libpc/COS.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1982 Regents of the University of California */
 
 /* Copyright (c) 1982 Regents of the University of California */
 

-static char sccsid[] = "@(#)COS.c 1.1 %G%";
+static char sccsid[] = "@(#)COS.c 1.2 %G%";

 
 #include <math.h>
 extern int errno;
 
 #include <math.h>
 extern int errno;


@@ -15,7 +15,6 @@ COS(value)
        result = cos(value);
        if (errno != 0) {
                ERROR("Cannot compute cos(%e)\n", value);
        result = cos(value);
        if (errno != 0) {
                ERROR("Cannot compute cos(%e)\n", value);

-               return;

        }
        return result;
 }
        }
        return result;
 }

diff --git a/usr/src/usr.bin/pascal/libpc/CTTOT.c b/usr/src/usr.bin/pascal/libpc/CTTOT.c
index ea3362a..6ea6134 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/CTTOT.c
+++ b/usr/src/usr.bin/pascal/libpc/CTTOT.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 /* Copyright (c) 1979 Regents of the University of California */
 

-static char sccsid[] = "@(#)CTTOT.c 1.4 %G%";
+static char sccsid[] = "@(#)CTTOT.c 1.5 %G%";

 
 #include "whoami.h"
 #include "h00vars.h"
 
 #include "whoami.h"
 #include "h00vars.h"


@@ -29,21 +29,43 @@ long        _mask[] = {
 #              endif DEC11
            };
 /*
 #              endif DEC11
            };
 /*

- * Constant set constructor
+ * Constant set constructors.
+ *
+ * CTTOT is called from compiled Pascal.  It takes the list of ranges
+ * and single elements on the stack, varargs style.
+ *
+ * CTTOTA is called from the px interpreter.  It takes a pointer to the
+ * list of ranges and single elements.
+ *
+ * This was easier than changing the compiler to pass a pointer into
+ * its own partially-constructed stack, while working to make px portable.

  */
 
  */
 

+long *CTTOTA();
+

 long *
 long *

-CTTOT(result0, lwrbnd, uprbnd, paircnt, singcnt, data)
+CTTOT(result, lwrbnd, uprbnd, paircnt, singcnt, data)

 
 

-       long    *result0;       /* pointer to final set */
+       long    *result;        /* pointer to final set */

        long    lwrbnd;         /* lower bound of set */
        long    uprbnd;         /* upper - lower of set */
        long    paircnt;        /* number of pairs to construct */
        long    singcnt;        /* number of singles to construct */
        long    data;           /* paircnt plus singcnt sets of data */
 {
        long    lwrbnd;         /* lower bound of set */
        long    uprbnd;         /* upper - lower of set */
        long    paircnt;        /* number of pairs to construct */
        long    singcnt;        /* number of singles to construct */
        long    data;           /* paircnt plus singcnt sets of data */
 {

-       register long   *result = result0;
-       register long   *dataptr = &data;
+       return CTTOTA(result, lwrbnd, uprbnd, paircnt, singcnt, &data);
+}
+
+long *
+CTTOTA(result, lwrbnd, uprbnd, paircnt, singcnt, dataptr)
+
+       register long   *result;        /* pointer to final set */
+       long    lwrbnd;                 /* lower bound of set */
+       long    uprbnd;                 /* upper - lower of set */
+       long    paircnt;                /* number of pairs to construct */
+       long    singcnt;                /* number of singles to construct */
+       register long   *dataptr;       /* ->paircnt plus singcnt data values */
+{

        int             lowerbnd = lwrbnd;
        int             upperbnd = uprbnd;
        register long   *lp;
        int             lowerbnd = lwrbnd;
        int             upperbnd = uprbnd;
        register long   *lp;


@@ -66,13 +88,11 @@ CTTOT(result0, lwrbnd, uprbnd, paircnt, singcnt, data)
                if (upper < 0 || upper > upperbnd) {
                        ERROR("Range upper bound of %D out of set bounds\n",
                                *--dataptr);
                if (upper < 0 || upper > upperbnd) {
                        ERROR("Range upper bound of %D out of set bounds\n",
                                *--dataptr);

-                       return;

                }
                lower = *dataptr++ - lowerbnd;
                if (lower < 0 || lower > upperbnd) {
                        ERROR("Range lower bound of %D out of set bounds\n",
                                *--dataptr);
                }
                lower = *dataptr++ - lowerbnd;
                if (lower < 0 || lower > upperbnd) {
                        ERROR("Range lower bound of %D out of set bounds\n",
                                *--dataptr);

-                       return;

                }
                if (lower > upper) {
                        continue;
                }
                if (lower > upper) {
                        continue;


@@ -98,7 +118,6 @@ CTTOT(result0, lwrbnd, uprbnd, paircnt, singcnt, data)
                lower = *dataptr++ - lowerbnd;
                if (lower < 0 || lower > upperbnd) {
                        ERROR("Value of %D out of set bounds\n", *--dataptr);
                lower = *dataptr++ - lowerbnd;
                if (lower < 0 || lower > upperbnd) {
                        ERROR("Value of %D out of set bounds\n", *--dataptr);

-                       return;

                }
                cp[ lower >> LG2BITSBYTE ] |= (1 << (lower & MSKBITSBYTE));
        }
                }
                cp[ lower >> LG2BITSBYTE ] |= (1 << (lower & MSKBITSBYTE));
        }

diff --git a/usr/src/usr.bin/pascal/libpc/EXP.c b/usr/src/usr.bin/pascal/libpc/EXP.c
index 7ad8032..59988cf 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/EXP.c
+++ b/usr/src/usr.bin/pascal/libpc/EXP.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1982 Regents of the University of California */
 
 /* Copyright (c) 1982 Regents of the University of California */
 

-static char sccsid[] = "@(#)EXP.c 1.1 %G%";
+static char sccsid[] = "@(#)EXP.c 1.2 %G%";

 
 #include <math.h>
 extern int errno;
 
 #include <math.h>
 extern int errno;


@@ -15,7 +15,6 @@ EXP(value)
        result = exp(value);
        if (errno != 0) {
                ERROR("exp(%e) yields a result that is out of the range of reals\n", value);
        result = exp(value);
        if (errno != 0) {
                ERROR("exp(%e) yields a result that is out of the range of reals\n", value);

-               return;

        }
        return result;
 }
        }
        return result;
 }

diff --git a/usr/src/usr.bin/pascal/libpc/FNIL.c b/usr/src/usr.bin/pascal/libpc/FNIL.c
index 1ce1f0a..2871cd6 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/FNIL.c
+++ b/usr/src/usr.bin/pascal/libpc/FNIL.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 /* Copyright (c) 1979 Regents of the University of California */
 

-static char sccsid[] = "@(#)FNIL.c 1.3 %G%";
+static char sccsid[] = "@(#)FNIL.c 1.4 %G%";

 
 #include "h00vars.h"
 
 
 #include "h00vars.h"
 


@@ -11,11 +11,9 @@ FNIL(curfile)
 {
        if (curfile->fblk >= MAXFILES || _actfile[curfile->fblk] != curfile) {
                ERROR("Reference to an inactive file\n", 0);
 {
        if (curfile->fblk >= MAXFILES || _actfile[curfile->fblk] != curfile) {
                ERROR("Reference to an inactive file\n", 0);

-               return;

        }
        if (curfile->funit & FDEF) {
                ERROR("%s: Reference to an inactive file\n", curfile->pfname);
        }
        if (curfile->funit & FDEF) {
                ERROR("%s: Reference to an inactive file\n", curfile->pfname);

-               return;

        }
        if (curfile->funit & FREAD) {
                IOSYNC(curfile);
        }
        if (curfile->funit & FREAD) {
                IOSYNC(curfile);

diff --git a/usr/src/usr.bin/pascal/libpc/LN.c b/usr/src/usr.bin/pascal/libpc/LN.c
index 6da3f9b..1507a9b 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/LN.c
+++ b/usr/src/usr.bin/pascal/libpc/LN.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 /* Copyright (c) 1979 Regents of the University of California */
 

-static char sccsid[] = "@(#)LN.c 1.4 %G%";
+static char sccsid[] = "@(#)LN.c 1.5 %G%";

 
 #include <math.h>
 
 
 #include <math.h>
 


@@ -11,7 +11,6 @@ LN(value)
 {
        if (value <= 0) {
                ERROR("Non-positive argument of %e to ln\n", value);
 {
        if (value <= 0) {
                ERROR("Non-positive argument of %e to ln\n", value);

-               return;

        }
        return log(value);
 }
        }
        return log(value);
 }

diff --git a/usr/src/usr.bin/pascal/libpc/MAX.c b/usr/src/usr.bin/pascal/libpc/MAX.c
index 36fc127..e556d60 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/MAX.c
+++ b/usr/src/usr.bin/pascal/libpc/MAX.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 /* Copyright (c) 1979 Regents of the University of California */
 

-static char sccsid[] = "@(#)MAX.c 1.4 %G%";
+static char sccsid[] = "@(#)MAX.c 1.5 %G%";

 
 #include "h00vars.h"
 
 
 #include "h00vars.h"
 


@@ -13,7 +13,6 @@ MAX(width, reduce, min)
 {
        if (width <= 0) {
                ERROR("Non-positive format width: %D\n", width);
 {
        if (width <= 0) {
                ERROR("Non-positive format width: %D\n", width);

-               return;

        }
        if ((width -= reduce) >= min)
                return width;
        }
        if ((width -= reduce) >= min)
                return width;

diff --git a/usr/src/usr.bin/pascal/libpc/NAM.c b/usr/src/usr.bin/pascal/libpc/NAM.c
index 64dc784..510e0cf 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/NAM.c
+++ b/usr/src/usr.bin/pascal/libpc/NAM.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 /* Copyright (c) 1979 Regents of the University of California */
 

-static char sccsid[] = "@(#)NAM.c 1.3 %G%";
+static char sccsid[] = "@(#)NAM.c 1.4 %G%";

 
 #include "h00vars.h"
 
 
 #include "h00vars.h"
 


@@ -17,7 +17,6 @@ NAM(val, name)
        if (value < 0 || value >= *sptr) {
                ERROR("Enumerated type value of %D is out of range on output\n",
                        val);
        if (value < 0 || value >= *sptr) {
                ERROR("Enumerated type value of %D is out of range on output\n",
                        val);

-               return;

        }
        sptr++;
        return  name + 2 + sptr[value];
        }
        sptr++;
        return  name + 2 + sptr[value];

diff --git a/usr/src/usr.bin/pascal/libpc/NIL.c b/usr/src/usr.bin/pascal/libpc/NIL.c
index dfbf6f9..3f82faa 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/NIL.c
+++ b/usr/src/usr.bin/pascal/libpc/NIL.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 /* Copyright (c) 1979 Regents of the University of California */
 

-static char sccsid[] = "@(#)NIL.c 1.3 %G%";
+static char sccsid[] = "@(#)NIL.c 1.4 %G%";

 
 #include "h00vars.h"
 
 
 #include "h00vars.h"
 


@@ -12,7 +12,6 @@ NIL(ptr)
 {
        if (ptr > _maxptr || ptr < _minptr) {
                ERROR(ENIL, 0);
 {
        if (ptr > _maxptr || ptr < _minptr) {
                ERROR(ENIL, 0);

-               return;

        }
        return ptr;
 }
        }
        return ptr;
 }

diff --git a/usr/src/usr.bin/pascal/libpc/PRED.c b/usr/src/usr.bin/pascal/libpc/PRED.c
index 67363ee..55abb6b 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/PRED.c
+++ b/usr/src/usr.bin/pascal/libpc/PRED.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 /* Copyright (c) 1979 Regents of the University of California */
 

-static char sccsid[] = "@(#)PRED.c 1.4 %G%";
+static char sccsid[] = "@(#)PRED.c 1.5 %G%";

 
 
 long
 
 
 long


@@ -12,12 +12,10 @@ PRED(value, lower, upper)
 {
        if (value == lower) {
                ERROR("Cannot take pred of first element of a range\n");
 {
        if (value == lower) {
                ERROR("Cannot take pred of first element of a range\n");

-               return;

        }
        value--;
        if (value < lower || value > upper) {
                ERROR("Value of %D is out of range\n", value);
        }
        value--;
        if (value < lower || value > upper) {
                ERROR("Value of %D is out of range\n", value);

-               return;

        }
        return  value;
 }
        }
        return  value;
 }

diff --git a/usr/src/usr.bin/pascal/libpc/RANG4.c b/usr/src/usr.bin/pascal/libpc/RANG4.c
index ef08228..5df35ac 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/RANG4.c
+++ b/usr/src/usr.bin/pascal/libpc/RANG4.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 /* Copyright (c) 1979 Regents of the University of California */
 

-static char sccsid[] = "@(#)RANG4.c 1.4 %G%";
+static char sccsid[] = "@(#)RANG4.c 1.5 %G%";

 
 char ERANG[] = "Value of %D is out of range\n";
 
 
 char ERANG[] = "Value of %D is out of range\n";
 


@@ -12,7 +12,6 @@ RANG4(value, lower, upper)
 {
        if (value < lower || value > upper) {
                ERROR(ERANG, value);
 {
        if (value < lower || value > upper) {
                ERROR(ERANG, value);

-               return;

        }
        return  value;
 }
        }
        return  value;
 }

diff --git a/usr/src/usr.bin/pascal/libpc/READ4.c b/usr/src/usr.bin/pascal/libpc/READ4.c
index 43eeaf0..f91273f 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/READ4.c
+++ b/usr/src/usr.bin/pascal/libpc/READ4.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 /* Copyright (c) 1979 Regents of the University of California */
 

-static char sccsid[] = "@(#)READ4.c 1.8 %G%";
+static char sccsid[] = "@(#)READ4.c 1.9 %G%";

 
 #include "h00vars.h"
 #include <errno.h>
 
 #include "h00vars.h"
 #include <errno.h>


@@ -17,26 +17,21 @@ READ4(curfile)
        if (curfile->funit & FWRITE) {
                ERROR("%s: Attempt to read, but open for writing\n",
                        curfile->pfname);
        if (curfile->funit & FWRITE) {
                ERROR("%s: Attempt to read, but open for writing\n",
                        curfile->pfname);

-               return;

        }
        UNSYNC(curfile);
        errno = 0;
        retval = fscanf(curfile->fbuf, "%ld", &data);
        if (retval == EOF) {
                ERROR("%s: Tried to read past end of file\n", curfile->pfname);
        }
        UNSYNC(curfile);
        errno = 0;
        retval = fscanf(curfile->fbuf, "%ld", &data);
        if (retval == EOF) {
                ERROR("%s: Tried to read past end of file\n", curfile->pfname);

-               return;

        }
        if (retval == 0) {
                ERROR("%s: Bad data found on integer read\n", curfile->pfname);
        }
        if (retval == 0) {
                ERROR("%s: Bad data found on integer read\n", curfile->pfname);

-               return;

        }
        if (errno == ERANGE) {
                ERROR("%s: Overflow on integer read\n", curfile->pfname);
        }
        if (errno == ERANGE) {
                ERROR("%s: Overflow on integer read\n", curfile->pfname);

-               return;

        }
        if (errno != 0) {
                PERROR("Error encountered on integer read ", curfile->pfname);
        }
        if (errno != 0) {
                PERROR("Error encountered on integer read ", curfile->pfname);

-               return;

        }
        return data;
 }
        }
        return data;
 }

diff --git a/usr/src/usr.bin/pascal/libpc/READ8.c b/usr/src/usr.bin/pascal/libpc/READ8.c
index 4ec2508..99cdd60 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/READ8.c
+++ b/usr/src/usr.bin/pascal/libpc/READ8.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 /* Copyright (c) 1979 Regents of the University of California */
 

-static char sccsid[] = "@(#)READ8.c 1.9 %G%";
+static char sccsid[] = "@(#)READ8.c 1.10 %G%";

 
 #include "h00vars.h"
 #include <errno.h>
 
 #include "h00vars.h"
 #include <errno.h>


@@ -16,29 +16,24 @@ READ8(curfile)
        if (curfile->funit & FWRITE) {
                ERROR("%s: Attempt to read, but open for writing\n",
                        curfile->pfname);
        if (curfile->funit & FWRITE) {
                ERROR("%s: Attempt to read, but open for writing\n",
                        curfile->pfname);

-               return;

        }
        UNSYNC(curfile);
        errno = 0;
        retval = readreal(curfile, &data);
        if (retval == EOF) {
                ERROR("%s: Tried to read past end of file\n", curfile->pfname);
        }
        UNSYNC(curfile);
        errno = 0;
        retval = readreal(curfile, &data);
        if (retval == EOF) {
                ERROR("%s: Tried to read past end of file\n", curfile->pfname);

-               return;

        }
        if (retval == 0) {
                ERROR("%s: Bad data found on real read\n", curfile->pfname);
        }
        if (retval == 0) {
                ERROR("%s: Bad data found on real read\n", curfile->pfname);

-               return;

        }
        if (errno == ERANGE) {
                if (data == 0.0)
                        ERROR("%s: Underflow on real read\n", curfile->pfname);
                else
                        ERROR("%s: Overflow on real read\n", curfile->pfname);
        }
        if (errno == ERANGE) {
                if (data == 0.0)
                        ERROR("%s: Underflow on real read\n", curfile->pfname);
                else
                        ERROR("%s: Overflow on real read\n", curfile->pfname);

-               return;

        }
        if (errno != 0) {
                PERROR("Error encountered on real read ", curfile->pfname);
        }
        if (errno != 0) {
                PERROR("Error encountered on real read ", curfile->pfname);

-               return;

        }
        return (data);
 }
        }
        return (data);
 }

diff --git a/usr/src/usr.bin/pascal/libpc/READC.c b/usr/src/usr.bin/pascal/libpc/READC.c
index 144326a..e218efe 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/READC.c
+++ b/usr/src/usr.bin/pascal/libpc/READC.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 /* Copyright (c) 1979 Regents of the University of California */
 

-static char sccsid[] = "@(#)READC.c 1.2 %G%";
+static char sccsid[] = "@(#)READC.c 1.3 %G%";

 
 #include "h00vars.h"
 
 
 #include "h00vars.h"
 


@@ -14,12 +14,10 @@ READC(curfile)
        if (curfile->funit & FWRITE) {
                ERROR("%s: Attempt to read, but open for writing\n",
                        curfile->pfname);
        if (curfile->funit & FWRITE) {
                ERROR("%s: Attempt to read, but open for writing\n",
                        curfile->pfname);

-               return;

        }
        IOSYNC(curfile);
        if (curfile->funit & EOFF) {
                ERROR("%s: Tried to read past end of file\n", curfile->pfname);
        }
        IOSYNC(curfile);
        if (curfile->funit & EOFF) {
                ERROR("%s: Tried to read past end of file\n", curfile->pfname);

-               return;

        }
        curfile->funit |= SYNC;
        return *curfile->fileptr;
        }
        curfile->funit |= SYNC;
        return *curfile->fileptr;

diff --git a/usr/src/usr.bin/pascal/libpc/READE.c b/usr/src/usr.bin/pascal/libpc/READE.c
index 95ef20a..e8f6f16 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/READE.c
+++ b/usr/src/usr.bin/pascal/libpc/READE.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 /* Copyright (c) 1979 Regents of the University of California */
 

-static char sccsid[] = "@(#)READE.c 1.6 %G%";
+static char sccsid[] = "@(#)READE.c 1.7 %G%";

 
 #include "h00vars.h"
 
 
 #include "h00vars.h"
 


@@ -21,7 +21,6 @@ READE(curfile, name)
        if (curfile->funit & FWRITE) {
                ERROR("%s: Attempt to read, but open for writing\n",
                        curfile->pfname);
        if (curfile->funit & FWRITE) {
                ERROR("%s: Attempt to read, but open for writing\n",
                        curfile->pfname);

-               return;

        }
        UNSYNC(curfile);
        retval = fscanf(curfile->fbuf,
        }
        UNSYNC(curfile);
        retval = fscanf(curfile->fbuf,


@@ -29,7 +28,6 @@ READE(curfile, name)
            namebuf);
        if (retval == EOF) {
                ERROR("%s: Tried to read past end of file\n", curfile->pfname);
            namebuf);
        if (retval == EOF) {
                ERROR("%s: Tried to read past end of file\n", curfile->pfname);

-               return;

        }
        if (retval == 0)
                goto ename;
        }
        if (retval == 0)
                goto ename;


@@ -49,4 +47,5 @@ READE(curfile, name)
        } while (--cnt);
 ename:
        ERROR("Unknown name \"%s\" found on enumerated type read\n", namebuf);
        } while (--cnt);
 ename:
        ERROR("Unknown name \"%s\" found on enumerated type read\n", namebuf);

+       return 0;

 }
 }

diff --git a/usr/src/usr.bin/pascal/libpc/RSNG4.c b/usr/src/usr.bin/pascal/libpc/RSNG4.c
index 68be591..acecb86 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/RSNG4.c
+++ b/usr/src/usr.bin/pascal/libpc/RSNG4.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 /* Copyright (c) 1979 Regents of the University of California */
 

-static char sccsid[] = "@(#)RSNG4.c 1.4 %G%";
+static char sccsid[] = "@(#)RSNG4.c 1.5 %G%";

 
 extern char ERANG[];   /* ERANG is defined in RANG4.c */
 
 
 extern char ERANG[];   /* ERANG is defined in RANG4.c */
 


@@ -11,7 +11,6 @@ RSNG4(value, upper)
 {
        if (value > upper) {
                ERROR(ERANG, value);
 {
        if (value > upper) {
                ERROR(ERANG, value);

-               return;

        }
        return  value;
 }
        }
        return  value;
 }

diff --git a/usr/src/usr.bin/pascal/libpc/SIN.c b/usr/src/usr.bin/pascal/libpc/SIN.c
index 3df8b2e..84c9242 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/SIN.c
+++ b/usr/src/usr.bin/pascal/libpc/SIN.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1982 Regents of the University of California */
 
 /* Copyright (c) 1982 Regents of the University of California */
 

-static char sccsid[] = "@(#)SIN.c 1.1 %G%";
+static char sccsid[] = "@(#)SIN.c 1.2 %G%";

 
 #include <math.h>
 extern int errno;
 
 #include <math.h>
 extern int errno;


@@ -15,7 +15,6 @@ SIN(value)
        result = sin(value);
        if (errno != 0) {
                ERROR("Cannot compute sin(%e)\n", value);
        result = sin(value);
        if (errno != 0) {
                ERROR("Cannot compute sin(%e)\n", value);

-               return;

        }
        return result;
 }
        }
        return result;
 }

diff --git a/usr/src/usr.bin/pascal/libpc/SQRT.c b/usr/src/usr.bin/pascal/libpc/SQRT.c
index e08c780..9245b93 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/SQRT.c
+++ b/usr/src/usr.bin/pascal/libpc/SQRT.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 /* Copyright (c) 1979 Regents of the University of California */
 

-static char sccsid[] = "@(#)SQRT.c 1.3 %G%";
+static char sccsid[] = "@(#)SQRT.c 1.4 %G%";

 
 #include <math.h>
 
 
 #include <math.h>
 


@@ -11,7 +11,6 @@ SQRT(value)
 {
        if (value < 0) {
                ERROR("Negative argument of %e to sqrt\n", value);
 {
        if (value < 0) {
                ERROR("Negative argument of %e to sqrt\n", value);

-               return;

        }
        return sqrt(value);
 }
        }
        return sqrt(value);
 }

diff --git a/usr/src/usr.bin/pascal/libpc/SUBSC.c b/usr/src/usr.bin/pascal/libpc/SUBSC.c
index 7ddb7e7..15e3d51 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/SUBSC.c
+++ b/usr/src/usr.bin/pascal/libpc/SUBSC.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 /* Copyright (c) 1979 Regents of the University of California */
 

-static char sccsid[] = "@(#)SUBSC.c 1.4 %G%";
+static char sccsid[] = "@(#)SUBSC.c 1.5 %G%";

 
 char ESUBSC[] = "Subscript value of %D is out of range\n";
 
 
 char ESUBSC[] = "Subscript value of %D is out of range\n";
 


@@ -11,7 +11,6 @@ SUBSC(i, lower, upper)
 {
        if (i < lower || i > upper) {
                ERROR(ESUBSC, i);
 {
        if (i < lower || i > upper) {
                ERROR(ESUBSC, i);

-               return;

        }
        return i;
 }
        }
        return i;
 }

diff --git a/usr/src/usr.bin/pascal/libpc/SUBSCZ.c b/usr/src/usr.bin/pascal/libpc/SUBSCZ.c
index cb6cb0e..1a5c1d7 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/SUBSCZ.c
+++ b/usr/src/usr.bin/pascal/libpc/SUBSCZ.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 /* Copyright (c) 1979 Regents of the University of California */
 

-static char sccsid[] = "@(#)SUBSCZ.c 1.4 %G%";
+static char sccsid[] = "@(#)SUBSCZ.c 1.5 %G%";

 
 extern char ESUBSC[];  /* ESUBSC is defined in SUBSCZ.c */
 
 
 extern char ESUBSC[];  /* ESUBSC is defined in SUBSCZ.c */
 


@@ -11,7 +11,6 @@ SUBSCZ(value, upper)
 {
        if (value > upper) {
                ERROR(ESUBSC, value);
 {
        if (value > upper) {
                ERROR(ESUBSC, value);

-               return;

        }
        return value;
 }
        }
        return value;
 }

diff --git a/usr/src/usr.bin/pascal/libpc/SUCC.c b/usr/src/usr.bin/pascal/libpc/SUCC.c
index c5744a4..f6e43e4 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/SUCC.c
+++ b/usr/src/usr.bin/pascal/libpc/SUCC.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 /* Copyright (c) 1979 Regents of the University of California */
 

-static char sccsid[] = "@(#)SUCC.c 1.4 %G%";
+static char sccsid[] = "@(#)SUCC.c 1.5 %G%";

 
 
 long
 
 
 long


@@ -12,12 +12,10 @@ SUCC(value, lower, upper)
 {
        if (value == upper) {
                ERROR("Cannot take succ of last element of a range\n");
 {
        if (value == upper) {
                ERROR("Cannot take succ of last element of a range\n");

-               return;

        }
        value++;
        if (value < lower || value > upper) {
                ERROR("Value of %D is out of range\n", value);
        }
        value++;
        if (value < lower || value > upper) {
                ERROR("Value of %D is out of range\n", value);

-               return;

        }
        return  value;
 }
        }
        return  value;
 }