BSD 4_3_Tahoe release

[unix-history] / usr / src / usr.bin / bc.y

diff --git a/usr/src/usr.bin/bc.y b/usr/src/usr.bin/bc.y
index 96da39f..598f4c8 100644 (file)
--- a/usr/src/usr.bin/bc.y
+++ b/usr/src/usr.bin/bc.y
@@ -1,5 +1,5 @@
 %{
 %{

-static char *sccsid = "@(#)bc.y        4.3 (Berkeley) 85/11/28";
+static char *sccsid = "@(#)bc.y        4.5 (Berkeley) 88/04/24";

        int *getout();
 %}
 %right '='
        int *getout();
 %}
 %right '='


@@ -17,7 +17,8 @@ static        char *sccsid = "@(#)bc.y        4.3 (Berkeley) 85/11/28";
 
 %{
 #include <stdio.h>
 
 %{
 #include <stdio.h>

-int in;
+#include <varargs.h>
+FILE *in;

 char cary[1000], *cp = { cary };
 char string[1000], *str = {string};
 int crs = '0';
 char cary[1000], *cp = { cary };
 char string[1000], *str = {string};
 int crs = '0';


@@ -475,19 +476,22 @@ int b_space [ b_sp_max ];
 int * b_sp_nxt = { b_space };
 
 int bdebug = 0;
 int * b_sp_nxt = { b_space };
 
 int bdebug = 0;

-bundle(a){
-       int i, *p, *q;
+/*VARARGS*/
+bundle(va_alist) va_dcl {
+       va_list ap;
+       int i, *q;

 
 

-       p = &a;
-       i = *p++;
+       va_start(ap);
+       i = va_arg(ap, int);

        q = b_sp_nxt;
        if( bdebug ) printf("bundle %d elements at %o\n",i,  q );
        while(i-- > 0){
                if( b_sp_nxt >= & b_space[b_sp_max] ) yyerror( "bundling space exceeded" );
        q = b_sp_nxt;
        if( bdebug ) printf("bundle %d elements at %o\n",i,  q );
        while(i-- > 0){
                if( b_sp_nxt >= & b_space[b_sp_max] ) yyerror( "bundling space exceeded" );

-               * b_sp_nxt++ = *p++;
+               * b_sp_nxt++ = va_arg(ap, int);

        }
        * b_sp_nxt++ = 0;
        yyval = q;
        }
        * b_sp_nxt++ = 0;
        yyval = q;

+       va_end(ap);

        return( q );
 }
 
        return( q );
 }
 


@@ -560,7 +564,7 @@ yyinit(argc,argv) int argc; char *argv[];{
 int *getout(){
        printf("q");
        fflush(stdout);
 int *getout(){
        printf("q");
        fflush(stdout);

-       exit();
+       exit(0);

 }
 
 int *
 }
 
 int *


@@ -582,12 +586,12 @@ char **argv;
                if((argv[1][1] == 'd')||(argv[1][1] == 'c')){
                        yyinit(--argc, ++argv);
                        yyparse();
                if((argv[1][1] == 'd')||(argv[1][1] == 'c')){
                        yyinit(--argc, ++argv);
                        yyparse();

-                       exit();
+                       exit(0);

                }
                if(argv[1][1] != 'l'){
                        printf("unrecognizable argument\n");
                        fflush(stdout);
                }
                if(argv[1][1] != 'l'){
                        printf("unrecognizable argument\n");
                        fflush(stdout);

-                       exit();
+                       exit(1);

                }
                argv[1] = "/usr/lib/lib.b";
        }
                }
                argv[1] = "/usr/lib/lib.b";
        }


@@ -599,12 +603,14 @@ char **argv;
                close(p[1]);
                yyinit(argc, argv);
                yyparse();
                close(p[1]);
                yyinit(argc, argv);
                yyparse();

-               exit();
+               exit(0);

        }
        close(0);
        dup(p[0]);
        close(p[0]);
        close(p[1]);
        }
        close(0);
        dup(p[0]);
        close(p[0]);
        close(p[1]);

-       execl("/bin/dc", "dc", "-", 0);
-       execl("/usr/bin/dc", "dc", "-", 0);
+       execl("/bin/dc", "dc", "-", (char *)0);
+       execl("/usr/bin/dc", "dc", "-", (char *)0);
+       perror("bc: can't find dc");
+       exit(1);

 }
 }