Merge new spiff to spiff++ release 1.0.8-ms.7

.gitignore

@@ -5,4 +5,6 @@ spiff++/spiff_darwin_amd64.zip
 spiff++/spiff_linux_amd64.zip
 *.coverprofile
 /spiff
+spiff_darwin_amd64.zip
+spiff_linux_amd64.zip
 

.travis.yml

@@ -1,7 +1,7 @@
 language: go
 
 go:
-  - 1.2
+  - 1.7
 
 install:
   - go get -v github.com/kr/godep

README.md

@@ -79,6 +79,7 @@ Contents:
 		- [(( list_to_map(list, "key") ))](#-list_to_maplist-key-)
 		- [(( makemap(fieldlist) ))](#-makemapfieldlist-)
 		- [(( makemap(key, value) ))](#-makemapkey-value-)
+		- [(( merge(map1, map2) ))](#-mergemap1-map2-)
 	- [(( lambda |x|->x ":" port ))](#-lambda-x-x--port-)
 	- [(( &temporary ))](#-temporary-)
 	- [Mappings](#mappings)
@@ -1689,6 +1690,56 @@ map:
 In contrast to the previous `makemap` flavor, this one could also be handled by
 [map literals](#--alice--25--).
 
+### `(( merge(map1, map2) ))`
+
+Beside the keyword ` merge` there is also a function called `merge` (It must always be followed by an opensing bracket). It can be used to merge severals maps taken from the actual document. If the maps are specified by reference expressions, they cannot contain
+any _dynaml_ expressions, because they are always evaluated in the context of the actual document before evaluating the arguments.
+
+e.g.:
+
+```yaml
+map1:
+  alice: 24
+  bob: 25
+map2:
+  alice: 26
+  peter: 8
+result: (( merge(map1,map2) ))
+```
+
+resolves `result` to
+
+```yaml
+result:
+  alice: 26
+  bob: 25
+```
+
+A map might also be given by a map expression. Here it is possible to specify
+dynaml expressions using the usual syntax:
+
+e.g.:
+
+```yaml
+map1:
+  alice: 24
+  bob: 25
+
+map2:
+  alice: 26
+  peter: 8
+
+result: (( merge(map1, map2, { "bob"="(( carl ))", "carl"=100 }) ))
+```
+
+resolves `result` to
+
+```yaml
+result:
+  alice: 26
+  bob: 100
+```
+
 ## `(( lambda |x|->x ":" port ))`
 
 Lambda expressions can be used to define additional anonymous functions. They can be assigned to yaml nodes as values and referenced with path expressions to call the function with approriate arguments in other dynaml expressions. For the final document they are mapped to string values.

dynaml/call.go

@@ -142,6 +142,9 @@ func (e CallExpr) Evaluate(binding Binding, locally bool) (interface{}, Evaluati
 	case "ipset":
 		result, sub, ok = func_ipset(values, binding)
 
+	case "merge":
+		result, sub, ok = func_merge(values, binding)
+
 	default:
 		return info.Error("unknown function '%s'", funcName)
 	}

dynaml/dynaml.peg

@@ -70,7 +70,7 @@ Assignment <- Expression '=' Expression
 
 Merge <- RefMerge / SimpleMerge
 RefMerge <- 'merge' !( req_ws Required ) ( req_ws (Replace / On ))? req_ws Reference
-SimpleMerge <- 'merge' ( req_ws (Replace/Required/On) )?
+SimpleMerge <- 'merge' !'(' ( req_ws (Replace/Required/On) )?
 Replace <- 'replace'
 Required <- 'required'
 On <- 'on' req_ws Name