Security-59754.41.1.tar.gz

[apple/security.git] / OSX / libsecurity_codesigning / antlr2 / src / TokenStreamRewriteEngine.cpp

diff --git a/OSX/libsecurity_codesigning/antlr2/src/TokenStreamRewriteEngine.cpp b/OSX/libsecurity_codesigning/antlr2/src/TokenStreamRewriteEngine.cpp
index 4279355eb028b9b630716a8f4d4a74023e0513dc..a44f3ef02e49a0680a9d2e018c91ae2c379493e8 100644 (file)
--- a/OSX/libsecurity_codesigning/antlr2/src/TokenStreamRewriteEngine.cpp
+++ b/OSX/libsecurity_codesigning/antlr2/src/TokenStreamRewriteEngine.cpp
@@ -129,29 +129,30 @@ void TokenStreamRewriteEngine::toStream( std::ostream& out,
 
        size_t tokenCursor = firstToken;
        // make sure we don't run out of the tokens we have...
 
        size_t tokenCursor = firstToken;
        // make sure we don't run out of the tokens we have...

-       if( lastToken > (tokens.size() - 1) )
-               lastToken = tokens.size() - 1;
+    if( lastToken > (tokens.size() - 1) ) {
+        lastToken = tokens.size() - 1;
+    }

 
 

-               while ( tokenCursor <= lastToken )
-               {
+    while ( tokenCursor <= lastToken )
+    {

 //                     std::cout << "tokenCursor = " << tokenCursor << " first prog index = " << (*rewriteOpIndex)->getIndex() << std::endl;
 
 //                     std::cout << "tokenCursor = " << tokenCursor << " first prog index = " << (*rewriteOpIndex)->getIndex() << std::endl;
 

-                       if( rewriteOpIndex != rewriteOpEnd )
-                       {
-                               size_t up_to_here = std::min(lastToken,(*rewriteOpIndex)->getIndex());
-                               while( tokenCursor < up_to_here )
-                                       out << tokens[tokenCursor++]->getText();
-                       }
-                       while ( rewriteOpIndex != rewriteOpEnd &&
-                                         tokenCursor == (*rewriteOpIndex)->getIndex() &&
-                                         tokenCursor <= lastToken )
-                       {
-                               tokenCursor = (*rewriteOpIndex)->execute(out);
-                               ++rewriteOpIndex;
-                       }
-                       if( tokenCursor <= lastToken )
-                               out << tokens[tokenCursor++]->getText();
-               }
+        if( rewriteOpIndex != rewriteOpEnd )
+        {
+            size_t up_to_here = std::min(lastToken,(*rewriteOpIndex)->getIndex());
+            while( tokenCursor < up_to_here )
+                out << tokens[tokenCursor++]->getText();
+        }
+        while ( rewriteOpIndex != rewriteOpEnd &&
+                  tokenCursor == (*rewriteOpIndex)->getIndex() &&
+                  tokenCursor <= lastToken )
+        {
+            tokenCursor = (*rewriteOpIndex)->execute(out);
+            ++rewriteOpIndex;
+        }
+        if( tokenCursor <= lastToken )
+            out << tokens[tokenCursor++]->getText();
+    }

        // std::cout << "Handling tail operations # left = " << std::distance(rewriteOpIndex,rewriteOpEnd) << std::endl;
        // now see if there are operations (append) beyond last token index
        std::for_each( rewriteOpIndex, rewriteOpEnd, executeOperation(out) );
        // std::cout << "Handling tail operations # left = " << std::distance(rewriteOpIndex,rewriteOpEnd) << std::endl;
        // now see if there are operations (append) beyond last token index
        std::for_each( rewriteOpIndex, rewriteOpEnd, executeOperation(out) );