[Swig-cvs] SWIG/Source/Swig scanner.c,1.15,1.16

[Olly B. <ol...@us...>]

Update of /cvsroot/swig/SWIG/Source/Swig
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv32295/Source/Swig

Modified Files:
	scanner.c 
Log Message:
Use isxdigit().


Index: scanner.c
===================================================================
RCS file: /cvsroot/swig/SWIG/Source/Swig/scanner.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** scanner.c	6 Mar 2006 22:51:00 -0000	1.15
--- scanner.c	28 Sep 2006 06:45:46 -0000	1.16
***************
*** 233,237 ****
  	    if((c = nextchar(s)) == 0) return(0);
        
! 	    /* Process delimeters */
  
  	    if (c == '\n') {
--- 233,237 ----
  	    if((c = nextchar(s)) == 0) return(0);
        
! 	    /* Process delimiters */
  
  	    if (c == '\n') {
***************
*** 530,534 ****
  	    break;
  	case 83:
! 	    /* Might be a hexidecimal or octal number */
  	    if ((c = nextchar(s)) == 0) return SWIG_TOKEN_INT;
  	    if (isdigit(c)) state = 84;
--- 530,534 ----
  	    break;
  	case 83:
! 	    /* Might be a hexadecimal or octal number */
  	    if ((c = nextchar(s)) == 0) return SWIG_TOKEN_INT;
  	    if (isdigit(c)) state = 84;
***************
*** 560,567 ****
  	    /* This is an hex number */
  	    if ((c = nextchar(s)) == 0) return SWIG_TOKEN_INT;
! 	    if ((isdigit(c)) || (c=='a') || (c=='b') || (c=='c') ||
! 		(c=='d') || (c=='e') || (c=='f') || (c=='A') ||
! 		(c=='B') || (c=='C') || (c=='D') || (c=='E') ||
! 		(c=='F'))
  		state = 85;
  	    else if ((c == 'l') || (c == 'L')) {
--- 560,564 ----
  	    /* This is an hex number */
  	    if ((c = nextchar(s)) == 0) return SWIG_TOKEN_INT;
! 	    if (isxdigit(c))
  		state = 85;
  	    else if ((c == 'l') || (c == 'L')) {
***************
*** 602,606 ****
  		retract(s,1);
  		return SWIG_TOKEN_LONG;
! 	    } 
  	    break;
  
--- 599,603 ----
  		retract(s,1);
  		return SWIG_TOKEN_LONG;
! 	    }
  	    break;