Merge branch '1.5.x'

docs/installer.sh

@@ -27,7 +27,7 @@ if [ "${MACHINE_TYPE}" = 'x86_64' ]; then
   ARCH="amd64"
 fi
 
-VERSION=1.5.0
+VERSION=1.5.1
 
 echo "Trying to detect the details of your architecture."
 echo ""

docs/types/builtin-function.md

@@ -243,7 +243,7 @@ $ cat ~/.absrc
 source("~/abs/lib/library.abs")
 
 $ abs
-Hello user, welcome to the ABS (1.5.0) programming language!
+Hello user, welcome to the ABS (1.5.1) programming language!
 Type 'quit' when you are done, 'help' if you get lost!
 ⧐ adder(1, 2)
 3

evaluator/evaluator_test.go

@@ -1219,12 +1219,18 @@ func TestCommand(t *testing.T) {
 			{"`echo hello world`", "hello world"},
 		}
 	} else {
+		executor := "bash"
+		if runtime.GOOS == "windows" {
+			executor = "cmd.exe"
+		}
+
 		// bash commands
 		tests = []testLine{
 			{`a = "A"; b = "B"; eee = "-e"; $(echo $eee -n $a$a$b$b$c$c)`, "AABB"},
 			{`$(echo -n "123")`, "123"},
 			{`$(echo -n hello world)`, "hello world"},
 			{`$(echo hello world | xargs echo -n)`, "hello world"},
+			{`$(echo \$0)`, executor},
 			{`$(echo \$CONTEXT)`, "abs"},
 			{"a = 'A'; b = 'B'; eee = '-e'; `echo $eee -n $a$a$b$b$c$c`", "AABB"},
 			{"`echo -n '123'`", "123"},

main.go

@@ -7,7 +7,7 @@ import (
 	"github.com/abs-lang/abs/repl"
 )
 
-var Version = "1.5.0"
+var Version = "1.5.1"
 
 // The ABS interpreter
 func main() {

util/util.go

@@ -62,7 +62,7 @@ func GetEnvVar(env *object.Environment, varName, defaultVal string) string {
 func InterpolateStringVars(str string, env *object.Environment) string {
 	// Match all strings preceded by
 	// a $ or a \$
-	re := regexp.MustCompile("(\\\\)?\\$([a-zA-Z_]{1,})")
+	re := regexp.MustCompile("(\\\\)?\\$([a-zA-Z_0-9]{1,})")
 	str = re.ReplaceAllStringFunc(str, func(m string) string {
 		// If the string starts with a backslash,
 		// that's an escape, so we should replace