From 091a882409debf24cf717ad53e1388e2bada6832 Mon Sep 17 00:00:00 2001 From: Frank Duncan Date: Sat, 11 Jul 2015 19:05:38 -0500 Subject: [PATCH] Check whitespace at end of lines --- resources/whitespaceendline.lisp | 8 ++++++++ resources/whitespacelines.lisp | 8 ++++++++ src/main/checker.lisp | 26 +++++++++++++++++++++++--- 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 resources/whitespaceendline.lisp create mode 100644 resources/whitespacelines.lisp diff --git a/resources/whitespaceendline.lisp b/resources/whitespaceendline.lisp new file mode 100644 index 0000000..068ff19 --- /dev/null +++ b/resources/whitespaceendline.lisp @@ -0,0 +1,8 @@ +(in-package #:nothing) + +(defun hello-world (a b c) + (progn + (with-open-file (str "increasinglylongfilenamesfailme.dat" :direction :input :if-does-not-exist :create) + (when + (read-line str) + (format t "This file had some things in int, yay!~%"))))) diff --git a/resources/whitespacelines.lisp b/resources/whitespacelines.lisp new file mode 100644 index 0000000..3724206 --- /dev/null +++ b/resources/whitespacelines.lisp @@ -0,0 +1,8 @@ +(in-package #:nothing) + +(defun hello-world (a b c) + (progn + (with-open-file (str "increasinglylongfilenamesfailme.dat" :direction :input :if-does-not-exist :create) + (when + (read-line str) + (format t "This file had some things in int, yay!~%"))))) diff --git a/src/main/checker.lisp b/src/main/checker.lisp index a9c4082..8bae64f 100644 --- a/src/main/checker.lisp +++ b/src/main/checker.lisp @@ -9,7 +9,8 @@ ; - No tabs ; - Only one space between elements in a form on a single line ; * in-package must be first line in file unless file is package.lisp -; - No whitespace only lines +; * No whitespace at end of line +; * No lines that are only whitespace ; - No empty lines at end of file ; * Only one in-package per file ; @@ -32,6 +33,8 @@ (defparameter *possible-states* '(:begin ; start of file :normal ; normal processing + :beginning-of-line + :beginning-of-symbols ))) @@ -57,7 +60,7 @@ (and ,scanner (stringp text) (multiple-value-bind (start end) (cl-ppcre:scan ,scanner text) - (and start end (= 0 start) (/= 0 end))))))) + (and start end (= 0 start))))))) (lambda (text) (second (multiple-value-list (cl-ppcre:scan ,scanner text)))) ,func) *evaluators*)))) @@ -110,8 +113,22 @@ (constantly "Only one in-package per file")) (defevaluator :normal "\\n" (lambda () + (set-state :beginning-of-line) (incf *line-no*) - (setf *col-no* 0) + (setf *col-no* -1) + nil)) + (defevaluator :normal " +\\n" + (lambda () + "No whitespace at end of line")) + (defevaluator :beginning-of-line " *" + (lambda () + (set-state :beginning-of-symbols) + nil)) + (defevaluator :beginning-of-symbols "\\n" + (lambda () (when (< 0 *col-no*) "No whitespace only lines"))) + (defevaluator :beginning-of-symbols "" + (lambda () + (set-state :normal) nil)) (defevaluator :normal "\\(" (lambda () @@ -127,5 +144,8 @@ ((not form) "Unmatched ending paren") ((< 50 (- *line-no* (car form))) "Forms can't be over 50 lines long"))))) +(cl-ppcre:scan (cl-ppcre:create-scanner " *") " +asdf asdf") + (defevaluator :normal "." (constantly nil)) ) -- 2.25.1