Fix lookahead input and introduce discarding bind

1 files changed, 3 insertions, 3 deletions

diff --git a/input.lisp b/input.lisp
index 4f803ec..1900459 100644
--- a/input.lisp
+++ b/input.lisp
@@ -6,8 +6,8 @@
   (data nil :read-only t))
 
 (defun has-data? (input &optional (window-size 1))
-  (< (+ window-size -1 (input-cursor input))
-     (length (input-data input))))
+  (<= (+ window-size (input-cursor input))
+      (length (input-data input))))
 
 (defun peek-1 (input)
   (char (input-data input)
@@ -16,7 +16,7 @@
 (defun peek-n (input window-size)
   (subseq (input-data input)
           (input-cursor input)
-          window-size))
+          (+ window-size (input-cursor input))))
 
 (defun advance (input &optional (amount 1))
   (let ((new-input (copy-structure input)))