Merge branch 'master' into master

Author: MysteryPig

Robot2018/src/org/usfirst/frc/team199/Robot2018/autonomous/AutoUtils.java

@@ -32,8 +32,18 @@ public static Map<String, ArrayList<String[]>> parseScriptFile(String scriptFile
 				line = line.substring(0, commentIndex);
 
 			// trim and remove extra whitespace just to make it neater
-			line = line.trim().replaceAll("\\s+", " ");
-
+			line = line.trim().replaceAll("\\s+", " ");	
+			// make coordinates with spaces also work
+			int parenIndex = line.indexOf("(");
+			while (parenIndex != -1) {
+				// removes all spaces between the parentheses
+				int endParenIndex = line.indexOf(")", parenIndex);
+				String coord = line.substring(parenIndex + 1, endParenIndex);
+				line = line.substring(0, parenIndex + 1) + coord.replaceAll(" ", "") + line.substring(endParenIndex);
+				
+				// finds next parentheses
+				parenIndex = line.indexOf("(", parenIndex + 1);
+			}
 			// if there's no instruction on this line, skip
 			if (line.equals("")) {
 				continue;
@@ -176,8 +186,9 @@ else if (instruction.equals("jump")) {
 	 * @param message
 	 *            the message to log
 	 */
-	private static void logWarning(int lineNumber, String message) {
-		System.err.println("[WARNING] Line " + lineNumber + ": " + message);
+
+	private static void logWarning (int lineNumber, String message) {
+		System.err.println("[ERROR] Line " + lineNumber + ": " + message);
 	}
 
 	/**

Robot2018/test/org/usfirst/frc/team199/Robot2018/ParseScriptFileTest.java

@@ -134,7 +134,7 @@ void test9() {
 	@Test
 	void test10() {
 		String input = "CLRx:\n"
-				+ "turn 0x4a"; // unfortunately, the program does not except hexadecimal xD
+				+ "turn 0x4a"; // unfortunately, the program does not accept hexadecimal xD
 		Map<String, ArrayList<String[]>> output = AutoUtils.parseScriptFile(input);
 
 		assertEquals(1, output.size());
@@ -148,7 +148,8 @@ void test11() {
 		Map<String, ArrayList<String[]>> output = AutoUtils.parseScriptFile(input);
 
 		assertEquals(1, output.size());
-		assertEquals(true, output.get("CLRx").isEmpty());
+		assertEquals("moveto", output.get("CLRx").get(0)[0]);
+		assertEquals("(4,20) (18,47) 39", output.get("CLRx").get(0)[1]);
 	}
 
 	@Test
@@ -168,7 +169,8 @@ void test13() {
 		Map<String, ArrayList<String[]>> output = AutoUtils.parseScriptFile(input);
 
 		assertEquals(1, output.size());
-		assertEquals(true, output.get("CLRx").isEmpty());
+		assertEquals("moveto", output.get("CLRx").get(0)[0]);
+		assertEquals("(4,20) (18,47) 39", output.get("CLRx").get(0)[1]);
 	}
 
 	@Test