Drop usage of defaction

[clinton/lisp-on-lines.git] / src / validation / email-address.lisp

diff --git a/src/validation/email-address.lisp b/src/validation/email-address.lisp
index 9160f25..2f26127 100644 (file)
--- a/src/validation/email-address.lisp
+++ b/src/validation/email-address.lisp
@@ -17,12 +17,11 @@
 
 (defvar scanner (cl-ppcre:create-scanner +email-regexp+))
 
-(defun validate-email-address (instance attribute)
-  (let ((value (lol::attribute-value instance attribute)))
-    (multiple-value-bind (start end)
-       (cl-ppcre:scan scanner value)
-      (when (not (and (equal start 0) (equal end (length value))))
-       (signal 'attribute-validation-condition
-               :message (format nil "~A must be a valid email address."
-                                (getf (description.properties attribute) :label))
-               :attribute attribute)))))
\ No newline at end of file
+(defun validate-email-address (instance attribute value)
+  (multiple-value-bind (start end)
+      (cl-ppcre:scan scanner value)
+    (when (not (and (equal start 0) (equal end (length value))))
+      (signal 'attribute-validation-condition
+             :message (format nil "~A must be a valid email address."
+                              (label attribute))
+             :attribute attribute))))
\ No newline at end of file