refactoring

Author: raydac

src/main/java/com/igormaznitsa/prologparser/tokenizer/Tokenizer.java

@@ -768,6 +768,10 @@ state, getLastTokenLine(),
                       strBuffer.append(result.getDecoded());
                     }
                   }
+                } else {
+                  if (!(chr == '\r' && specCharBuffer.isEmpty())) {
+                    throw new PrologParserException("Unexpected char: 0x" + Integer.toHexString(chr), this.prevLine, this.prevPos);
+                  }
                 }
               } else {
                 switch (chr) {
@@ -847,12 +851,16 @@ state, getLastTokenLine(),
                       theChar = chr;
                     }
                     if (charCodeAsInt) {
-                      return this.tokenizerResultPool.find().setData(
-                          new PrologInt(theChar),
-                          state,
-                          getLastTokenLine(),
-                          getLastTokenPos()
-                      );
+                      if (Character.isWhitespace(chr)) {
+                        throw new PrologParserException("Unexpected whitespace char: 0x" + Integer.toHexString(chr), this.prevLine, this.prevPos);
+                      } else {
+                        return this.tokenizerResultPool.find().setData(
+                            new PrologInt(theChar),
+                            state,
+                            getLastTokenLine(),
+                            getLastTokenPos()
+                        );
+                      }
                     } else {
                       strBuffer.append(theChar);
                     }

src/test/java/com/igormaznitsa/prologparser/IntegrationTest.java

@@ -1107,6 +1107,35 @@ public void testStandardTermOrder() {
    */
   @Test
   public void testConformity() {
+
+    assertEquals("writeq('\\e')", parseEd("writeq('\\033\\').").next().toString());
+
+    assertEquals("writeq('a\\n b')", parseEd("writeq('a\\\n b'). % \"a\\\\\\n b\" ").next().toString());
+    assertEquals("writeq('a\\nb')", parseEd("writeq('a\\\nb'). % \"a\\\\\\nb\" ").next().toString());
+    assertEquals("writeq('\\n')", parseEd("writeq('\\\n'). % \"\\\\ \\n\"").next().toString());
+    assertEquals("writeq('a\\n b')", parseEd("writeq('a\\\n b'). % \"a\\\\\\n b\"").next().toString());
+    assertEquals("writeq('a\\nb')", parseEd("writeq('a\\\nb'). % \"a\\\\\\nb\" ").next().toString());
+    assertEquals("writeq('\\na')", parseEd("writeq('\\\na'). % \"\\\\\\na\" ").next().toString());
+    assertEquals("writeq('\\n')", parseEd("writeq('\\\n'). % \"\\\\\\n\" ").next().toString());
+
+    assertThrows(PrologParserException.class, () -> parseEd("X = 0'\\. .").next());
+    assertThrows(PrologParserException.class, () -> parseEd("X = 0'\\.").next());
+    assertThrows(PrologParserException.class, () -> parseEd("'\\\n''.").next());
+    assertThrows(PrologParserException.class, () -> parseEd("writeq(.").next());
+    assertThrows(PrologParserException.class, () -> parseEd("writeq('").next());
+    assertThrows(PrologParserException.class, () -> parseEd("X = 0'\\u1.").next());
+    assertThrows(PrologParserException.class, () -> parseEd("writeq('\\u1').").next());
+    assertThrows(PrologParserException.class, () -> parseEd("writeq('\\\t'). % \"\\\\\\t\"").next());
+    assertThrows(PrologParserException.class, () -> parseEd("writeq('\\ \n'). % \"\\\\ \\n\"").next());
+    assertThrows(PrologParserException.class, () -> parseEd("writeq('\\ ').").next());
+    assertThrows(PrologParserException.class, () -> parseEd("0'\\t=0' . % horiz. tab").next());
+    assertThrows(PrologParserException.class, () -> parseEd("'").next());
+    assertThrows(PrologParserException.class, () -> parseEd(")").next());
+    assertThrows(NoSuchElementException.class, () -> parseEd(".").next());
+    assertThrows(PrologParserException.class, () -> parseEd("writeq('\t'). % horiz. tab ").next());
+    assertThrows(PrologParserException.class, () -> parseEd("writeq('\n').").next());
+
+    assertEquals("writeq('\\n')", parseEd("writeq('\\n').").next().toString());
     assertThrows(PrologParserException.class, () -> parseEd("writeq('\\9\\').").next());
     assertEquals("writeq('\\0\\')", parseEd("writeq('\\0\\').").next().toString());
     assertEquals("writeq('\\a')", parseEd("writeq('\\7\\').").next().toString());