[frontierkernel-commits] Frontier/Common/source oplangtext.c,1.5,1.6

[Seth D. <set...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26445

Modified Files:
	oplangtext.c 
Log Message:
Fixed another problem with round-trips from script to string and back. Comment lines that were children of non comment lines, such as the easter-egg line found at the bottom of system.verbs.apps.amazon.artistSearch were causing the script to fail (found by Thomas). This pointed out a way to clean up a little bit of the code's ugliness, and fix the reported problem at the same time.

Index: oplangtext.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/oplangtext.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** oplangtext.c	25 Jan 2006 00:39:02 -0000	1.5
--- oplangtext.c	25 Jan 2006 16:26:02 -0000	1.6
***************
*** 180,191 ****
  		if (flmakeitpretty) {
  			
! 			if (!copyhandle ((**h).headstring, &bshead)) 
  				goto exit;
  			
  			ch = chcomment;
  			
! 			if (!insertinhandle (bshead, 0, &ch, 1L))
  				goto exit;
- 			
  			}
  		
--- 180,190 ----
  		if (flmakeitpretty) {
  			
! 			if (!copyhandle ((**h).headstring, &bscomment)) 
  				goto exit;
  			
  			ch = chcomment;
  			
! 			if (!insertinhandle (bscomment, 0, &ch, 1L))
  				goto exit;
  			}
  		
***************
*** 194,204 ****
  		if (opnavigate (left, &nomad) && opnestedincomment (nomad)) {
  			
- 			if (!copyhandle (bshead, &bscomment))
- 				goto exit;
- 			
  			flparentwascomment = true;
  			
  			goto L2;
- 			
  			}
  		
--- 193,199 ----
***************
*** 349,353 ****
  			}
  		}
- 		
  	else {
  		
--- 344,347 ----