BSD 4_3_Tahoe release

[unix-history] / usr / src / usr.bin / lex / sub2.c

diff --git a/usr/src/usr.bin/lex/sub2.c b/usr/src/usr.bin/lex/sub2.c
index e32e61d..bad4e71 100644 (file)
--- a/usr/src/usr.bin/lex/sub2.c
+++ b/usr/src/usr.bin/lex/sub2.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)sub2.c     4.1 (Berkeley) 8/11/83";
+static char sccsid[] = "@(#)sub2.c     4.2 (Berkeley) 1/12/88";

 #endif
 
 # include "ldefs.c"
 #endif
 
 # include "ldefs.c"


@@ -26,7 +26,7 @@ cfoll(v)
                        else if(i == RCCL || i == RNCCL){       /* compress ccl list */
                                for(j=1; j<NCH;j++)
                                        symbol[j] = (i==RNCCL);
                        else if(i == RCCL || i == RNCCL){       /* compress ccl list */
                                for(j=1; j<NCH;j++)
                                        symbol[j] = (i==RNCCL);

-                               p = left[v];
+                               p = (char *)left[v];

                                while(*p)
                                        symbol[*p++] = (i == RCCL);
                                p = pcptr;
                                while(*p)
                                        symbol[*p++] = (i == RCCL);
                                p = pcptr;


@@ -40,7 +40,7 @@ cfoll(v)
                                *pcptr++ = 0;
                                if(pcptr > pchar + pchlen)
                                        error("Too many packed character classes");
                                *pcptr++ = 0;
                                if(pcptr > pchar + pchlen)
                                        error("Too many packed character classes");

-                               left[v] = p;
+                               left[v] = (int)p;

                                name[v] = RCCL; /* RNCCL eliminated */
 # ifdef DEBUG
                                if(debug && *p){
                                name[v] = RCCL; /* RNCCL eliminated */
 # ifdef DEBUG
                                if(debug && *p){


@@ -173,7 +173,7 @@ first(v)    /* calculate set of positions with v as root which can be active initia
                        break;
                case RSCON:
                        i = stnum/2 +1;
                        break;
                case RSCON:
                        i = stnum/2 +1;

-                       p = right[v];
+                       p = (char *)right[v];

                        while(*p)
                                if(*p++ == i){
                                        first(left[v]);
                        while(*p)
                                if(*p++ == i){
                                        first(left[v]);


@@ -241,7 +241,7 @@ cgoto(){
                        else switch(name[curpos]){
                        case RCCL:
                                tryit = TRUE;
                        else switch(name[curpos]){
                        case RCCL:
                                tryit = TRUE;

-                               q = left[curpos];
+                               q = (char *)left[curpos];

                                while(*q){
                                        for(j=1;j<NCH;j++)
                                                if(cindex[j] == *q)
                                while(*q){
                                        for(j=1;j<NCH;j++)
                                                if(cindex[j] == *q)


@@ -852,7 +852,7 @@ layout(){
                else
                        {
                        int *fbarr;
                else
                        {
                        int *fbarr;

-                       fbarr = myalloc(2*NCH, sizeof(*fbarr));
+                       fbarr = (int *)myalloc(2*NCH, sizeof(*fbarr));

                        if (fbarr==0)
                                error("No space for char table reverse",0);
                        for(i=0; i<ZCH; i++)
                        if (fbarr==0)
                                error("No space for char table reverse",0);
                        for(i=0; i<ZCH; i++)