From f45884975bbcdffea07227aa42c371ea306d13fa Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sat, 2 May 2015 02:02:48 +0200
Subject: [PATCH] generalise to arbitrary acceptable attribute values

...not yet able to pick up the closure argument type automagically
however, right now we can only hypothesise this might be possible
---
 src/lib/diff/tree-mutator.hpp                 | 24 ++++++++++++-------
 tests/15library.tests                         |  2 +-
 .../diff/generic-tree-mutator-test.cpp        |  2 +-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/lib/diff/tree-mutator.hpp b/src/lib/diff/tree-mutator.hpp
index f0bb4713c..f597b155b 100644
--- a/src/lib/diff/tree-mutator.hpp
+++ b/src/lib/diff/tree-mutator.hpp
@@ -135,24 +135,26 @@ namespace diff{
   
   namespace {
     
-    template<class PAR>
+    template<class PAR, typename VAL>
     struct ChangeOperation
       : PAR
       {
+        using Closure = function<void(VAL)>;
+        
         ID attribID_;
-        function<void(string)> change_;
+        Closure change_;
         
         virtual void
         setAttribute (ID id, Attribute& newValue)
           {
             if (id == attribID_)
-              change_(newValue.get<string>());
+              change_(newValue.get<VAL>());
             
             else // delegate to other closures (Decorator-style)
               PAR::setAttribute(id, newValue);
           }
         
-        ChangeOperation(ID id, function<void(string)> clo, PAR const& chain)
+        ChangeOperation(ID id, Closure clo, PAR const& chain)
           : PAR(chain)
           , attribID_(id)
           , change_(clo)
@@ -163,19 +165,23 @@ namespace diff{
     struct Builder
       : PAR
       {
-        using Change = ChangeOperation<PAR>;
-        
         Builder(PAR par)
           : PAR(par)
           { }
         
+        template<typename VAL>
+        using Change = ChangeOperation<PAR,VAL>;
+        template<typename VAL>
+        using Closure = typename Change<VAL>::Closure;
+        
         
         /* ==== binding API ==== */
         
-        Builder<Change>
-        change (Literal attributeID, function<void(string)> closure)
+        template<typename VAL>
+        Builder<Change<VAL>>
+        change (Literal attributeID, Closure<VAL> closure)
           {
-            return Change (attributeID, closure, *this);
+            return Change<VAL> (attributeID, closure, *this);
           }
       };
 
diff --git a/tests/15library.tests b/tests/15library.tests
index d9720dd6b..6cd619bd3 100644
--- a/tests/15library.tests
+++ b/tests/15library.tests
@@ -223,7 +223,7 @@ END
 
 
 TEST "Generic recursive mutation with closure binding" GenericTreeMutator_test <<END
-out: concrete TreeMutator .+Builder<.+ChangeOperation<.+TreeMutator
+out: concrete TreeMutator .+Builder<.+ChangeOperation<.+TreeMutator, .+string
 out-lit: "data" closure received something that would be acceptable
 out-lit: localData changed to: that would be acceptable
 return: 0
diff --git a/tests/library/diff/generic-tree-mutator-test.cpp b/tests/library/diff/generic-tree-mutator-test.cpp
index e06406196..bd41ebf58 100644
--- a/tests/library/diff/generic-tree-mutator-test.cpp
+++ b/tests/library/diff/generic-tree-mutator-test.cpp
@@ -92,7 +92,7 @@ namespace test{
           string localData;
           auto mutator =
           TreeMutator::build()
-            .change("data", [&](string val)
+            .change<string>("data", [&](string val)
               {
                 cout << "\"data\" closure received something "<<val<<endl;
                 localData = val;