[PD-cvs] pd/src m_binbuf.c,1.1.1.4.2.4,1.1.1.4.2.4.2.1

[matju at users.sourceforge.net]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30915

Modified Files:
      Tag: impd_0_37
	m_binbuf.c 
Log Message:
merging GG's removal of quote hack


Index: m_binbuf.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_binbuf.c,v
retrieving revision 1.1.1.4.2.4
retrieving revision 1.1.1.4.2.4.2.1
diff -C2 -d -r1.1.1.4.2.4 -r1.1.1.4.2.4.2.1
*** m_binbuf.c	18 Nov 2003 10:34:10 -0000	1.1.1.4.2.4
--- m_binbuf.c	5 Mar 2004 18:28:42 -0000	1.1.1.4.2.4.2.1
***************
*** 66,70 ****
      t_atom *ap;
      int nalloc = 16, natom = 0;
! 	int escape = 0;  /* GG: escape mechanism */
  
      t_freebytes(x->b_vec, x->b_n * sizeof(*x->b_vec));
--- 66,73 ----
      t_atom *ap;
      int nalloc = 16, natom = 0;
! 
! #ifdef GG_ESCAPE_HACK
!     int escape = 0;  /* GG: escape mechanism */
! #endif
  
      t_freebytes(x->b_vec, x->b_n * sizeof(*x->b_vec));
***************
*** 79,87 ****
  	    || *textp == '\r' || *textp == '\t')) textp++;
  
  	/* GG: escape mechanism */
  	if (*textp == '"') escape = !escape,textp++; 
  		while ((textp != etext) && !escape && (*textp == ' ' || *textp == '\n' || *textp == '\r' || *textp == '\t')) 
  			textp++; 
!     
  	if (textp == etext) break;
  	if (*textp == ';') SETSEMI(ap), textp++;
--- 82,91 ----
  	    || *textp == '\r' || *textp == '\t')) textp++;
  
+ #ifdef GG_ESCAPE_HACK
  	/* GG: escape mechanism */
  	if (*textp == '"') escape = !escape,textp++; 
  		while ((textp != etext) && !escape && (*textp == ' ' || *textp == '\n' || *textp == '\r' || *textp == '\t')) 
  			textp++; 
! #endif
  	if (textp == etext) break;
  	if (*textp == ';') SETSEMI(ap), textp++;
***************
*** 160,166 ****
  	    }
  	    while (textp != etext && bufp != ebuf && 
! 			((escape && (*textp != '"')) || slash ||   /* GG: escape mechanism */
! 			(*textp != ' ' && *textp != '\n'&& *textp != '"' && *textp != '\r'
! 		    && *textp != '\t' &&*textp != ',' && *textp != ';')));
  	    *bufp = 0;
  #if 0
--- 164,173 ----
  	    }
  	    while (textp != etext && bufp != ebuf && 
! 		(slash || (*textp != ' ' && *textp != '\n' && *textp != '\r'
!                     && *textp != '\t' &&*textp != ',' && *textp != ';'
! #ifdef GG_ESCAPE_HACK
! 		    && *textp != '"') || (escape && (*textp != '"')  /* GG: */
! #endif
!                    )));
  	    *bufp = 0;
  #if 0