Only one in-package per file

[wolf] / src / main / checker.lisp

diff --git a/src/main/checker.lisp b/src/main/checker.lisp
index 2ccf7f427cf40e50160b6a75020b8ede83bd3a75..a9c4082dad19d2558eb8ed18baac2f71f4958d8a 100644 (file)
--- a/src/main/checker.lisp
+++ b/src/main/checker.lisp
@@ -2,7 +2,7 @@
 
 ; Rules
 ; - Elements in each form must be indented the same amount
-; - No form longer than 50 lines
+; * 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
@@ -11,6 +11,7 @@
 ; * in-package must be first line in file unless file is package.lisp
 ; - No whitespace only lines
 ; - No empty lines at end of file
+; * Only one in-package per file
 ;
 ; Some thoughts
 ; - form starting reader macros will have to be hand added to this code
@@ -25,11 +26,13 @@
 (defvar *line-no* nil)
 (defvar *col-no* nil)
 (defvar *evaluators* nil)
+(defvar *form-stack* nil)
 
-(defparameter *possible-states*
- '(:begin ; start of file
-   :normal ; normal processing
-  ))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+ (defparameter *possible-states*
+  '(:begin ; start of file
+    :normal ; normal processing
+   )))
 
 
 (defun set-state (state)
@@ -102,12 +105,27 @@
   (lambda ()
    (set-state :normal) nil))
  (defevaluator :begin ".*"
-  (lambda ()
-   "Must begin with in-package form"))
+  (constantly "Must begin with in-package form"))
+ (defevaluator :normal "\\( *in-package "
+  (constantly "Only one in-package per file"))
  (defevaluator :normal "\\n"
   (lambda ()
    (incf *line-no*)
    (setf *col-no* 0)
    nil))
+ (defevaluator :normal "\\("
+  (lambda ()
+   (push
+    (list *line-no* *col-no*)
+    *form-stack*)
+   nil))
+ (defevaluator :normal "\\)"
+  (lambda ()
+   (let
+    ((form (pop *form-stack*)))
+    (cond
+     ((not form) "Unmatched ending paren")
+     ((< 50 (- *line-no* (car form))) "Forms can't be over 50 lines long")))))
+
  (defevaluator :normal "." (constantly nil))
  )