Changeset 1392:b87aa8f0feb8 in lemon-0.x

Timestamp:

04/27/05 12:37:03 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1849

Message:

Changed input operator.

File:

• src/lemon/xy.h (modified) (2 diffs)

src/lemon/xy.h

@@ -160 +160 @@
   ///
   template<typename T>
-  inline
-  std::istream& operator>>(std::istream &is, xy<T> &z)
-  {
-
-    is >> z.x >> z.y;
+  inline std::istream& operator>>(std::istream &is, xy<T> &z) {
+    char c;
+    if (is >> c) {
+      if (c != '(') is.putback(c);
+    } else {
+      is.clear();
+    }
+    if (!(is >> z.x)) return is;
+    if (is >> c) {
+      if (c != ',') is.putback(c);
+    } else {
+      is.clear();
+    }
+    if (!(is >> z.y)) return is;
+    if (is >> c) {
+      if (c != ')') is.putback(c);
+    } else {
+      is.clear();
+    }
     return is;
   }
@@ -174 +188 @@
   ///
   template<typename T>
-  inline
-  std::ostream& operator<<(std::ostream &os, xy<T> z)
+  inline std::ostream& operator<<(std::ostream &os, const xy<T>& z)
   {
     os << "(" << z.x << ", " << z.y << ")";