Changeset 12696

Timestamp:

07/17/11 12:33:46 (2 years ago)

Author:

robert

Message:

From Wang Rui, merged from svn/trunk revision 12695. "improved the handling of the _preReadString within the readWrappedString method by factoring the
reading of the next character into a dedicated getCharacter(..) method."

Files:

• OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgPlugins/osg/AsciiStreamOperator.h (modified) (4 diffs)

OpenSceneGraph/branches/OpenSceneGraph-3.0/src/osgPlugins/osg/AsciiStreamOperator.h

@@ -247 +247 @@
     virtual void readWrappedString( std::string& str )
     {
-        if ( !_preReadString.empty() )
-        {
-            str = _preReadString;
-            return;
-        }
-        
         char ch;
-        _in->get( ch ); checkStream();
+        getCharacter( ch );
 
         // skip white space
         while ( ch==' ' || (ch=='\n') || (ch=='\r'))
         {
-            _in->get( ch ); checkStream();
+            getCharacter( ch );
         }
 
@@ -265 +259 @@
         {
             // we have an "wrapped string"
-            _in->get( ch ); checkStream();
+            getCharacter( ch );
             while ( ch!='"' )
             {
                 if (ch=='\\')
                 {
-                    _in->get( ch ); checkStream();
+                    getCharacter( ch );
                     str += ch;
                 }
                 else str += ch;
 
-                _in->get( ch ); checkStream();
+                getCharacter( ch );
             }
         }
@@ -284 +278 @@
             {
                 str += ch;
-                _in->get( ch ); checkStream();
+                getCharacter( ch );
             }
         }
@@ -322 +316 @@
     
 protected:
+    void getCharacter( char& ch )
+    {
+        if ( !_preReadString.empty() )
+        {
+            ch = _preReadString[0];
+            _preReadString.erase( _preReadString.begin() );
+        }
+        else
+        {
+            _in->get( ch );
+            checkStream();
+        }
+    }
+    
     std::string _preReadString;
 };