steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Print out errors when parsing .fhtml files instead of printing nothing

release
Doug Coleman 2007-10-09 03:40:04 -05:00
parent 3032a54c2a
commit 36df714e56
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
extra/http/server/templating/templating.factor
View File

@ -1,8 +1,8 @@
! Copyright (C) 2005 Alex Chapman ! Copyright (C) 2005 Alex Chapman
! Copyright (C) 2006, 2007 Slava Pestov ! Copyright (C) 2006, 2007 Slava Pestov
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: sequences kernel parser namespaces io io.files USING: continuations sequences kernel parser namespaces io
io.streams.lines io.streams.string html html.elements io.files io.streams.lines io.streams.string html html.elements
source-files debugger combinators math quotations generic source-files debugger combinators math quotations generic
strings splitting ; strings splitting ;
@ -70,6 +70,9 @@ DEFER: <% delimiter
: eval-template ( string -- ) parse-template call ; : eval-template ( string -- ) parse-template call ;
: html-error. ( error -- )
<pre> error. </pre> ;
: run-template-file ( filename -- ) : run-template-file ( filename -- )
[ [
[ [
@ -77,7 +80,7 @@ DEFER: <% delimiter
parser-notes off parser-notes off
templating-vocab use+ templating-vocab use+
dup source-file file set ! so that reload works properly dup source-file file set ! so that reload works properly
[ <file-reader> contents eval-template ] keep [ <file-reader> contents [ eval-template ] [ html-error. ] recover ] keep
] with-scope ] with-scope
] assert-depth drop ; ] assert-depth drop ;