BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.bin / pascal / libpc / PRED.c

diff --git a/usr/src/usr.bin/pascal/libpc/PRED.c b/usr/src/usr.bin/pascal/libpc/PRED.c
index 14af012..969a0c7 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/PRED.c
+++ b/usr/src/usr.bin/pascal/libpc/PRED.c
@@ -1,19 +1,53 @@
-/* Copyright (c) 1979 Regents of the University of California */
+/*-
+ * Copyright (c) 1979 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */

 
 

-static char sccsid[] = "@(#)PRED.c 1.1 %G%";
-
-#include "h01errs.h"
+#ifndef lint
+static char sccsid[] = "@(#)PRED.c     1.6 (Berkeley) 4/9/90";
+#endif /* not lint */

 
 

+long

 PRED(value, lower, upper)
 
 PRED(value, lower, upper)
 

-       int     value;
-       int     lower;
-       int     upper;
+       long    value;
+       long    lower;
+       long    upper;

 {
 {

+       if (value == lower) {
+               ERROR("Cannot take pred of first element of a range\n");
+       }

        value--;
        if (value < lower || value > upper) {
        value--;
        if (value < lower || value > upper) {

-               ERROR(ERANGE, value);
-               return;
+               ERROR("Value of %D is out of range\n", value);

        }
        return  value;
 }
        }
        return  value;
 }