From 36df714e569120f73c4edbc153964a8d152c53b4 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Tue, 9 Oct 2007 03:40:04 -0500 Subject: [PATCH] Print out errors when parsing .fhtml files instead of printing nothing --- extra/http/server/templating/templating.factor | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/extra/http/server/templating/templating.factor b/extra/http/server/templating/templating.factor index f22298f3b4..277f07a256 100644 --- a/extra/http/server/templating/templating.factor +++ b/extra/http/server/templating/templating.factor @@ -1,8 +1,8 @@ ! Copyright (C) 2005 Alex Chapman ! Copyright (C) 2006, 2007 Slava Pestov ! See http://factorcode.org/license.txt for BSD license. -USING: sequences kernel parser namespaces io io.files -io.streams.lines io.streams.string html html.elements +USING: continuations sequences kernel parser namespaces io +io.files io.streams.lines io.streams.string html html.elements source-files debugger combinators math quotations generic strings splitting ; @@ -70,6 +70,9 @@ DEFER: <% delimiter : eval-template ( string -- ) parse-template call ; +: html-error. ( error -- ) +
 error. 
; + : run-template-file ( filename -- ) [ [ @@ -77,7 +80,7 @@ DEFER: <% delimiter parser-notes off templating-vocab use+ dup source-file file set ! so that reload works properly - [ contents eval-template ] keep + [ contents [ eval-template ] [ html-error. ] recover ] keep ] with-scope ] assert-depth drop ;