🚨 complete tests for repeat-until

Author: igorkulman

PascalInterpreter/PascalInterpreter/Parser/Parser.swift

@@ -300,7 +300,7 @@ public class Parser {
 
     /**
      Rule:
-     
+
      repeat_until : REPEAT statement UNTIL condition
      */
     private func repeatUntilLoop() -> RepeatUntil {
@@ -316,7 +316,7 @@ public class Parser {
         }
         eat(.until)
         let condition = self.condition()
-        return RepeatUntil(statement: Compound(children: statements), condition: condition)
+        return RepeatUntil(statement: statements.count == 1 ? statements[0] : Compound(children: statements), condition: condition)
     }
 
     /**

PascalInterpreter/PascalInterpreterTests/InterpreterTests.swift

@@ -195,7 +195,7 @@ class InterpreterTests: XCTestCase {
 
     func testProgramWithRecursiveFunctionsAndParameterTheSameName() {
         let program =
-        """
+            """
             program Main;
             var number, result: integer;
 
@@ -224,7 +224,7 @@ class InterpreterTests: XCTestCase {
 
     func testProgramWithRepeatUntil() {
         let program =
-        """
+            """
             program Main;
             var x: integer;
 
@@ -239,5 +239,10 @@ class InterpreterTests: XCTestCase {
 
         let interpeter = Interpreter(program)
         interpeter.interpret()
+        let (integerState, realState, boolState, stringState) = interpeter.getState()
+        XCTAssert(realState == [:])
+        XCTAssert(integerState == ["x": 6])
+        XCTAssert(boolState == [:])
+        XCTAssert(stringState == [:])
     }
 }

PascalInterpreter/PascalInterpreterTests/ParserTests.swift

@@ -422,6 +422,11 @@ class ParserTests: XCTestCase {
 
         let parser = Parser(program)
         let result = parser.parse()
+        let xDec = VariableDeclaration(variable: Variable(name: "x"), type: VariableType(type: .integer))
+        let compound = Compound(children: [Assignment(left: Variable(name: "x"), right: Number.integer(0)), RepeatUntil(statement: Assignment(left: Variable(name: "x"), right: BinaryOperation(left: Variable(name: "x"), operation: BinaryOperationType.plus, right: Number.integer(1))), condition: Condition(type: .equals, leftSide: Variable(name: "x"), rightSide: Number.integer(6))), FunctionCall(name: "writeln", actualParameters: [Variable(name: "x")]), NoOp()])
+        let block = Block(declarations: [xDec], compound: compound)
+        let node = Program(name: "Main", block: block)
+        XCTAssertEqual(result, node)
     }
 
 }

PascalInterpreter/PascalInterpreterTests/XCTestCase+FatalError.swift

@@ -134,6 +134,9 @@ func XCTAssertEqual(_ left: AST, _ right: AST) {
         XCTAssert(left == right)
     case let (left as Bool, right as Bool):
         XCTAssert(left == right)
+    case let (left as RepeatUntil, right as RepeatUntil):
+        XCTAssertEqual(left.condition, right.condition)
+        XCTAssertEqual(left.statement, right.statement)
     default:
         XCTFail("\(left) and \(right) are not equal")
     }