diff --git a/src/lib/diff/record.hpp b/src/lib/diff/record.hpp index a768a22ef..3484da5ba 100644 --- a/src/lib/diff/record.hpp +++ b/src/lib/diff/record.hpp @@ -731,11 +731,10 @@ namespace diff{ using lib::transformIterator; return "Rec(" - + (TYPE_NIL==type_? "" : type_+"| ") - + join (transformIterator (this->attribs(), renderAttribute)) - + " |{" - + join (this->scope()) - + "})" + + (TYPE_NIL==type_? "" : type_) + + (isnil(this->attribs())? "" : "| "+join (transformIterator (this->attribs(), renderAttribute))+" ") + + (isnil(this->scope())? "" : "|{"+join (this->scope())+"}") + + ")" ; #endif } diff --git a/tests/15library.tests b/tests/15library.tests index 612eacaa8..7d48fecd0 100644 --- a/tests/15library.tests +++ b/tests/15library.tests @@ -256,7 +256,7 @@ END TEST "Generic Record data node" GenNodeBasic_test <».+«std::string».eggs.+«std::string».spam.+«std::string».spam +out: GenNode.+"baked beans".+Rec...hasSpam = DataCap.«bool».+«char».+«std::string».*«double».+GenNode.+"spam".+«lib::diff::Record».+«std::string».eggs.+«std::string».spam.+«std::string».spam out: GenNode.+"hasSpam".+«bool».1 out: GenNode.+_CHILD_char.+«char».\* out: GenNode.+_CHILD_string.+«std::string».★ diff --git a/tests/library/test/test-event-log-test.cpp b/tests/library/test/test-event-log-test.cpp index 4a6cb6a22..4595bbf42 100644 --- a/tests/library/test/test-event-log-test.cpp +++ b/tests/library/test/test-event-log-test.cpp @@ -87,9 +87,9 @@ namespace test{ log.verify("α").before("β"); VERIFY_ERROR (ASSERTION, log.verify("β").before("α")); - CHECK (join(log) == "Rec(EventLogHeader| ID = TestEventLog_test."+idi::instanceTypeID(this)+" |), " - + "Rec(event| |{α}), " - + "Rec(event| |{β})"); + CHECK (join(log) == "Rec(EventLogHeader| ID = "+idi::instanceTypeID(this)+" ), " + + "Rec(event|{α}), " + + "Rec(event|{β})"); }