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

WIP rework demonstration diff to be valid type-wise

Browse source 
so basically it's time to explicate the way
our diff language will actually be written.

Similar to the list diff case, it's a linear sequence
of verb tokens, but in this case, the payload value
in each token is a GenNode. This is the very reason
why GenNode was conceived as value object with an
opaque DataCap payload
This commit is contained in:
Fischlurch 2015-10-09 03:03:27 +02:00
parent f43fb2167f
commit 2704b38da6
6 changed files with 117 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/lib/diff/gen-node.cpp
View file

@ -64,10 +64,10 @@ namespace diff{
* used within the tree diff language
* to mark specific scopes
*/
Ref Ref::END ("_END_");
Ref Ref::THIS ("_THIS_");
Ref Ref::CHILD ("_CHILD_");
Ref Ref::ATTRIBS("_ATTRIBS_");
const Ref Ref::END ("_END_");
const Ref Ref::THIS ("_THIS_");
const Ref Ref::CHILD ("_CHILD_");
const Ref Ref::ATTRIBS("_ATTRIBS_");

8
src/lib/diff/gen-node.hpp
View file

@ -586,10 +586,10 @@ namespace diff{
, DataCap(RecRef(oNode.data.get<Rec>())))
{ }
static Ref END; ///< symbolic ID ref "_END_"
static Ref THIS; ///< symbolic ID ref "_THIS_"
static Ref CHILD; ///< symbolic ID ref "_CHILD_"
static Ref ATTRIBS; ///< symbolic ID ref "_ATTRIBS_"
static const Ref END; ///< symbolic ID ref "_END_"
static const Ref THIS; ///< symbolic ID ref "_THIS_"
static const Ref CHILD; ///< symbolic ID ref "_CHILD_"
static const Ref ATTRIBS; ///< symbolic ID ref "_ATTRIBS_"
};

2
src/lib/diff/tree-diff-application.hpp
View file

@ -52,7 +52,7 @@ namespace diff{
*/
template<>
class DiffApplicationStrategy<Rec>
: public TreeDiffInterpreter<Rec>
: public TreeDiffInterpreter
{
};

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

@ -42,6 +42,7 @@
#include "lib/diff/diff-language.hpp"
#include "lib/diff/gen-node.hpp"
namespace lib {

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

@ -24,15 +24,17 @@
#include "lib/test/run.hpp"
#include "lib/diff/tree-diff-application.hpp"
#include "lib/iter-adapter-stl.hpp"
#include "lib/time/timevalue.hpp"
#include "lib/util.hpp"
#include <string>
#include <vector>
using lib::iter_stl::snapshot;
using util::isnil;
// using util::isnil;
using std::string;
using std::vector;
using lib::time::Time;
namespace lib {
@ -41,6 +43,20 @@ namespace test{
namespace {//Test fixture....
// define some GenNode elements
// to act as templates within the concrete diff
// NOTE: everything in this diff language is by-value
const GenNode ATTRIB1("α", 1), // attribute α = 1
ATTRIB2("β", 2L), // attribute α = 2L (int64_t)
ATTRIB3("γ", 3.45), // attribute γ = 3.45 (double)
TYPE_X("type", "X"), // a "magic" type attribute "X"
TYPE_Y("type", "Y"), //
CHILD_A("a"), // unnamed string child node
CHILD_B('b'), // unnamed char child node
CHILD_T(Time(12,34,56,78)), // unnamed time value child
SUB_NODE = MakeRec().genNode(), // empty anonymous node used to open a sub scope
ATTRIB_NODE = MakeRec().genNode("δ"), // empty named node to be attached as attribute δ
CHILD_NODE = Ref(SUB_NODE); // use a Node-Reference as child node (!)
using Interpreter = TreeDiffInterpreter;
@ -52,23 +68,25 @@ namespace test{
DiffStep_CTOR(pick);
DiffStep_CTOR(find);
DiffStep_CTOR(skip);
DiffStep_CTOR(mut);
DiffStep_CTOR(emu);
inline DiffSeq
populationDiff()
{
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)
return snapshot({ins(TYPE_X)
, ins(ATTRIB1)
, ins(ATTRIB2)
, ins(ATTRIB3)
, ins(CHILD_A)
, ins(CHILD_T)
, ins(CHILD_T)
, ins(SUB_NODE)
, mut(SUB_NODE)
, ins(CHILD_B)
, ins(CHILD_A)
, emu(SUB_NODE)
});
}
@ -76,30 +94,30 @@ namespace test{
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)
return snapshot({after(Ref::ATTRIBS)
, find(CHILD_T)
, pick(CHILD_A)
, skip(CHILD_T)
, del(CHILD_T)
, pick(Ref::CHILD)
, mut(Ref::THIS)
, ins(ATTRIB3)
, ins(ATTRIB_NODE)
, find(CHILD_A)
, del(CHILD_B)
, ins(CHILD_NODE)
, ins(CHILD_T)
, skip(CHILD_A)
, mut(CHILD_NODE)
, ins(TYPE_Y)
, ins(ATTRIB2)
, emu(CHILD_NODE)
, mut(ATTRIB_NODE)
, ins(CHILD_A)
, ins(CHILD_A)
, ins(CHILD_A)
, emu(ATTRIB_NODE)
, emu(Ref::THIS)
});
}
}//(End)Test fixture

91
wiki/thinkPad.ichthyo.mm
View file

@ -1090,8 +1090,7 @@
<b>Interpreter</b>&#160;definiert Sprache
</p>
</body>
</html>
</richcontent>
</html></richcontent>
</node>
</node>
<node BACKGROUND_COLOR="#fdfdcf" COLOR="#56397a" CREATED="1443733800322" ID="ID_1544242343" MODIFIED="1443741833374" TEXT="Nutz-Muster">
@ -1107,8 +1106,7 @@
ROOT
</p>
</body>
</html>
</richcontent>
</html></richcontent>
<font BOLD="true" NAME="SansSerif" SIZE="12"/>
<node CREATED="1443733978248" ID="ID_724172314" MODIFIED="1443733983252" TEXT="Wurzel pflanzen"/>
<node CREATED="1443733984336" ID="ID_109703386" MODIFIED="1443733993674" TEXT="Au&#xdf;erhalb der Sprache"/>
@ -1124,8 +1122,7 @@
INIT
</p>
</body>
</html>
</richcontent>
</html></richcontent>
<font BOLD="true" NAME="SansSerif" SIZE="12"/>
<node CREATED="1443734005660" ID="ID_1028914628" MODIFIED="1443734025547">
<richcontent TYPE="NODE"><html>
@ -1140,8 +1137,7 @@
Objekt
</p>
</body>
</html>
</richcontent>
</html></richcontent>
<node CREATED="1443734026466" ID="ID_1051774321" MODIFIED="1443734029453" TEXT="typen">
<node CREATED="1443735007685" ID="ID_1426207394" MODIFIED="1443735015668" TEXT="&quot;type&quot;-Attribut">
<font NAME="SansSerif" SIZE="11"/>
@ -1154,9 +1150,40 @@
<font BOLD="true" NAME="SansSerif" SIZE="12"/>
<node CREATED="1443734039776" ID="ID_1572908212" MODIFIED="1443734131094" TEXT="pick">
<font NAME="SansSerif" SIZE="12"/>
<node CREATED="1444349667741" ID="ID_1407797227" MODIFIED="1444349672062" TEXT="by-name"/>
<node CREATED="1444349672792" ID="ID_267468753" MODIFIED="1444349690748" TEXT="anonym">
<richcontent TYPE="NOTE"><html>
<head>
</head>
<body>
<p>
pick(Ref::CHILD)
</p>
</body>
</html>
</richcontent>
</node>
</node>
<node CREATED="1443734637416" ID="ID_461220696" MODIFIED="1443734639699" TEXT="after">
<node CREATED="1443741466072" ID="ID_1108877437" MODIFIED="1443741471390" TEXT="Frage: wrap erlauben">
<node CREATED="1443741466072" ID="ID_1108877437" MODIFIED="1444349773888" TEXT="Frage: wrap erlauben">
<richcontent TYPE="NOTE"><html>
<head>
</head>
<body>
<p>
w&#252;rde sagen: ja, aber auch <i>nur</i>&#160;f&#252;r das after-Verb!
</p>
<p>
allgemein halte ich einen wrap-around f&#252;r keine gute Idee,
</p>
<p>
weil er zu Zweideutigekeigen f&#252;hrt und daher Struktur oder Konsistenzfehler &#252;berspielt
</p>
</body>
</html>
</richcontent>
<icon BUILTIN="help"/>
</node>
</node>
@ -1191,8 +1218,7 @@
l&#228;&#223;t sich stets duch eine inverse Folge von <i>find</i>&#160;und <i>pick</i>&#160; emulieren
</p>
</body>
</html>
</richcontent>
</html></richcontent>
</node>
</node>
</node>
@ -1239,8 +1265,7 @@
vorerst verworfen, da zus&#228;tzlicher Pr&#252;f-Aufwand
</p>
</body>
</html>
</richcontent>
</html></richcontent>
<icon BUILTIN="button_cancel"/>
<node CREATED="1443736367255" ID="ID_1634633098" MODIFIED="1443736380225" TEXT="Meta-Attribute zuerst"/>
<node CREATED="1443736626731" ID="ID_600165347" MODIFIED="1443736652396" TEXT="keine Attribut-Duplikate"/>
@ -1287,8 +1312,7 @@
</li>
</ul>
</body>
</html>
</richcontent>
</html></richcontent>
</node>
<node CREATED="1443738179947" ID="ID_1249607715" MODIFIED="1443738195397" TEXT="&quot;Liste&quot;">
<node CREATED="1443738196336" ID="ID_855336404" MODIFIED="1443738198380" TEXT="Vorteile">
@ -1310,8 +1334,7 @@
Vorteilhaft f&#252;r Version-Management
</p>
</body>
</html>
</richcontent>
</html></richcontent>
</node>
<node CREATED="1443738653931" ID="ID_604966063" MODIFIED="1443738813866" TEXT="Effizienz des List-Diff">
<richcontent TYPE="NOTE"><html>
@ -1323,8 +1346,7 @@
profitiert also von allen Verbesserungen des allgemeinen Algorithmus
</p>
</body>
</html>
</richcontent>
</html></richcontent>
</node>
<node CREATED="1443738592971" ID="ID_790837479" MODIFIED="1443739191673" TEXT="bei uns: hoch effizient">
<richcontent TYPE="NOTE"><html>
@ -1345,8 +1367,7 @@
+ NlogN f &#252;r den Index zur Diff-Erzeugung
</p>
</body>
</html>
</richcontent>
</html></richcontent>
</node>
</node>
<node CREATED="1443738199160" ID="ID_955544777" MODIFIED="1443738201508" TEXT="Nachteile">
@ -1379,8 +1400,7 @@
korrekten Listen-Diff zu erzeugen
</p>
</body>
</html>
</richcontent>
</html></richcontent>
</node>
</node>
</node>
@ -1402,8 +1422,7 @@
dann &#252;bertr&#228;gt sich das auf die Diff-Behandlung
</p>
</body>
</html>
</richcontent>
</html></richcontent>
</node>
<node CREATED="1443738371545" ID="ID_1959160321" MODIFIED="1443738695968" TEXT="bei uns: voll-Quadratisch">
<richcontent TYPE="NOTE"><html>
@ -1418,8 +1437,7 @@
m&#252;ssen wir f&#252;r jede Einf&#252;gung eine vollst&#228;ndige Suche machen
</p>
</body>
</html>
</richcontent>
</html></richcontent>
</node>
<node CREATED="1443738416083" ID="ID_793860786" MODIFIED="1443738470421" TEXT="erfordert separate Impl">
<richcontent TYPE="NOTE"><html>
@ -1434,8 +1452,7 @@
Auch wenn diese andere Implementierung nur delegiert
</p>
</body>
</html>
</richcontent>
</html></richcontent>
</node>
<node CREATED="1443738471955" ID="ID_315855253" MODIFIED="1443738478894" TEXT="versteckte 2.Semantik"/>
</node>
@ -1469,8 +1486,7 @@
indem sie an die Attributs-Liste angeh&#228;ngt werden
</p>
</body>
</html>
</richcontent>
</html></richcontent>
</node>
</node>
</node>
@ -1519,8 +1535,7 @@
wegen Entscheidung f&#252;r das &quot;Listen&quot;-Modell zur Attribut-Handhabung
</p>
</body>
</html>
</richcontent>
</html></richcontent>
<font ITALIC="true" NAME="SansSerif" SIZE="12"/>
</node>
</node>
@ -1541,8 +1556,7 @@
...da das Kind in der Liste der Attribute n&#228;mlich garnicht gefunden wird
</p>
</body>
</html>
</richcontent>
</html></richcontent>
</node>
<node CREATED="1443739798889" ID="ID_1992435989" MODIFIED="1443739912310" TEXT="Spezialbehandlung am Ende der Attributzone notwendig">
<richcontent TYPE="NOTE"><html>
@ -1563,8 +1577,7 @@
Aber an allen anderen Stellen in der Attribut-Zone ist ein solcher Fetch ein Fehler!
</p>
</body>
</html>
</richcontent>
</html></richcontent>
</node>
</node>
</node>
@ -1581,8 +1594,7 @@
standardm&#228;&#223;ig <b>strikt</b>
</p>
</body>
</html>
</richcontent>
</html></richcontent>
<font NAME="SansSerif" SIZE="12"/>
</node>
<node CREATED="1443735286496" ID="ID_1442661683" MODIFIED="1443735289835" TEXT="fuzzy-mode">
@ -1640,6 +1652,7 @@
<node CREATED="1443741332691" ID="ID_1059350985" MODIFIED="1443741335518" TEXT="Attribut"/>
<node CREATED="1443741337786" ID="ID_70415473" MODIFIED="1443741342997" TEXT="letztes Attribut"/>
<node CREATED="1443741507347" ID="ID_1882468426" MODIFIED="1443741513958" TEXT="nicht vorhandenes"/>
<node CREATED="1444349824563" ID="ID_572700596" MODIFIED="1444349836702" TEXT="anonym: Ref::CHILD"/>
</node>
<node CREATED="1443741349576" ID="ID_1257145184" MODIFIED="1443741353515" TEXT="AFTER">
<node CREATED="1443741365526" ID="ID_1412112386" MODIFIED="1443741372089" TEXT="Attribut"/>