Fix my previous fix for issue #3 which wasn't properly accounting for…

… the contents of savedWrd_.
BLLIP · Sep 23, 2011 · be613c6 · be613c6
1 parent cd47a99
commit be613c6
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/first-stage/PARSE/ewDciTokStrm.C b/first-stage/PARSE/ewDciTokStrm.C
@@ -108,9 +108,14 @@ read()             // tion, savedWrd_  may or may not be empty, and nextWrd_
                    // will be empty only if the input stream has run dry.
 {
     if (nextWrd_ == "</s>") {
-        savedWrd_ = "";
-        nextWrd_ = "";
-        return "</s>";
+        if (savedWrd_.length()) { // return saved word first
+            ECString saved = savedWrd_;
+            savedWrd_ = "";
+            return saved;
+        } else {
+            nextWrd_ = "";
+            return "</s>";
+        }
     }
 
     if( !savedWrd_.length() )