Commit 1918803f03a052ae480470e8b440707d76b9d5ba
2014-06-02T17:13:27
Fix COMPILE-RULES.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46
diff --git a/can.lisp b/can.lisp
index b45f251..e02e2c8 100644
--- a/can.lisp
+++ b/can.lisp
@@ -48,8 +48,7 @@
(if (facts:binding-p r)
(push (cons r x) bindings)
(push `(or (lessp:lessp-equal ',r ,x)
- (eq ',r ,wild)
- (eq ,x ,wild))
+ (eq ',r ,wild))
constants))))
(unify o object :all)
(unify a action :admin)
@@ -62,16 +61,19 @@
#+nil
(can/rule 'user ':edit 'object (second *rules*))
-(defun can (action &optional (object :all)
- (user (or (session-user) :anonymous)))
- (declare (ignore action object user))
- (error "Please call CAN:COMPILE-RULES."))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+ (let (can-lambda)
-(defun compile-rules ()
- (setf (symbol-function 'can)
- (compile nil `(lambda (action &optional (object :all)
- (user (or (session-user) :anonymous)))
- (eq (or ,@(mapcar (lambda (rule)
- (can/rule 'user 'action 'object rule))
- *rules*))
- :can)))))
+ (defun can (action &optional (object :all) (user :everyone))
+ (if can-lambda
+ (funcall can-lambda action object user)
+ (error "Please call CAN:COMPILE-RULES.")))
+
+ (defun compile-rules ()
+ (setq can-lambda
+ (compile nil `(lambda (action object user)
+ (eq (or ,@(mapcar (lambda (rule)
+ (can/rule 'user 'action
+ 'object rule))
+ *rules*))
+ :can)))))))