WebSVN – planix.SVN – Diff – /os/branches/feature_posix/sys/src/cmd/cpp/lex.c

 	S_STNL, S_COMNL, S_EOFCOM, S_COMMENT, S_EOB, S_WS, S_NAME
 };
 struct	fsm {
 	int	state;		/* if in this state */
-	uchar	ch[4];		/* and see one of these characters */
+	uint	ch[5];		/* and see one of these characters */
 	int	nextstate;	/* enter this state if +ve */
 };
 /*const*/ struct fsm fsm[] = {
 	/* start state */
 	-1
 };
 /* first index is char, second is state */
 /* increase #states to power of 2 to encourage use of shift */
-short	bigfsm[256][MAXSTATE];
+short	bigfsm[256+2][MAXSTATE];
 void
 expandlex(void)
+{
 	/*const*/ struct fsm *fp;
 			if (nstate >= S_SELF)
 				nstate = ~nstate;
 			switch (fp->ch[i]) {
 			case C_XX:		/* random characters */
-				for (j=0; j<256; j++)
+				for (j=0; j<256+2; j++)
 					bigfsm[j][fp->state] = nstate;
 				continue;
 			case C_ALPH:
-				for (j=0; j<=256; j++)
+				for (j=0; j<=256+2; j++)
 					if ('a'<=j&&j<='z' || 'A'<=j&&j<='Z'
 					  || UTF2(j) || UTF3(j) || j=='_')
 						bigfsm[j][fp->state] = nstate;
 				continue;
 			case C_NUM:
 		tp->wslen = 0;
 		tp->flag = 0;
 		state = START;
 		for (;;) {
 			oldstate = state;
+//print ("old state = %d .. %d\n",oldstate, ID1);
+			if (ip >= s->inl){
+				c=s->eob;
+				//print ("eob found %d\n",c);
+                        }
+			else{
-			c = *ip;
+				c = *ip;
+			}
+//			printf("[%c(%d)]",c,c);
 			if ((state = bigfsm[c][state]) >= 0) {
 				ip += runelen;
 				runelen = 1;
 				continue;
+			}
 			state = ~state;
+//print ("xor state > 0 = %d  S_NAME=%d, S_NL=%d\n",state,S_NAME,S_NL);
 		reswitch:
 			switch (state&0177) {
 			case S_SELF:
+//print("self\n");
 				ip += runelen;
 				runelen = 1;
 			case S_SELFB:
+//print("selfb\n");
 				tp->type = GETACT(state);
 				tp->len = ip - tp->t;
 				tp++;
 				goto continue2;
 			case S_NAME:	/* like S_SELFB but with nmac check */
+//print("Name state\n");
 				tp->type = NAME;
 				tp->len = ip - tp->t;
 				nmac |= quicklook(tp->t[0], tp->len>1?tp->t[1]:0);
 				tp++;
 				goto continue2;
 			case S_WS:
 				tp->wslen = ip - tp->t;
 				tp->t = ip;
 				state = START;
 				continue;
 			default:
 				if ((state&QBSBIT)==0) {
 					ip += runelen;
 					runelen = 1;
 					continue;
 				}
 				state &= ~QBSBIT;
 				s->inp = ip;
 				if (c=='?') { 	/* check trigraph */
 					if (trigraph(s)) {
 						state = oldstate;
 						continue;
 					}
 					goto reswitch;
 				}
 				if (c=='\\') { /* line-folding */
 					if (foldline(s)) {
 						s->lineinc++;
 						state = oldstate;
 						continue;
+					}
 					goto reswitch;
+				}
 				if (UTF2(c)) {
 					runelen = 2;
 					goto reswitch;
 				}
 				if (UTF3(c)) {
 					runelen = 3;
 					goto reswitch;
+				}
 				error(WARNING, "Lexical botch in cpp");
 				ip += runelen;
 				runelen = 1;
 				continue;
 			case S_EOB:
+//				print ("fill buffer\n");
 				s->inp = ip;
 				fillbuf(cursource);
 				state = oldstate;
 				continue;
 			case S_EOF:
+//				print("The end eof\n");
 				tp->type = END;
 				tp->len = 0;
 				s->inp = ip;
 				if (tp!=trp->bp && (tp-1)->type!=NL && cursource->fd!=-1)
 					error(WARNING,"No newline at end of file");
 				trp->lp = tp+1;
 				return nmac;
 			case S_STNL:
 				error(ERROR, "Unterminated string or char const");
 			case S_NL:
+//print ("We are at nl state\n");
 				tp->t = ip;
 				tp->type = NL;
 				tp->len = 1;
 				tp->wslen = 0;
 				s->lineinc++;
+	}
 	if (s->inp[ncr+1] == '\n') {
 		memmove(s->inp, s->inp+2+ncr, s->inl-s->inp+3-ncr);
 		s->inl -= 2+ncr;
 		return 1;
 	}
 	return 0;
+}
 int
 fillbuf(Source *s)
 		s->inl = s->inb + l;
 		s->inp = s->inb + p;
+	}
 	if (s->fd<0 || (n=read(s->fd, (char *)s->inl, s->ins/8)) <= 0)
 		n = 0;
-	if ((*s->inp&0xff) == EOB) /* sentinel character appears in input */
+//	if ((*s->inp&0xff) == EOB) /* sentinel character appears in input
-		*s->inp = EOFC;
+//		*s->inp = EOFC;
 	s->inl += n;
-	s->inl[0] = s->inl[1]= s->inl[2]= s->inl[3] = EOB;
+//	s->inl[0] = s->inl[1]= s->inl[2]= s->inl[3] = EOB;
-	if (n==0) {
+//	if (n==0) {
-		s->inl[0] = s->inl[1]= s->inl[2]= s->inl[3] = EOFC;
+//		s->inl[0] = s->inl[1]= s->inl[2]= s->inl[3] = EOFC;
+//		return EOF;
+//	}
+//
+	if (n!=0)
+		s->eob=EOB;
+	else {
+		s->eob=EOFC;
 		return EOF;
 	}
 	return 0;
+}
 /*
  * Push down to new source of characters.
 	s->fd = fd;
 	s->filename = name;
 	s->next = cursource;
 	s->ifdepth = 0;
 	cursource = s;
+	s->eob=EOB;
 	/* slop at right for EOB */
 	if (str) {
 		len = strlen(str);
 		s->inb = domalloc(len+4);
 		s->inp = s->inb;
 		len = 0;
+	}
 	s->ins = INS;
 	s->inl = s->inp+len;
-	s->inl[0] = s->inl[1] = EOB;
+//	s->inl[0] = s->inl[1] = EOB;
 	return s;
+}
 void
 unsetsource(void)

Subversion Repositories planix.SVN

(root)/os/branches/feature_posix/sys/src/cmd/cpp/lex.c – Rev 42 → 93