Fixing issues

1 files changed, 6 insertions, 6 deletions

diff --git a/basic.lsp b/basic.lsp
index a91cc1c..feec2a6 100644
--- a/basic.lsp
+++ b/basic.lsp
@@ -78,8 +78,8 @@
           (pr2 (priority-uop op))
           (res-e (ppl pr2 (expr expr))))
          (if (= pr 0)
-             (parenthesis (string-append res-op res-e))
-             (string-append res-op res-e))))
+             (string-append res-op res-e)
+             (parenthesis (string-append res-op res-e)))))
 (defmethod ppl (pr (expr <exp-bin>))
    (let* ((op (op expr))
           (pr2 (priority-binop op))
@@ -114,7 +114,7 @@
 (defmethod pp-command ((cmd <cmd-goto>))
    (string-append "GOTO " (convert (num cmd) <string>)))
 (defmethod pp-command ((cmd <cmd-print>))
-   (string-append "PRNT " (pp-expression (expr cmd))))
+   (string-append "PRINT " (pp-expression (expr cmd))))
 (defmethod pp-command ((cmd <cmd-input>))
    (string-append "INPUT " (var cmd)))
 (defmethod pp-command ((cmd <cmd-if>))
@@ -123,7 +123,7 @@
    (string-append "LET " (var cmd) " = " (pp-expression (expr cmd))))
 
 (defun pp-line (l)
-   (string-append (convert (car l) <string>) "  " (pp-command (cdr l))))
+   (string-append (convert (num l) <string>) "  " (pp-command (cmd l))))
 
 ;;; Lexing
 (defclass <lexeme> () () (:abstractp t))
@@ -133,8 +133,8 @@
 (defclass <lstring> (<lexeme>) ((lstring :reader lstring)))
 (defclass <lend> (<lexeme>) ())
 
-(defclass <string-lexer> () ((string :initarg s :accessor string)
-                             (current :initform 0 :accessor current)
+(defclass <string-lexer> () ((str :initarg s :accessor str)
+                             (curr :initform 0 :accessor curr)
                              (size :accessor size)))
 
 (defmethod initialize-object :after ((self <string-lexer>) initargs)