Improved terminal input and printing

Multiple calculations can now be calculated after each other, quit with "q" or "quit" Removed RPN printing from terminal
domenicw · Jan 15, 2018 · 9b207cb · 9b207cb
1 parent e59733c
commit 9b207cb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/Calculator/main.swift b/Calculator/main.swift
@@ -8,12 +8,20 @@
 
 import Foundation
 
-let text = readLine()
+let quit: [String] = ["q", "quit"]
 
-if let text = text {
+while true {
+
+    print("> ", separator: "", terminator: "")
+
+    let txt = readLine()
+
+    guard let text = txt, !quit.contains(text.lowercased()) else {
+        break
+    }
+
     let interpreter = Interpreter(text)
+    print(">> = ", separator: "", terminator: "")
     print(interpreter.interpret())
-} else {
-    fatalError("Error: no input!")
+    print("")
 }
-
diff --git a/Interpreter/Interpreter.swift b/Interpreter/Interpreter.swift
@@ -105,8 +105,8 @@ class Interpreter {
     */
     public func interpret() -> Int {
         let tree = self.parser.parse()
-        let rpn = RPN(tree)
-        rpn.print()
+        //let rpn = RPN(tree)
+        //rpn.print()
         return self.eval(tree)
     }