From 7798638766d589d2e794ec6e0efffe4eadfd8688 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 09:52:24 +0100
Subject: [PATCH] Update trace output of coll contribution conditions
---
src/jastadd/ast/Trace.jrag | 2 ++
src/template/trace/TraceHooks.tt | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/jastadd/ast/Trace.jrag b/src/jastadd/ast/Trace.jrag
index e1926228..76418012 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 1f6fd459..6d14058b 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
]]
--
GitLab