Handle TODOS

Add extra test case

Author: MightyHelper

.idea/workspace.xml

@@ -160,7 +160,6 @@ private Token lexChar() {
 		if (!Objects.equals(reader.peek(), "\\")) {
 			// Unescaped char
 			String c = reader.get();
-			if (Objects.equals(c, "\n")) throw new IllegalCharError(location, "Line break in unescaped char is not valid");
 			if (!Objects.equals(reader.get(), "'")) throw new CharTooLongError(location, reader.getLocation().clone());
 			return new Token(TokenType.CHR_DATA, "'" + c + "'", location);
 		}

src/main/java/ko/carbonel/stream/Lexer.java

@@ -40,22 +40,21 @@ protected void onConsume(String top) {
 
 	@Override
 	protected String getNext() {
+		if (!isOpen) return Utils.STR_EOF;
 		try {
-			if (!isOpen) return Utils.STR_EOF;
 			if (fis.available() != 0) return readChar();
 			closeStream();
 			return Utils.STR_EOF;
 		} catch (IOException e) {
-			// TODO: Handleme
-			throw new RuntimeException(e);
+			throw new RuntimeException("Error while reading source code input stream", e);
 		}
 	}
 
 	private String readChar() throws IOException {
 		int c1 = fis.read();
 		int c2 = 0;
 		String value = String.valueOf((char) c1);
-		if (c1 == 195 || c1 == 194) { // UTF-8 multiple byte characters
+		if (c1 == 195 || c1 == 194) { // UTF-8 multiple byte characters that are in the alphabet
 			c2 = fis.read();
 			value = new String(new byte[]{(byte) c1, (byte) c2});
 		}
@@ -75,8 +74,7 @@ private void closeStream() {
 			isOpen = false;
 			fis.close();
 		} catch (IOException e) {
-			// TODO: Handleme
-			throw new RuntimeException(e);
+			System.err.println("WARNING: Error while closing source code input stream");
 		}
 	}
 

src/main/java/ko/carbonel/stream/SourceFileReader.java

@@ -150,7 +150,12 @@ static Stream<Arguments> readOkFiles() {
 			), Arguments.of(
 				"16.rs", List.of(
 					param(0, 0, 0, "áéíóúüñÁÉÍÓÚÜÑ", TokenType.ID),
-					param(0, "áéíóúüñÁÉÍÓÚÜÑ".length(), "áéíóúüñÁÉÍÓÚÜÑ".length(), "\"? @ # $ ^ / ` ~ ° ¨ ´ ¡ ¿ ' \\\"\\\\ _| & + - = ! < > * / %{ [ ( ) ] }. : , ;\\n [ASCII 10] ' ' [ASCII 32] \\t [ASCII 9] \\v [ASCII 11] \\r [ASCII 13]0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzá é í ó ú ü ñ Á É Í Ó Ú Ü Ñ\"", TokenType.STR_DATA)
+					param(0, "áéíóúüñÁÉÍÓÚÜÑ".length(), "áéíóúüñÁÉÍÓÚÜÑ".length(),
+						"\"? @ # $ ^ / ` ~ ° ¨ ´ ¡ ¿ ' \\\"\\\\ _| & + - = ! < > * / %{ [ ( ) ] }. : , ;\\n [ASCII 10] " +
+							"' ' [ASCII 32] \\t [ASCII 9] \\v [ASCII 11] \\r [ASCII 13]" +
+							"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzá é í ó ú ü ñ Á É Í Ó Ú Ü Ñ\"",
+						TokenType.STR_DATA
+					)
 				)
 			), Arguments.of(
 				"17.rs", List.of(
@@ -199,8 +204,9 @@ static Stream<Arguments> readExceptionFiles() {
 			param("12.rs", UnterminatedBlockCommentError.class),
 			param("13.rs", UnterminatedCharError.class),
 			param("14.rs", UnterminatedStringError.class),
-			 param("15.rs", IllegalSymbolError.class),
-			 param("20.rs", IllegalStringError.class)
+			param("15.rs", IllegalSymbolError.class),
+			param("20.rs", IllegalStringError.class),
+			param("22.rs", CharTooLongError.class)
 		);
 	}
 

src/test/java/ko/carbonel/LexerTest.java

@@ -0,0 +1,2 @@
+/*CharTooLongError*/
+bla bla '\  ' foo