From 44e4a66d7849298d7d8fe18ab1d5b464266b2aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emma=20S=C3=B6derberg?= <emma.m.soderberg@gmail.com> Date: Thu, 10 Dec 2020 12:11:00 +0100 Subject: [PATCH] Update trace coll contribution condition string generation --- src/jastadd/ast/Trace.jrag | 2 +- src/template/trace/TraceHooks.tt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/jastadd/ast/Trace.jrag b/src/jastadd/ast/Trace.jrag index 76418012..f23bed30 100644 --- a/src/jastadd/ast/Trace.jrag +++ b/src/jastadd/ast/Trace.jrag @@ -100,7 +100,7 @@ aspect Trace { syn String AttrDecl.traceEndAttr() = trace("end " + traceSignature()); syn String AttrDecl.traceEndCachedAttr() = trace("end cached " + traceSignature()); - syn String CollEq.getConditionNoNewline() = getCondition().replace("\n", " "); + syn String CollEq.getConditionStringified() = getCondition().replace("\n", " ").replace("\"", "\\\""); } aspect NewTrace { diff --git a/src/template/trace/TraceHooks.tt b/src/template/trace/TraceHooks.tt index 6d14058b..f60e76e0 100644 --- a/src/template/trace/TraceHooks.tt +++ b/src/template/trace/TraceHooks.tt @@ -325,18 +325,18 @@ $endif CollEq.traceContributionCheckBegin [[ $if (TraceColl) -state().trace().contributionCheckBegin(this, "#collectionId", "#getConditionNoNewline"); +state().trace().contributionCheckBegin(this, "#collectionId", "#getConditionStringified"); $endif ]] CollEq.traceContributionCheckEnd [[ $if (TraceColl) -state().trace().contributionCheckEnd(this, "#collectionId", "#getConditionNoNewline"); +state().trace().contributionCheckEnd(this, "#collectionId", "#getConditionStringified"); $endif ]] CollEq.traceContributionCheckMatch [[ $if (TraceColl) -state().trace().contributionCheckMatch(this, "#collectionId", "#getConditionNoNewline", #getValue); +state().trace().contributionCheckMatch(this, "#collectionId", "#getConditionStringified", #getValue); $endif ]] -- GitLab