- [+] add arithmetic operations of add/minus

Author: suntong

cmd/easygen/main_test.go

@@ -72,6 +72,7 @@ func TestExec(t *testing.T) {
 	testEasygen(t, "list1", "list1")
 	testEasygen(t, "listfunc1", "listfunc1")
 	testEasygen(t, "listfunc2", "listfunc2")
+	testEasygen(t, "tf-calc", "tf-calc")
 
 	//Test Basic Json Functions
 	testEasygen(t, "list0j", "list0j")

template.go

@@ -156,8 +156,8 @@ var egFuncMap = FuncMap{
 	"stringsTrimSpace":      strings.TrimSpace,
 	"stringsTrimSuffix":     strings.TrimSuffix,
 	// aliases
-	"eqf":   strings.EqualFold,
-	"split": strings.Fields,
+	"eqf":     strings.EqualFold,
+	"split":   strings.Fields,
 	"sprintf": fmt.Sprintf,
 
 	// == standard regexp function definitions
@@ -184,6 +184,8 @@ var egFuncMap = FuncMap{
 	"iterate":   Iterate,
 	"argsa":     ArgsA,
 	"argsm":     ArgsM,
+	"add":       Add,
+	"minus":     Minus,
 	"minus1":    Minus1,
 	"date":      Date,
 	"timestamp": Timestamp,

test/tf-calc.ref

@@ -0,0 +1,5 @@
+some-init-method
+5 5
+5 5
+3 3 2 2
+8

test/tf-calc.tmpl

@@ -0,0 +1,5 @@
+{{.Name}}
+{{6 | minus1}} {{minus1 6}}
+{{6 | minus 1}} {{minus 1 6}}
+{{5 | minus 2}} {{minus 2 5}} {{5 | minus 3}} {{minus 3 5}}
+{{add 2 6}}

test/tf-calc.yaml

@@ -0,0 +1 @@
+listfunc2.yaml

tf-calc.go

@@ -45,6 +45,9 @@ func ArgsM(kvs ...interface{}) (map[string]interface{}, error) {
 //==========================================================================
 // template function for calculations
 
+func Add(b, a int) int   { return a + b }
+func Minus(b, a int) int { return a - b }
+
 // By Caleb Spare @gmail.com
 // https://groups.google.com/d/msg/golang-nuts/gzAyBLAeUbU/LwgomgxcjQ8J