Merge pull request #70 from sentrysoftware/feature/issue-67-multiline…

…-operations

Fixed issue #67 where eol wasn't supported after && || ? : ,

src/main/java/org/sentrysoftware/jawk/frontend/AwkParser.java

@@ -340,6 +340,21 @@ private void read()
 			}
 		}
 	}
+
+	/**
+	 * Skip all whitespaces and comments
+	 * @throws IOException
+	 */
+	private void skipWhitespaces() throws IOException {
+		while (c == ' ' || c == '\t' || c == '#' || c == '\n') {
+			if (c == '#') {
+				while (c >= 0 && c != '\n') {
+					read();
+				}
+			}
+			read();
+		}
+	}
 
 	/**
 	 * Logs a warning about the syntax of the script (at which line, of which file)
@@ -477,9 +492,6 @@ private int lexer()
 				while (c >= 0 && c != '\n') {
 					read();
 				}
-//// Causes failure when comments are embedded within lines of code...
-////			if (c == '\n')
-////				read();
 			} else {
 				read();
 			}
@@ -490,6 +502,7 @@ private int lexer()
 		}
 		if (c == ',') {
 			read();
+			skipWhitespaces();
 			return token = _COMMA_;
 		}
 		if (c == '(') {
@@ -502,6 +515,7 @@ private int lexer()
 		}
 		if (c == '{') {
 			read();
+			skipWhitespaces();
 			return token = _OPEN_BRACE_;
 		}
 		if (c == '}') {
@@ -526,16 +540,19 @@ private int lexer()
 		}
 		if (c == '?') {
 			read();
+			skipWhitespaces();
 			return token = _QUESTION_MARK_;
 		}
 		if (c == ':') {
 			read();
+			skipWhitespaces();
 			return token = _COLON_;
 		}
 		if (c == '&') {
 			read();
 			if (c == '&') {
 				read();
+				skipWhitespaces();
 				return token = _AND_;
 			}
 			throw new LexerException("use && for logical and");
@@ -544,6 +561,7 @@ private int lexer()
 			read();
 			if (c == '|') {
 				read();
+				skipWhitespaces();
 				return token = _OR_;
 			}
 			return token = _PIPE_;
@@ -730,11 +748,7 @@ private int lexer()
 						read();
 					}
 				}
-				if (c == '\n') {
-					read();
-				} else {
-					read();
-				}
+				read();
 			}
 			return token = _NEWLINE_;
 		}

src/test/java/org/sentrysoftware/jawk/AwkParserTest.java

@@ -37,5 +37,16 @@ public void testStringParsing() throws Exception {
 		assertThrows("Interrupted hex number in string by EOF must throw", AwkParser.LexerException.class, () -> AwkTestHelper.runAwk("BEGIN { printf \"unfinished\\xF", null));
 		assertThrows("Interrupted hex number in string by EOL must throw", AwkParser.LexerException.class, () -> AwkTestHelper.runAwk("BEGIN { printf \"unfinished\\xf\n\"}", null));
 	}
+
+	@Test
+	public void testMultiLineStatement() throws Exception {
+		assertEquals("|| must allow eol", "success", AwkTestHelper.runAwk("BEGIN { if (0 || \n    1) { printf \"success\" } }", null));
+		assertEquals("&& must allow eol", "success", AwkTestHelper.runAwk("BEGIN { if (1 && \n    1) { printf \"success\" } }", null));
+		assertEquals("? must allow eol", "success", AwkTestHelper.runAwk("BEGIN { printf 1 ?\n\"success\" : \"failed\" }", null));
+		assertEquals(": must allow eol", "success", AwkTestHelper.runAwk("BEGIN { printf 1 ? \"success\" :\n\"failed\" }", null));
+		assertEquals(", must allow eol", "success", AwkTestHelper.runAwk("BEGIN { printf(\"%s\", \n\"success\") }", null));
+		assertEquals("do must allow eol", "success", AwkTestHelper.runAwk("BEGIN { do\n printf \"success\"; while (0) }", null));
+		assertEquals("else must allow eol", "success", AwkTestHelper.runAwk("BEGIN { if (0) { printf \"failure\" } else \n printf \"success\" }", null));
+	}
 
 }