[Jython-checkins] CVS: jython/org/python/parser python.jjt,2.10,2.11

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/org/python/parser
In directory slayer.i.sourceforge.net:/tmp/cvs-serv3826

Modified Files:
	python.jjt 
Log Message:
Fix a bug with \ quoted newlines and CRLF in TQS.



Index: python.jjt
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/python.jjt,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -r2.10 -r2.11
*** python.jjt	2000/10/18 13:01:10	2.10
--- python.jjt	2000/12/12 21:09:34	2.11
***************
*** 341,356 ****
  }
  
! <IN_STRING11> TOKEN : { <SINGLE_STRING: "'"> : DEFAULT}
! <IN_STRING21> TOKEN : { <SINGLE_STRING2: "\""> : DEFAULT}
! <IN_STRING13> TOKEN : { <TRIPLE_STRING: "'''"> : DEFAULT}
! <IN_STRING23> TOKEN : { <TRIPLE_STRING2: "\"\"\""> :DEFAULT }
  
! <IN_STRING11> MORE: { <("\\" ("\\"|"'"|"\r\n"|"\n"|"\r")) | ~["\n","\r"]> }
! <IN_STRING21> MORE: { <("\\" ("\\"|"\""|"\r\n"|"\n"|"\r")) | ~["\n","\r"]> }
  <IN_STRING13> MORE: { "\\'''" }
  <IN_STRING23> MORE: { "\\\"\"\"" }
  
  <IN_STRING13, IN_STRING23> MORE:
! { <"\r\n"|"\n"|"\r">  | <~["\n","\r"]> }
  
  
--- 341,375 ----
  }
  
! <IN_STRING11> TOKEN : { <SINGLE_STRING: "'"> {
!     matchedToken.image = image.toString(); } : DEFAULT}
! <IN_STRING21> TOKEN : { <SINGLE_STRING2: "\""> {
!     matchedToken.image = image.toString(); } : DEFAULT}
! <IN_STRING13> TOKEN : { <TRIPLE_STRING: "'''"> {
!     matchedToken.image = image.toString(); } : DEFAULT}
! <IN_STRING23> TOKEN : { <TRIPLE_STRING2: "\"\"\""> { 
!     matchedToken.image = image.toString(); } : DEFAULT}
  
! <IN_STRING11,IN_STRING21> MORE: 
! {
!     <"\\\r\n">           { image.setLength(image.length()-3); }
! |   <("\\" ("\n"|"\r"))> { image.setLength(image.length()-2); }
! }
! 
! <IN_STRING11> MORE: { <("\\" ("\\"|"'")) | ~["\n","\r"]> }
! <IN_STRING21> MORE: { <("\\" ("\\"|"\"")) | ~["\n","\r"]> }
  <IN_STRING13> MORE: { "\\'''" }
  <IN_STRING23> MORE: { "\\\"\"\"" }
  
  <IN_STRING13, IN_STRING23> MORE:
! {
!     <"\r\n"> {
!         int l = image.length(); 
!         image.setLength(l-1);
!         image.setCharAt(l-2, '\n');
!     } 
! |   <"\n">
! |   <"\r"> { image.setCharAt(image.length()-1, '\n'); }
! |   <~["\n","\r"]> 
! }