From b22ca7574b39c77123d3b5b92c6f25daa73a4d38 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 24 Mar 2013 10:09:16 -0700 Subject: [PATCH] html.forms: Rename --- basis/html/forms/forms-tests.factor | 4 ++-- basis/html/forms/forms.factor | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/basis/html/forms/forms-tests.factor b/basis/html/forms/forms-tests.factor index b1596e9aa6..d311e57bab 100644 --- a/basis/html/forms/forms-tests.factor +++ b/basis/html/forms/forms-tests.factor @@ -18,7 +18,7 @@ IN: html.forms.tests [ t ] [ [ "140" [ v-number 13 v-min-value 100 v-max-value ] validate - [ validation-error? ] + [ validation-error-state? ] [ value>> "140" = ] bi and ] with-validation @@ -38,7 +38,7 @@ person { validate-values validation-failed? "age" value - [ validation-error? ] + [ validation-error-state? ] [ message>> "required" = ] bi and ] with-validation diff --git a/basis/html/forms/forms.factor b/basis/html/forms/forms.factor index cf959ba058..c6e32d5b15 100644 --- a/basis/html/forms/forms.factor +++ b/basis/html/forms/forms.factor @@ -80,9 +80,9 @@ SYMBOL: nested-forms ] with-scope ] dip set-value ; inline -TUPLE: validation-error value message ; +TUPLE: validation-error-state value message ; -C: validation-error +C: validation-error-state : validation-error ( message -- ) form get @@ -96,11 +96,11 @@ C: validation-error >hashtable "validators" set-word-prop ; : validate ( value quot -- result ) - '[ _ call( value -- validated ) ] [ ] recover ; + '[ _ call( value -- validated ) ] [ ] recover ; : validate-value ( name value quot -- ) validate - dup validation-error? [ form get t >>validation-failed drop ] when + dup validation-error-state? [ form get t >>validation-failed drop ] when swap set-value ; : validate-values ( assoc validators -- )