# Patch created by springjp
# Date: Fri Oct 25 14:58:17 EDT 2002
# Repository: pnet
# Comments:
# 
#### End of Preamble ####

#### Patch data follows ####
Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ChangeLog,v
retrieving revision 1.1762
diff -u -c -r1.1762 ChangeLog
*** ChangeLog	23 Oct 2002 21:14:30 -0000	1.1762
--- ChangeLog	25 Oct 2002 18:58:18 -0000
***************
*** 1,4 ****
--- 1,8 ----
  
+ 2002-10-25  Jonathan Springer <address@hidden>
+ 
+ 	* cscc/common/cc_main.c:  Change error parsing to accomodate bison 1.75.
+ 
  2002-10-24  Rhys Weatherley  <address@hidden>
  
  	* engine/int_proto.h, engine/int_table.c, samples/I18N.CJK.dll,
Index: cscc/common/cc_main.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/common/cc_main.c,v
retrieving revision 1.19
diff -u -c -r1.19 cc_main.c
*** cscc/common/cc_main.c	28 Aug 2002 06:34:59 -0000	1.19
--- cscc/common/cc_main.c	25 Oct 2002 18:58:22 -0000
***************
*** 1062,1068 ****
  					else if(newmsg[posn + 1] == '"')
  					{
  						/* Convert <`"> into <> */
! 						++posn;
  					}
  					else if(newmsg[posn + 1] == '`' ||
  					        newmsg[posn + 1] == '\'')
--- 1062,1068 ----
  					else if(newmsg[posn + 1] == '"')
  					{
  						/* Convert <`"> into <> */
! 						posn += 2;
  					}
  					else if(newmsg[posn + 1] == '`' ||
  					        newmsg[posn + 1] == '\'')
***************
*** 1084,1090 ****
  				else if(newmsg[posn] == '"' && newmsg[posn + 1] == '\'')
  				{
  					/* Convert <"'> into <> */
! 					++posn;
  				}
  				else if(newmsg[posn] == '\'' && newmsg[posn + 1] == '"' &&
  				        newmsg[posn + 2] == '\'')
--- 1084,1090 ----
  				else if(newmsg[posn] == '"' && newmsg[posn + 1] == '\'')
  				{
  					/* Convert <"'> into <> */
! 					posn += 2;
  				}
  				else if(newmsg[posn] == '\'' && newmsg[posn + 1] == '"' &&
  				        newmsg[posn + 2] == '\'')
***************
*** 1098,1103 ****
--- 1098,1114 ----
  					/* Convert <''> into <'> */
  					++posn;
  					newmsg[outposn++] = '\'';
+ 				}
+ 				else if( newmsg[posn] == ' ' && newmsg[posn + 1] == '\'')
+ 				{
+ 					/*  bison 1.75 - <'> following a space becomes <`> */
+ 					++posn;
+ 					newmsg[outposn++] = ' ';
+ 					newmsg[outposn++] = '`';
+ 				}
+ 				else if(newmsg[posn] == '"')
+ 				{
+ 					/* Ignore quotes - bison 1.75 */
  				}
  				else
  				{
#### End of Patch data ####