From 0c40c71008860b68f3fc66764e2c8912f47915ee Mon Sep 17 00:00:00 2001 From: axell-brendow Date: Thu, 12 Nov 2020 15:40:04 -0300 Subject: [PATCH] Fix MyIO.readLine when reach EOF --- fonte/ajuda/java/MyIO.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/fonte/ajuda/java/MyIO.java b/fonte/ajuda/java/MyIO.java index 3b8a144..a206719 100644 --- a/fonte/ajuda/java/MyIO.java +++ b/fonte/ajuda/java/MyIO.java @@ -172,16 +172,14 @@ class MyIO { public static String readLine(){ String s = ""; - char tmp; try{ - do{ - tmp = (char)in.read(); - if(tmp != '\n' && tmp != 13){ - s += tmp; - } - }while(tmp != '\n'); + char tmp = (char) in.read(); + while (tmp != '\n' && tmp != (char) -1) { + if (tmp != '\r') s += tmp; + tmp = (char) in.read(); + } }catch(IOException ioe){ - System.out.println("lerPalavra: " + ioe.getMessage()); + System.out.println("MyIO.readLine: " + ioe.getMessage()); } return s; }