jazzplusplus-updates

SF.net SVN: jazzplusplus:[734] trunk/jazz/src/StringReadWrite.cpp

[<pst...@us...>]

Revision: 734
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=734&view=rev
Author:   pstieber
Date:     2009-08-13 22:39:39 +0000 (Thu, 13 Aug 2009)

Log Message:
-----------
Finished changing C-style I/O to C++ streams.

Modified Paths:
--------------
    trunk/jazz/src/StringReadWrite.cpp

Modified: trunk/jazz/src/StringReadWrite.cpp
===================================================================
--- trunk/jazz/src/StringReadWrite.cpp	2009-06-21 23:39:42 UTC (rev 733)
+++ trunk/jazz/src/StringReadWrite.cpp	2009-08-13 22:39:39 UTC (rev 734)
@@ -34,13 +34,13 @@
   {
     // Ignore through the first ".
     Character = Is.get();
-  } while (Character != '"' && Character != EOF);
+  } while (Character != '"' && Is.eof());
 
   // This is an intention infinite for loop.
   for (;;)
   {
     Character = Is.get();
-    if (Character == '"' || Character != EOF)
+    if (Character == '"' || Is.eof())
     {
       break;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: jazzplusplus:[818] trunk/jazz/src/StringReadWrite.cpp

[<pst...@us...>]

Revision: 818
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=818&view=rev
Author:   pstieber
Date:     2010-07-18 20:03:57 +0000 (Sun, 18 Jul 2010)

Log Message:
-----------
Fixed ReadString.

Modified Paths:
--------------
    trunk/jazz/src/StringReadWrite.cpp

Modified: trunk/jazz/src/StringReadWrite.cpp
===================================================================
--- trunk/jazz/src/StringReadWrite.cpp	2010-07-18 03:17:54 UTC (rev 817)
+++ trunk/jazz/src/StringReadWrite.cpp	2010-07-18 20:03:57 UTC (rev 818)
@@ -29,17 +29,17 @@
 //*****************************************************************************
 istream& ReadString(istream& Is, string& String)
 {
-  int Character;
+  char Character;
   do
   {
-    // Ignore through the first ".
-    Character = Is.get();
+    // Ignore through the first quote (") character.
+    Is >> Character;
   } while (Character != '"' && Is.eof());
 
-  // This is an intention infinite for loop.
+  // This is an intentional infinite loop.
   for (;;)
   {
-    Character = Is.get();
+    Is >> Character;
     if (Character == '"' || Is.eof())
     {
       break;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: jazzplusplus:[819] trunk/jazz/src/StringReadWrite.cpp

[<pst...@us...>]

Revision: 819
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=819&view=rev
Author:   pstieber
Date:     2010-07-18 22:00:44 +0000 (Sun, 18 Jul 2010)

Log Message:
-----------
1. Changed Is.eof() to !Is.eof() when reading initial quote.
2. Checked for any type of stream failure when reading the rest of the string.

Modified Paths:
--------------
    trunk/jazz/src/StringReadWrite.cpp

Modified: trunk/jazz/src/StringReadWrite.cpp
===================================================================
--- trunk/jazz/src/StringReadWrite.cpp	2010-07-18 20:03:57 UTC (rev 818)
+++ trunk/jazz/src/StringReadWrite.cpp	2010-07-18 22:00:44 UTC (rev 819)
@@ -34,13 +34,13 @@
   {
     // Ignore through the first quote (") character.
     Is >> Character;
-  } while (Character != '"' && Is.eof());
+  } while (Character != '"' && !Is.eof());
 
   // This is an intentional infinite loop.
   for (;;)
   {
     Is >> Character;
-    if (Character == '"' || Is.eof())
+    if (Character == '"' || Is.eof() || Is.fail())
     {
       break;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.