summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPixel <pixel@nobis-crew.org>2011-11-29 16:46:53 -0800
committerPixel <pixel@nobis-crew.org>2011-11-29 16:46:53 -0800
commita0486e27504338dc6ce65fdecfce2cc4caabd8e1 (patch)
treea32522bb5d4d81b830499d6e317a00e73c4a2936 /src
parent64120be7af8d2ded76cd3a3401fc69cadb96351e (diff)
Being a bit more laxist with Mustache's values, and accepting almost anything as a variable; also adding a checkTemplate() method to assert a few things onto a template after loading it.
Diffstat (limited to 'src')
-rw-r--r--src/SimpleMustache.cc30
1 files changed, 26 insertions, 4 deletions
diff --git a/src/SimpleMustache.cc b/src/SimpleMustache.cc
index 6ed8401..1288286 100644
--- a/src/SimpleMustache.cc
+++ b/src/SimpleMustache.cc
@@ -328,6 +328,24 @@ void Balau::SimpleMustache::setTemplate(IO<Handle> _h) {
m_fragments.push_back(curFragment);
}
+Balau::SimpleMustache::Fragments::iterator Balau::SimpleMustache::checkTemplate_r(Fragments::iterator begin, const String & endSection) {
+ Fragments::iterator cur;
+ Fragments::iterator end = m_fragments.end();
+
+ for (cur = begin; cur != end; cur++) {
+ Fragment * fr = *cur;
+ if ((fr->type == Fragment::END_SECTION) && (endSection.strlen() != 0)) {
+ Assert(fr->str == endSection);
+ return cur;
+ }
+ Assert(fr->type != Fragment::END_SECTION);
+ if ((fr->type == Fragment::SECTION) || (fr->type == Fragment::INVERTED))
+ cur = checkTemplate_r(++cur, fr->str);
+ }
+
+ return end;
+}
+
Balau::SimpleMustache::Fragments::iterator Balau::SimpleMustache::render_r(IO<Handle> h, Context * ctx, const String & endSection, Fragments::iterator begin, bool noWrite, int forceIdx) {
Fragments::iterator cur;
Fragments::iterator end = m_fragments.end();
@@ -382,16 +400,20 @@ Balau::SimpleMustache::Fragments::iterator Balau::SimpleMustache::render_r(IO<Ha
f = sCtx->find(fr->str);
if (f != sCtx->end()) {
Context * var = f->second;
- Assert(var->m_type == Context::STRING);
- h->write(escape(var->m_str));
+ if (var->m_type == Context::STRING)
+ h->write(escape(var->m_str));
+ else if (var->m_type == Context::BOOLSEC)
+ h->write(var->m_bool ? "true" : "false");
}
break;
case Fragment::NOESCAPE:
f = sCtx->find(fr->str);
if (f != sCtx->end()) {
Context * var = f->second;
- Assert(var->m_type == Context::STRING);
- h->write(var->m_str);
+ if (var->m_type == Context::STRING)
+ h->write(var->m_str);
+ else if (var->m_type == Context::BOOLSEC)
+ h->write(var->m_bool ? "true" : "false");
}
break;
case Fragment::SECTION: