X-Git-Url: https://code.consxy.com/gitweb/gitweb.cgi?p=wolf;a=blobdiff_plain;f=src%2Fmain%2Fchecker.lisp;h=dcbe9ec6fd1ad77b0dd8ea1001f48c8e4122c5f4;hp=a9c4082dad19d2558eb8ed18baac2f71f4958d8a;hb=1f818db;hpb=c03906deb55ebe1c1cd2518df4acdafe2d116501

diff --git a/src/main/checker.lisp b/src/main/checker.lisp
index a9c4082..dcbe9ec 100644
--- a/src/main/checker.lisp
+++ b/src/main/checker.lisp
@@ -5,12 +5,14 @@
 ; * No form longer than 50 lines
 ; - Top level multiline forms must be separated by exactly one space
 ; * No line longer than 120 characters
-; - No use of unexported symbols in other packages
-; - No tabs
+; * No use of unexported symbols in other packages
+; * 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 empty lines at end of file
+; * No whitespace at end of line
+; * No lines that are only whitespace
+; * No empty lines at end of file
+; * Never have two empty lines in a row
 ; * Only one in-package per file
 ;
 ; Some thoughts
@@ -32,6 +34,10 @@
  (defparameter *possible-states*
   '(:begin ; start of file
     :normal ; normal processing
+    :beginning-of-line
+    :beginning-of-separators-with-space ; empty space in there
+    :beginning-of-symbols
+    :all ; matches everything
    )))
 
 
@@ -51,13 +57,13 @@
     (list
      (lambda (state text)
       (and
-       (eql ,state state)
+       (or (eql :all ,state) (eql ,state state))
        (or
         (and (symbolp text) (eql text ,match))
         (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*))))
@@ -101,17 +107,45 @@
 ; These are in reverse order
 (progn
  (setf *evaluators* nil)
+ (defevaluator :all "\\t"
+  (constantly "Must not use tabs"))
  (defevaluator :begin "\\(in-package[^\\)]*\\)"
   (lambda ()
    (set-state :normal) nil))
+ (defevaluator :beginning-of-separators-with-space :eof
+  (constantly "Must not end with empty line"))
+ (defevaluator :beginning-of-separators-with-space "\\n"
+  (constantly "Must not have two empty lines in a row"))
  (defevaluator :begin ".*"
   (constantly "Must begin with in-package form"))
  (defevaluator :normal "\\( *in-package "
   (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-separators-with-space " *"
+  (lambda ()
+   (set-state :beginning-of-symbols)
+   nil))
+ (defevaluator :beginning-of-symbols "\\n"
+  (lambda ()
+   (if
+    (< 0 *col-no*)
+    "No whitespace only lines"
+    (set-state :beginning-of-separators-with-space))))
+ (defevaluator :beginning-of-symbols ""
+  (lambda ()
+   (set-state :normal)
    nil))
  (defevaluator :normal "\\("
   (lambda ()
@@ -126,6 +160,8 @@
     (cond
      ((not form) "Unmatched ending paren")
      ((< 50 (- *line-no* (car form))) "Forms can't be over 50 lines long")))))
+ (defevaluator :normal "::"
+  (constantly "No internal symbols from other packages"))
 
  (defevaluator :normal "." (constantly nil))
  )