V0.1.1 (#34)

* Add local keyword to local variables (Bash)

* Trigger workflow on any branch

* Add VSCode syntax highlighting workaround description

* Improve strings

* Fix negation handling (#30)

* Add raw string support (#31)

* Add support for single variable in for-range loop (#29)

* Fix len on empty string leads to endless loop (Batch) (#32)

* Implement super inperformant version of strings.Split

* Fix substring newline handling (Bash)

* Replace expr by double parentheses (Bash)

* Implement find example for Windows and Linux

Author: monstermichl

.github/workflows/workflow.yaml

@@ -3,10 +3,10 @@ name: TypeShell Linux
 on:
   push:
     branches:
-      - main
+      - '*'
   pull_request:
     branches:
-      - main
+      - '*'
   release:
     types:
       - created

README.md

@@ -287,3 +287,10 @@ print(s[0]) // Prints "Hello".
 print(s[1]) // Prints "".
 print(s[2]) // Prints "World".
 ```
+
+## Visual Studio Code
+There is no extension for VSCode yet. However, since the code is very Go-like, adding the ".tsh" extension to the settings should serve as a first workaround.
+- Open VSCode.
+- Go to File -> Preferences -> Settings.
+- Seach for "file associations".
+- Add "*.tsh" to the list and associate it with Go.

converters/bash/converter.go

@@ -34,8 +34,7 @@ func New() *converter {
 }
 
 func (c *converter) StringToString(value string) string {
-	// Replace "\\n" with "\n".
-	return strings.ReplaceAll(value, "\\n", "\n")
+	return value
 }
 
 func (c *converter) Dump() (string, error) {
@@ -81,14 +80,16 @@ func (c *converter) ProgramEnd() error {
 			"while [ ${_i} -lt ${_l} ]; do",
 			fmt.Sprintf("local _v=%s", c.sliceEvaluationString("${2}", "${_i}")),
 			c.sliceAssignmentString("${_n}", "${_i}", "${_v}", false),
-			"_i=$(expr ${_i} + 1)",
+			"_i=$((${_i}+1))",
 			"done",
 		)
 	}
 
 	if c.stringSubscriptHelperRequired {
 		c.addHelper("substring", "_ssh",
-			"echo \"${1}\" | cut -c $(expr ${2} \\+ 1)-$(expr ${3} \\+ 1)", // Cut index starts at 1, therefore 1 must be added to 0-based subscript.
+			`_ls=$((${2}))`,
+			`_ll=$(((${3}-${2})+1))`,
+			`_ret="${1:${_ls}:${_ll}}"`,
 		)
 	}
 	return nil
@@ -99,17 +100,7 @@ func (c *converter) VarDefinition(name string, value string, global bool) error
 }
 
 func (c *converter) VarAssignment(name string, value string, global bool) error {
-	length := len(value)
-
-	if length > 0 {
-		if string(value[length-1]) != "\"" {
-			value = fmt.Sprintf("%s\"", value)
-		}
-		if string(value[0]) != "\"" {
-			value = fmt.Sprintf("\"%s", value)
-		}
-	}
-	c.addLine(fmt.Sprintf("%s=%s", c.varName(name, global), value))
+	c.addLine(c.varAssignmentString(name, value, global))
 	return nil
 }
 
@@ -127,7 +118,8 @@ func (c *converter) FuncStart(name string, params []string, returnTypes []parser
 	c.addLine(fmt.Sprintf("%s() {", name))
 
 	for i, param := range params {
-		c.VarAssignment(param, fmt.Sprintf("$%d", i+1), false)
+		s := c.varAssignmentString(param, fmt.Sprintf("$%d", i+1), false)
+		c.addLine(fmt.Sprintf("local %s", s))
 	}
 	return nil
 }
@@ -279,7 +271,7 @@ func (c *converter) BinaryOperation(left string, operator parser.BinaryOperator,
 		default:
 			return notAllowedError()
 		}
-		c.VarAssignment(helper, fmt.Sprintf("$(expr %s \\%s %s)", left, operator, right), false) // Backslash is required for * operator to prevent pattern expansion (https://www.shell-tips.com/bash/math-arithmetic-calculation/#using-the-expr-command-line).
+		c.VarAssignment(helper, fmt.Sprintf("$((%s%s%s))", left, operator, right), false) // Backslash is required for * operator to prevent pattern expansion (https://www.shell-tips.com/bash/math-arithmetic-calculation/#using-the-expr-command-line).
 	case parser.DATA_TYPE_STRING:
 		switch operator {
 		case parser.BINARY_OPERATOR_ADDITION:
@@ -419,7 +411,8 @@ func (c *converter) SliceLen(name string, valueUsed bool) (string, error) {
 func (c *converter) StringSubscript(value string, startIndex string, endIndex string, valueUsed bool) (string, error) {
 	helper := c.nextHelperVar()
 
-	c.VarAssignment(helper, fmt.Sprintf("$(_ssh \"%s\" %s %s)", value, startIndex, endIndex), false) // https://www.baeldung.com/linux/bash-substring#1-using-thecut-command
+	c.addLine(fmt.Sprintf(`_ssh "%s" %s %s`, value, startIndex, endIndex))
+	c.VarAssignment(helper, c.varEvaluationString("_ret", true), false) // https://www.baeldung.com/linux/bash-substring#1-using-thecut-command
 	c.stringSubscriptHelperRequired = true
 
 	return c.varEvaluationString(helper, false), nil
@@ -559,6 +552,20 @@ func (c *converter) varName(name string, global bool) string {
 	return name
 }
 
+func (c *converter) varAssignmentString(name string, value string, global bool) string {
+	length := len(value)
+
+	if length > 0 {
+		if string(value[length-1]) != `"` {
+			value = fmt.Sprintf(`%s"`, value)
+		}
+		if string(value[0]) != `"` {
+			value = fmt.Sprintf(`"%s`, value)
+		}
+	}
+	return fmt.Sprintf("%s=%s", c.varName(name, global), value)
+}
+
 func (c *converter) varEvaluationString(name string, global bool) string {
 	return fmt.Sprintf("${%s}", c.varName(name, global))
 }

converters/batch/converter.go

@@ -224,7 +224,7 @@ func (c *converter) ProgramEnd() error {
 		c.addHelper("string length", stringLengthHelper,
 			"set _l=0",
 			":_stlhl",
-			fmt.Sprintf(`if "!%s:~%%_l%%!" equ "" goto :_stlhle`, funcArgVar(0)), // https://www.geeksforgeeks.org/batch-script-string-length/
+			fmt.Sprintf(`if "!%s!" equ "" (goto :_stlhle) else if "!%s:~%%_l%%!" equ "" goto :_stlhle`, funcArgVar(0), funcArgVar(0)), // https://www.geeksforgeeks.org/batch-script-string-length/
 			`set /A "_l=%_l%+1"`,
 			"goto :_stlhl",
 			":_stlhle",

examples/find_linux.tsh

@@ -0,0 +1,10 @@
+import "strings" // Import standard library "strings".
+
+pattern := input("Find pattern: ")                      // Ask user for pattern input.
+filesString, stderr, code := @ls("-1") | @grep(pattern) // Make program calls.
+files := strings.Split(filesString, "\n")               // Split files list at newline.
+
+// Iterate files.
+for i, f := range files {
+	print(i, f)
+}

examples/find_windows.tsh

@@ -0,0 +1,10 @@
+import "strings" // Import standard library "strings".
+
+pattern := input("Find pattern: ")                          // Ask user for pattern input.
+filesString, stderr, code := @dir("/b") | @findstr(pattern) // Make program calls.
+files := strings.Split(filesString, "\n")                   // Split files list at newline.
+
+// Iterate files.
+for i, f := range files {
+	print(i, f)
+}

lexer/lexer.go

@@ -248,7 +248,7 @@ func Tokenize(source string) ([]Token, error) {
 		ogRow := row
 		ogColumn := column
 
-		if c0 == "\"" {
+		if raw := c0 == "`"; raw || c0 == `"` {
 			// Evaluate string.
 			str := ""
 			i++
@@ -257,7 +257,7 @@ func Tokenize(source string) ([]Token, error) {
 				c0 = char(source, i)
 				appended := false
 
-				if match := regexp.MustCompile(`^\\.`).FindString(source[i:]); match != "" {
+				if match := regexp.MustCompile(`^\\.`).FindString(source[i:]); !raw && match != "" {
 					// Convert escaped character to be a control character (https://pkg.go.dev/strconv#Unquote).
 					parsed, err := strconv.Unquote(fmt.Sprintf(`"%s"`, match))
 
@@ -267,7 +267,7 @@ func Tokenize(source string) ([]Token, error) {
 					str += parsed
 					i += len(match)
 					appended = true
-				} else if c0 == "\"" {
+				} else if (raw && c0 == "`") || (!raw && c0 == `"`) {
 					// Detected string end.
 					i++
 					token = newToken(str, STRING_LITERAL, ogRow, ogColumn)
@@ -354,7 +354,7 @@ func Tokenize(source string) ([]Token, error) {
 
 		// If still no token has been found, exit with error.
 		if token.tokenType == UNKNOWN {
-			err = fmt.Errorf("unknown token \"%s\" at position %d", c0, i)
+			err = fmt.Errorf(`unknown token "%s" at position %d`, c0, i)
 			break
 		} else if slices.Contains([]TokenType{SPACE, COMMENT}, token.tokenType) {
 			// Ignore spaces and comments for now.