Commit ec903955 authored by Michael Raskin's avatar Michael Raskin
Browse files

Syncing from Monotone at 20170205-155359. Last commit message was Signal when... 

Syncing from Monotone at 20170205-155359. Last commit message was Signal when includevar is used with a bad parameter
parent 486921e9

emb.lisp

+4 −2
Changes for emb.lisp: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -213,8 +213,10 @@ like e. g. *ESCAPE-TYPE*." 
    ("\\s+@endwith\\s*"           . " ) ")

    ("\\s+@include\\s+(\\S+)\\s*" . "= (let ((cl-emb:*escape-type* cl-emb:*escape-type*))

                                            (cl-emb:execute-emb (merge-pathnames \"\\1\" template-path-default) :env env :generator-maker generator-maker)) ")

    ("\\s+@includevar\\s+(\\S+)\\s*" . "= (let ((cl-emb:*escape-type* cl-emb:*escape-type*))

						(cl-emb:execute-emb (merge-pathnames (cl-emb::getf-emb \"\\1\") template-path-default) :env env :generator-maker generator-maker)) ")

    ("\\s+@includevar\\s+(\\S+)\\s*" . "= (let* ((cl-emb:*escape-type* cl-emb:*escape-type*) 

                                                  (parameter (cl-emb::getf-emb \"\\1\")))

                                                (unless parameter (error \"use of @includevar on undefined parameter ~s\" \"\\1\"))

						(cl-emb:execute-emb (merge-pathnames parameter template-path-default) :env env :generator-maker generator-maker)) ")

    ("\\s+@call\\s+(\\S+)\\s*"    . "= (let ((cl-emb:*escape-type* cl-emb:*escape-type*))

                                            (cl-emb:execute-emb \"\\1\" :env env :generator-maker generator-maker)) ")

    ("\\s+@insert\\s+(\\S+)\\s*"  . "= (cl-emb::contents-of-file (merge-pathnames (cl-emb::getf-emb \"\\1\") template-path-default)) ")