Merge pull request #16 from ryukinix/hotfixes

Hotfixes after the new release

Author: ryukinix

src/truth-table.lisp

@@ -5,7 +5,7 @@
 
 (defparameter *truth-string* "T")
 (defparameter *false-string* "F")
-(defparameter *output-stream* *standard-output*
+(defparameter *output-stream* nil
   "Default stream to write the results")
 
 (defun propositionp (symbol)
@@ -211,10 +211,11 @@ a tautology."
 
 (defun main ()
   (format t "Example of usage: (p ^ q)~%Operators: ~a ~%" *valid-operators*)
-  (handler-case (loop do (princ "TRUTH-TABLE> ")
-                      do (force-output)
-                      do (print-truth-table (infix-to-prefix (read))))
-    (end-of-file () )
-    #+sbcl (sb-sys:interactive-interrupt () nil))
-
-  (format t "~%Goodbye!~%"))
+  (let ((*output-stream* *standard-output*))
+   (handler-case (loop do (princ-n "TRUTH-TABLE> ")
+                       do (force-output *output-stream*)
+                       do (print-truth-table (infix-to-prefix (read))))
+     (end-of-file () )
+     #+sbcl (sb-sys:interactive-interrupt () nil))
+
+   (format t "~%Goodbye!~%")))

web/webapp.lisp

@@ -12,13 +12,13 @@
                 #:defapp)
   (:export #:start
            #:stop
-           #:*propostion*
+           #:*proposition*
            #:*port*)
   (:nicknames #:webapp))
 
 (in-package lisp-inference/web)
 
-(defvar *proposition* '(P => Q) "Default proposition")
+(defvar *proposition* "P => Q" "Default proposition")
 (defvar *port* (find-port:find-port))
 
 (defapp truth-table
@@ -34,6 +34,15 @@
     :initform nil
     :accessor truth)))
 
+(defun parse-string (string)
+  "Translate string to a list expression"
+  (mapcar (lambda (x)
+            (intern (string-upcase x) :lisp-inference))
+          (str:words string)))
+
+(defun trim-paren (string)
+  (string-trim '(#\( #\)) string))
+
 (defun truth-table (exp)
   (with-output-to-string (s)
     (let ((inference:*output-stream* s))
@@ -57,9 +66,7 @@
 (defmethod update-proposition (table (string string))
   (update-proposition
     table
-    (mapcar (lambda (x)
-              (intern (string-upcase x)))
-            (str:words (string-trim '(#\( #\)) string)))))
+    (parse-string string)))
 
 (defmethod render ((table table))
   (with-html
@@ -68,7 +75,7 @@
                              (update-proposition table prop)))
       (:input :type "text"
               :name "prop"
-              :placeholder (prop table))
+              :placeholder (trim-paren (prop table)))
       (:input :type "submit"
               :value "Eval"))
     (:pre (truth table))))
@@ -79,7 +86,7 @@
 
 (defmethod weblocks/session:init ((app truth-table))
   (declare (ignorable app))
-  (create-table *proposition*))
+  (create-table (parse-string *proposition*)))
 
 (defun start (&optional (port *port*))
   (weblocks/debug:on)