ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP demonstration draft continued...

Browse source
This commit is contained in:
Fischlurch 2015-10-02 19:41:14 +02:00
parent eaba418d15
commit f43fb2167f
2 changed files with 54 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lib/diff/tree-diff.hpp
View file

@ -56,7 +56,6 @@ namespace diff{
*
* @todo to be defined
*/
template<typename E>
class TreeDiffInterpreter
{
public:
@ -64,8 +63,7 @@ namespace diff{
///////TODO actual operations go here
};
template<typename E>
using TreeDiffLanguage = DiffLanguage<TreeDiffInterpreter<E>, E>;
using TreeDiffLanguage = DiffLanguage<TreeDiffInterpreter, GenNode>;

80
tests/library/diff/diff-tree-application-test.cpp
View file

@ -42,13 +42,9 @@ namespace test{
namespace {//Test fixture....
#define TOK(id) id(STRINGIFY(id))
string TOK(a1), TOK(a2), TOK(a3), TOK(a4), TOK(a5);
string TOK(b1), TOK(b2), TOK(b3), TOK(b4);
using Interpreter = TreeDiffInterpreter<Rec>;
using DiffStep = TreeDiffLanguage<Rec>::DiffStep;
using Interpreter = TreeDiffInterpreter;
using DiffStep = TreeDiffLanguage::DiffStep;
using DiffSeq = iter_stl::IterSnapshot<DiffStep>;
DiffStep_CTOR(ins);
@ -59,18 +55,51 @@ namespace test{
inline DiffSeq
generateTestDiff()
populationDiff()
{
return snapshot({del(a1)
, del(a2)
, ins(b1)
, pick(a3)
, find(a5)
, ins(b2)
, ins(b3)
, pick(a4)
, skip(a5)
, ins(b4)
return snapshot({ins(typeX)
, ins(attrib1)
, ins(attrib2)
, ins(attrib3)
, ins(childA)
, ins(childT)
, ins(childT)
, ins(node)
, mut(THIS)
, ins(childB)
, ins(childA)
, emu(THIS)
});
}
inline DiffSeq
mutationDiff()
{
return snapshot({after(ATTRIBS)
, find(childT)
, pick(childA)
, skip(childT)
, del(childT)
, pick(CHILD)
, mut(THIS)
, ins(attrib3)
, ins(node(ID("δ")))
, find(childA)
, del(childB)
, ins(node(CHILD("ω")))
, ins(childT)
, skip(childA)
, mut(CHILD("ω"))
, ins(typeY)
, ins(attrib2)
, emu(CHILD("ω"))
, mut(ID("δ"))
, ins(childA)
, ins(childA)
, ins(childA)
, emu(ID("δ"))
, emu(THIS)
});
}
}//(End)Test fixture
@ -98,18 +127,15 @@ namespace test{
virtual void
run (Arg)
{
DataSeq src({a1,a2,a3,a4,a5});
DiffSeq diff = generateTestDiff();
CHECK (!isnil (diff));
Rec target;
DiffApplicator<Rec> application(target);
application.consume(populationDiff());
DataSeq target = src;
DiffApplicator<DataSeq> application(target);
application.consume(diff);
// TODO Check population
CHECK (isnil (diff));
CHECK (!isnil (target));
CHECK (src != target);
CHECK (target == DataSeq({b1,a3,a5,b2,b3,a4,b4}));
application.consume(mutationDiff());
// TODO Check mutation
}
};