Skip to content
Snippets Groups Projects
Commit 44e4a66d authored by Emma Söderberg's avatar Emma Söderberg
Browse files

Update trace coll contribution condition string generation

parent 77986387
No related branches found
No related tags found
No related merge requests found
...@@ -100,7 +100,7 @@ aspect Trace { ...@@ -100,7 +100,7 @@ aspect Trace {
syn String AttrDecl.traceEndAttr() = trace("end " + traceSignature()); syn String AttrDecl.traceEndAttr() = trace("end " + traceSignature());
syn String AttrDecl.traceEndCachedAttr() = trace("end cached " + 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 { aspect NewTrace {
......
...@@ -325,18 +325,18 @@ $endif ...@@ -325,18 +325,18 @@ $endif
CollEq.traceContributionCheckBegin [[ CollEq.traceContributionCheckBegin [[
$if (TraceColl) $if (TraceColl)
state().trace().contributionCheckBegin(this, "#collectionId", "#getConditionNoNewline"); state().trace().contributionCheckBegin(this, "#collectionId", "#getConditionStringified");
$endif $endif
]] ]]
CollEq.traceContributionCheckEnd [[ CollEq.traceContributionCheckEnd [[
$if (TraceColl) $if (TraceColl)
state().trace().contributionCheckEnd(this, "#collectionId", "#getConditionNoNewline"); state().trace().contributionCheckEnd(this, "#collectionId", "#getConditionStringified");
$endif $endif
]] ]]
CollEq.traceContributionCheckMatch [[ CollEq.traceContributionCheckMatch [[
$if (TraceColl) $if (TraceColl)
state().trace().contributionCheckMatch(this, "#collectionId", "#getConditionNoNewline", #getValue); state().trace().contributionCheckMatch(this, "#collectionId", "#getConditionStringified", #getValue);
$endif $endif
]] ]]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment