diff --git a/src/jastadd/ast/Trace.jrag b/src/jastadd/ast/Trace.jrag index 764180120a66fa7f92835e019a0e89ab94baaed0..f23bed3060b9e327762183ec346c0d985f566d44 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 6d14058b227b9696cd038864de8bd97a8f6ce062..f60e76e0b70051ed9ee40cd6b1dbd447ff448e77 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 ]]