From f35c7020f3264ba5c8bb73a8ecb91c8916903fa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emma=20S=C3=B6derberg?= <emma.m.soderberg@gmail.com>
Date: Fri, 4 Dec 2020 00:42:46 +0100
Subject: [PATCH] Fix code layout and signatures
---
src/template/trace/TraceHooks.tt | 4 ++--
src/template/trace/Tracer.tt | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/template/trace/TraceHooks.tt b/src/template/trace/TraceHooks.tt
index c4718613..e99d06e2 100644
--- a/src/template/trace/TraceHooks.tt
+++ b/src/template/trace/TraceHooks.tt
@@ -325,12 +325,12 @@ $endif
CollEq.traceContributionBegin [[
$if (TraceColl)
-state().trace.contributionBegin(this, "#hostClassName.#signatureJavaStyle", "", "");
+state().trace().contributionBegin(this, "#collectionId");
$endif
]]
CollEq.traceContributionEnd [[
$if (TraceColl)
-state().trace.contributionEnd(this, "#hostClassName.#signatureJavaStyle", "", "");
+state().trace().contributionEnd(this, "#collectionId");
$endif
]]
diff --git a/src/template/trace/Tracer.tt b/src/template/trace/Tracer.tt
index 879f4f1c..ee3b37d3 100644
--- a/src/template/trace/Tracer.tt
+++ b/src/template/trace/Tracer.tt
@@ -79,11 +79,11 @@ public static class Trace {
FLUSH_ATTR,
FLUSH_REWRITE,
FLUSH_REWRITE_INIT,
- INC_FLUSH_ATTR;
+ INC_FLUSH_ATTR,
// Flag: --tracing=coll
CONTRIBUTION_BEGIN,
- CONTRIBUTION_END,
+ CONTRIBUTION_END;
}
/**
@@ -341,14 +341,14 @@ public static class Trace {
* Trace that a contribution to a collection attribute begun.
*/
public void contributionBegin($ASTNode node, String attr) {
- receiver.accept($StateClass.Trace.Event.CONTRIBUTION_BEGIN, node, attr, "", value);
+ receiver.accept($StateClass.Trace.Event.CONTRIBUTION_BEGIN, node, attr, "", "");
}
/**
* Trace that a contribution to a collection attribute ended.
*/
public void contributionEnd($ASTNode node, String attr) {
- receiver.accept($StateClass.Trace.Event.CONTRIBUTION_END, node, attr, "", value);
+ receiver.accept($StateClass.Trace.Event.CONTRIBUTION_END, node, attr, "", "");
}
}
$endif
--
GitLab