diff --git a/src/jastadd/ast/Trace.jrag b/src/jastadd/ast/Trace.jrag index e1926228594351ee3ecad61ae2a358eb9abeb38e..764180120a66fa7f92835e019a0e89ab94baaed0 100644 --- a/src/jastadd/ast/Trace.jrag +++ b/src/jastadd/ast/Trace.jrag @@ -99,6 +99,8 @@ aspect Trace { syn String AttrDecl.traceBeginAttr() = trace("begin " + traceSignature()); syn String AttrDecl.traceEndAttr() = trace("end " + traceSignature()); syn String AttrDecl.traceEndCachedAttr() = trace("end cached " + traceSignature()); + + syn String CollEq.getConditionNoNewline() = getCondition().replace("\n", " "); } aspect NewTrace { diff --git a/src/template/trace/TraceHooks.tt b/src/template/trace/TraceHooks.tt index 1f6fd45982866622248bb9dac7526b63b1589204..6d14058b227b9696cd038864de8bd97a8f6ce062 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", "#getCondition"); +state().trace().contributionCheckBegin(this, "#collectionId", "#getConditionNoNewline"); $endif ]] CollEq.traceContributionCheckEnd [[ $if (TraceColl) -state().trace().contributionCheckEnd(this, "#collectionId", "#getCondition"); +state().trace().contributionCheckEnd(this, "#collectionId", "#getConditionNoNewline"); $endif ]] CollEq.traceContributionCheckMatch [[ $if (TraceColl) -state().trace().contributionCheckMatch(this, "#collectionId", "#getCondition", #getValue); +state().trace().contributionCheckMatch(this, "#collectionId", "#getConditionNoNewline", #getValue); $endif ]]