From 280d4b8aa2d045d1a0a7c50fa447c3f0f3c386c1 Mon Sep 17 00:00:00 2001 From: brad Arant Date: Mon, 20 Oct 2025 16:22:22 -0700 Subject: [PATCH] Clean up the transparent markers function. --- Tag.cpp | 12 +++++++----- Tag.h | 4 ++-- __jet.cpp | 3 +-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Tag.cpp b/Tag.cpp index 9fa8990..e228517 100644 --- a/Tag.cpp +++ b/Tag.cpp @@ -126,24 +126,26 @@ namespace jet { return resolved; } - void Tag::processContainer(coreutils::ZString &container, coreutils::ZString container2) { + void Tag::processContainer(coreutils::ZString &container, coreutils::ZString container2, bool topLevel) { if(hasContainer && evaluate) - parseContainer(container, out, container2); + parseContainer(container, out, container2, topLevel); } - void Tag::parseContainer(coreutils::ZString &in, coreutils::MString &out, coreutils::ZString container2) { + void Tag::parseContainer(coreutils::ZString &in, coreutils::MString &out, coreutils::ZString container2, bool topLevel) { coreutils::ZString tag; char *start = in.getCursor(); while(!in.eod()) { if(in.ifNext("|>")) { - out.write("|>"); + if(!topLevel) + out.write("|>"); char ch = in.nextChar(); while(!in.ifNext("<|")) { out.write(ch); ch = in.nextChar(); } out.write(ch); - out.write("<|"); + if(!topLevel) + out.write("<|"); continue; } else if(in.startsWith("<")) { if(ifTagName(in, "mysql")) { diff --git a/Tag.h b/Tag.h index e5e2a69..ccab774 100644 --- a/Tag.h +++ b/Tag.h @@ -30,8 +30,8 @@ namespace jet { bool hasContainer = false; bool hasContainer2 = false; bool keywordDefined(coreutils::ZString variable); - void parseContainer(coreutils::ZString &in, coreutils::MString &out, coreutils::ZString container2 = NULL); - void processContainer(coreutils::ZString &container, coreutils::ZString container2 = NULL); + void parseContainer(coreutils::ZString &in, coreutils::MString &out, coreutils::ZString container2 = NULL, bool topLevel = false); + void processContainer(coreutils::ZString &container, coreutils::ZString container2 = NULL, bool topLevel = false); void copyContainer(coreutils::ZString &in, coreutils::MString &out); coreutils::MString &parentOut; diff --git a/__jet.cpp b/__jet.cpp index 5b5a6fe..0c79619 100644 --- a/__jet.cpp +++ b/__jet.cpp @@ -43,7 +43,6 @@ namespace jet { // global.setupFormURLEncoded(postdata); } } - processContainer(container); + processContainer(container, NULL, true); } } -