From 01cd3ce99a1779b84488b0326eed596ef5f161a3 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 12 Jan 2009 16:17:52 -0600 Subject: [PATCH 1/3] Throw an error if Chloe encounters an unknown tag --- basis/html/templates/chloe/chloe-tests.factor | 9 ++++++++- basis/html/templates/chloe/compiler/compiler.factor | 7 +++++-- basis/html/templates/chloe/test/test13.xml | 7 +++++++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 basis/html/templates/chloe/test/test13.xml diff --git a/basis/html/templates/chloe/chloe-tests.factor b/basis/html/templates/chloe/chloe-tests.factor index 5114b4088a..542dfa0e05 100644 --- a/basis/html/templates/chloe/chloe-tests.factor +++ b/basis/html/templates/chloe/chloe-tests.factor @@ -1,7 +1,8 @@ USING: html.templates html.templates.chloe tools.test io.streams.string kernel sequences ascii boxes namespaces xml html.components html.forms -splitting unicode.categories furnace accessors ; +splitting unicode.categories furnace accessors +html.templates.chloe.compiler ; IN: html.templates.chloe.tests : run-template @@ -163,3 +164,9 @@ TUPLE: person first-name last-name ; "test12" test-template call-template ] run-template ] unit-test + +[ + [ + "test13" test-template call-template + ] run-template +] [ error>> T{ unknown-chloe-tag f "this-tag-does-not-exist" } = ] must-fail-with diff --git a/basis/html/templates/chloe/compiler/compiler.factor b/basis/html/templates/chloe/compiler/compiler.factor index d4f34ab8aa..331b565b98 100644 --- a/basis/html/templates/chloe/compiler/compiler.factor +++ b/basis/html/templates/chloe/compiler/compiler.factor @@ -76,10 +76,13 @@ DEFER: compile-element [ drop tag-stack get pop* ] } cleave ; +ERROR: unknown-chloe-tag tag ; + : compile-chloe-tag ( tag -- ) - ! "Unknown chloe tag: " prepend throw dup main>> dup tags get at - [ curry assert-depth ] [ 2drop ] ?if ; + [ curry assert-depth ] + [ unknown-chloe-tag ] + ?if ; : compile-element ( element -- ) { diff --git a/basis/html/templates/chloe/test/test13.xml b/basis/html/templates/chloe/test/test13.xml new file mode 100644 index 0000000000..adf5daf93c --- /dev/null +++ b/basis/html/templates/chloe/test/test13.xml @@ -0,0 +1,7 @@ + + + + + + + From daab5e4ac823019072a0d9c1b01c28e0473f081c Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 12 Jan 2009 16:17:58 -0600 Subject: [PATCH 2/3] Fix calculator --- extra/webapps/calculator/calculator.factor | 4 ++-- extra/webapps/calculator/calculator.xml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/extra/webapps/calculator/calculator.factor b/extra/webapps/calculator/calculator.factor index d19946d39b..a8c8383e62 100644 --- a/extra/webapps/calculator/calculator.factor +++ b/extra/webapps/calculator/calculator.factor @@ -1,6 +1,6 @@ -! Copyright (C) 2008 Slava Pestov. +! Copyright (C) 2008, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: furnace.actions furnace.redirection +USING: furnace furnace.actions furnace.redirection http.server.dispatchers html.forms validators urls accessors math ; IN: webapps.calculator diff --git a/extra/webapps/calculator/calculator.xml b/extra/webapps/calculator/calculator.xml index ed8e60d89a..4dcf5d563a 100644 --- a/extra/webapps/calculator/calculator.xml +++ b/extra/webapps/calculator/calculator.xml @@ -2,6 +2,7 @@ + Calculator @@ -24,5 +25,6 @@ + From cbb91284c9b7dde71e2ecb45b38170cc42d1c3e4 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 12 Jan 2009 16:18:08 -0600 Subject: [PATCH 3/3] Well-formed HTML for counter --- extra/webapps/counter/counter.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extra/webapps/counter/counter.xml b/extra/webapps/counter/counter.xml index 75e7cf3c4b..88154438f1 100644 --- a/extra/webapps/counter/counter.xml +++ b/extra/webapps/counter/counter.xml @@ -2,12 +2,13 @@ - +

++ -- +