svn commit: r638674 - /stdcxx/trunk/util/collate.cpp

[se...@apache.org]

Author: sebor
Date: Tue Mar 18 18:31:11 2008
New Revision: 638674

URL: http://svn.apache.org/viewvc?rev=638674&view=rev
Log:
2008-03-18  Martin Sebor  <se...@roguewave.com>

	STDCXX-281
	* collate.cpp (preprocess_collate): Break out of a loop on EOF
	to avoid an infinite loop.

Modified:
    stdcxx/trunk/util/collate.cpp

Modified: stdcxx/trunk/util/collate.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/util/collate.cpp?rev=638674&r1=638673&r2=638674&view=diff
==============================================================================
--- stdcxx/trunk/util/collate.cpp (original)
+++ stdcxx/trunk/util/collate.cpp Tue Mar 18 18:31:11 2008
@@ -1560,7 +1560,7 @@
 {
     int nesting_level = 0;
 
-    while (true) {
+    do {
         // fetch next token
         next = scanner_.next_token();
         
@@ -1680,8 +1680,9 @@
             break;
         }
     }
-
+    while (Scanner::tok_end_tokens != next.token);
 }
+
 
 // The task of preprocess_order is to parse and model the content of the 
 // order sections in the input files