std/strings: Add a few Functions (#132)

* wdte: Update dependencies.

* std/strings: Add `Repeat()`.

* std/strings: Add `Join()`.

Author: DeedleFake

go.mod

@@ -2,6 +2,6 @@ module github.com/DeedleFake/wdte
 
 require (
 	github.com/peterh/liner v1.1.0
-	golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b
-	golang.org/x/sys v0.0.0-20180920110915-d641721ec2de // indirect
+	golang.org/x/crypto v0.0.0-20181024171144-74cb1d3d52f4
+	golang.org/x/sys v0.0.0-20181024145615-5cd93ef61a7c // indirect
 )

go.sum

@@ -2,7 +2,7 @@ github.com/mattn/go-runewidth v0.0.3 h1:a+kO+98RDGEfo6asOGMmpodZq4FNtnGP54yps8Bz
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/peterh/liner v1.1.0 h1:f+aAedNJA6uk7+6rXsYBnhdo4Xux7ESLe+kcuVUF5os=
 github.com/peterh/liner v1.1.0/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
-golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b h1:2b9XGzhjiYsYPnKXoEfL7klWZQIt8IfyRCz62gCqqlQ=
-golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/sys v0.0.0-20180920110915-d641721ec2de h1:soC2mvPVpAV+Ld2qtpNn1eq25WTn76uIGNV23bofu6Q=
-golang.org/x/sys v0.0.0-20180920110915-d641721ec2de/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/crypto v0.0.0-20181024171144-74cb1d3d52f4 h1:4v3KN0hcTEAkyusBypx0RrpPAhKsTP3YXj10LonM8J8=
+golang.org/x/crypto v0.0.0-20181024171144-74cb1d3d52f4/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/sys v0.0.0-20181024145615-5cd93ef61a7c h1:8QwKN2PcBeeHEiYIX6348SzigNWH9uHHP1EOEs5ExSc=
+golang.org/x/sys v0.0.0-20181024145615-5cd93ef61a7c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

std/strings/strings.go

@@ -138,15 +138,81 @@ func Lower(frame wdte.Frame, args ...wdte.Func) wdte.Func {
 	return wdte.String(strings.ToLower(string(args[0].Call(frame).(wdte.String))))
 }
 
+// Repeat is a WDTE function with the following signatures:
+//
+//    repeat string times
+//    (repeat string) times
+//    repeat times string
+//    (repeat times) string
+//
+// It returns a new string containing the given string repeated the
+// number of times specified.
+func Repeat(frame wdte.Frame, args ...wdte.Func) wdte.Func {
+	frame = frame.Sub("repeat")
+
+	switch len(args) {
+	case 0:
+		return wdte.GoFunc(Repeat)
+	case 1:
+		return wdte.GoFunc(func(frame wdte.Frame, next ...wdte.Func) wdte.Func {
+			return Repeat(frame, append(args, next...)...)
+		})
+	}
+
+	var str wdte.String
+	var times wdte.Number
+	switch a0 := args[0].Call(frame).(type) {
+	case wdte.String:
+		str = a0
+		times = args[1].Call(frame).(wdte.Number)
+
+	case wdte.Number:
+		times = a0
+		str = args[1].Call(frame).(wdte.String)
+	}
+
+	return wdte.String(strings.Repeat(string(str), int(times)))
+}
+
+// Join is a WDTE function with the following signatures:
+//
+//    join strings sep
+//    (join sep) strings
+//
+// It returns a new string containing the strings in the provided
+// array with sep inserted between each.
+func Join(frame wdte.Frame, args ...wdte.Func) wdte.Func {
+	frame = frame.Sub("join")
+
+	switch len(args) {
+	case 0:
+		return wdte.GoFunc(Join)
+	case 1:
+		return wdte.GoFunc(func(frame wdte.Frame, next ...wdte.Func) wdte.Func {
+			return Join(frame, append(next, args...)...)
+		})
+	}
+
+	a := args[0].Call(frame).(wdte.Array)
+	s := make([]string, 0, len(a))
+	for _, str := range a {
+		s = append(s, string(str.(wdte.String)))
+	}
+
+	return wdte.String(strings.Join(s, string(args[1].Call(frame).(wdte.String))))
+}
+
 // Scope is a scope containing the functions in this package.
 var Scope = wdte.S().Map(map[wdte.ID]wdte.Func{
 	"contains": wdte.GoFunc(Contains),
 	"prefix":   wdte.GoFunc(Prefix),
 	"suffix":   wdte.GoFunc(Suffix),
 	"index":    wdte.GoFunc(Index),
 
-	"upper": wdte.GoFunc(Upper),
-	"lower": wdte.GoFunc(Lower),
+	"upper":  wdte.GoFunc(Upper),
+	"lower":  wdte.GoFunc(Lower),
+	"repeat": wdte.GoFunc(Repeat),
+	"join":   wdte.GoFunc(Join),
 
 	"format": wdte.GoFunc(Format),
 })

wdte_test.go

@@ -570,6 +570,16 @@ func TestStrings(t *testing.T) {
 			script: `let str => import 'strings'; let main => str.lower 'QwErTy';`,
 			ret:    wdte.String("qwerty"),
 		},
+		{
+			name:   "Repeat",
+			script: `let str => import 'strings'; str.repeat 'test' 3;`,
+			ret:    wdte.String("testtesttest"),
+		},
+		{
+			name:   "Join",
+			script: `let str => import 'strings'; str.join ['this'; 'is'; 'a'; 'test'] ' ';`,
+			ret:    wdte.String("this is a test"),
+		},
 		{
 			name:   "Format",
 			script: `let str => import 'strings'; let main => str.format '{#2}{#0}{}' 3 6 9;`,