- [#] Iterate accepts strings instead

Author: suntong

test/nested_demo_argsm_iterate.ref

@@ -4,6 +4,9 @@ Ape ate Apple000002 at 1234.56 - true2
 Ape ate Apple000003 at 1234.56 - true3
 Ape ate Apple000004 at 1234.56 - true4
 Ape ate Apple000005 at 1234.56 - true5
+Ape ate Apple000000 at 1234.56 - true0
+Ape ate Apple000001 at 1234.56 - true1
+Ape ate Apple000002 at 1234.56 - true2
 Ape ate Apple001001 at 1234.56 - true1001
 Ape ate Apple001002 at 1234.56 - true1002
 Ape ate Apple001003 at 1234.56 - true1003

test/nested_demo_argsm_iterate.tmpl

@@ -1,7 +1,10 @@
 {{- define "T1"}}Apple{{.i}} at {{.c.Price}} - {{.c.Shipped}}{{end}}  {{- define "T2"}}Ape{{end}}
-{{- range $val := iterate 5 }}
+{{- range $val := iterate "5" }}
  {{- template "T2"}} ate {{template "T1" argsm "c" $ "i" (printf "%06d" $val)}}{{ $val }}
 {{end }}
-{{- range $val := iterate 1003 1001 }}
+{{- range $val := iterate "2" (ENV "__START") }}
+ {{- template "T2"}} ate {{template "T1" argsm "c" $ "i" (printf "%06d" $val)}}{{ $val }}
+{{end }}
+{{- range $val := iterate "1003" "1001" }}
  {{- template "T2"}} ate {{template "T1" argsm "c" $ "i" (printf "%06d" $val)}}{{ $val }}
 {{end }}

tf-calc.go

@@ -2,17 +2,19 @@ package easygen
 
 import (
 	"errors"
+	"strconv"
 )
 
 //==========================================================================
 // template function somewhat related to calculations
 
 // Iterate returns a slice whose end (& start) is controlled by the ic
-func Iterate(ic ...int) []int {
-	end := ic[0]
+func Iterate(ic ...string) []int {
+	// cannot think of a better way to report the Atoi error, other than --
+	end, _ := strconv.Atoi(ic[0])
 	start := 0
 	if len(ic) > 1 {
-		start = ic[1]
+		start, _ = strconv.Atoi(ic[1])
 	}
 	var Items []int
 	for i := start; i <= (end); i++ {