Let app/program call also return stderr (actual stderr capturing is not implemented yet) (#28)

Author: monstermichl

converters/bash/converter.go

@@ -459,6 +459,11 @@ func (c *converter) FuncCall(name string, args []string, returnTypes []parser.Va
 			returnValues = append(returnValues, eval)
 		}
 	}
+
+	// Make sure return values contain as many values as expected.
+	for len(returnValues) < len(returnTypes) {
+		returnValues = append(returnValues, "")
+	}
 	return returnValues, nil
 }
 
@@ -497,10 +502,10 @@ func (c *converter) AppCall(calls []transpiler.AppCall, valueUsed bool) ([]strin
 			return nil, err
 		}
 		c.VarDefinition(helper2, "$?", false)
-		return []string{eval, c.varEvaluationString(helper2, false)}, nil
+		return []string{eval, "", c.varEvaluationString(helper2, false)}, nil // TODO: Return stderr (https://github.com/monstermichl/TypeShell/issues/28).
 	}
 	c.addLine(callString)
-	return []string{}, nil
+	return []string{"", "", "0"}, nil
 }
 
 func (c *converter) Input(prompt string, valueUsed bool) (string, error) {

converters/batch/converter.go

@@ -678,6 +678,11 @@ func (c *converter) FuncCall(name string, args []string, returnTypes []parser.Va
 			returnValues = append(returnValues, eval)
 		}
 	}
+
+	// Make sure return values contain as many values as expected.
+	for len(returnValues) < len(returnTypes) {
+		returnValues = append(returnValues, "")
+	}
 	return returnValues, nil
 }
 
@@ -718,10 +723,10 @@ func (c *converter) AppCall(calls []transpiler.AppCall, valueUsed bool) ([]strin
 			return nil, err
 		}
 		c.VarAssignment(helper2, c.varEvaluationString("_te", true), false)
-		return []string{eval, c.varEvaluationString(helper2, false)}, nil
+		return []string{eval, "", c.varEvaluationString(helper2, false)}, nil // TODO: Return stderr (https://github.com/monstermichl/TypeShell/issues/28).
 	}
 	c.addLine(fmt.Sprintf("call %s", strings.Join(callStrings, " | ")))
-	return []string{}, nil
+	return []string{"", "", "0"}, nil
 }
 
 func (c *converter) Input(prompt string, valueUsed bool) (string, error) {

parser/appcall.go

@@ -28,7 +28,8 @@ func (a AppCall) Next() *AppCall {
 
 func (a AppCall) ReturnTypes() []ValueType {
 	return []ValueType{
-		NewValueType(DATA_TYPE_STRING, false),
-		NewValueType(DATA_TYPE_INTEGER, false),
+		NewValueType(DATA_TYPE_STRING, false),  // stdout
+		NewValueType(DATA_TYPE_STRING, false),  // stderr
+		NewValueType(DATA_TYPE_INTEGER, false), // error code
 	}
 }

tests/appcall_linux_test.go

@@ -10,9 +10,9 @@ import (
 func TestLsCallSuccess(t *testing.T) {
 	transpileBashFunc(t, func(dir string) (string, error) {
 		return `
-			` + fmt.Sprintf(`var a, code = @ls("%s")`, dir) + `
+			` + fmt.Sprintf(`var stdout, stderr, code = @ls("%s")`, dir) + `
 
-			print(a, code)
+			print(stdout, code)
 		`, nil
 	}, func(output string, err error) {
 		require.Nil(t, err)
@@ -23,9 +23,9 @@ func TestLsCallSuccess(t *testing.T) {
 func TestLsCallPipeToGrepCallSuccess(t *testing.T) {
 	transpileBashFunc(t, func(dir string) (string, error) {
 		return `
-			` + fmt.Sprintf(`var a, code = @ls("%s") | @grep(".tsh")`, dir) + `
+			` + fmt.Sprintf(`var stdout, stderr, code = @ls("%s") | @grep(".tsh")`, dir) + `
 
-			print(a, code)
+			print(stdout, code)
 		`, nil
 	}, func(output string, err error) {
 		require.Nil(t, err)
@@ -36,7 +36,7 @@ func TestLsCallPipeToGrepCallSuccess(t *testing.T) {
 func TestLsCallFail(t *testing.T) {
 	transpileBashFunc(t, func(dir string) (string, error) {
 		return `
-			var a, code = @ls("not-present-dir")
+			var stdout, stderr, code = @ls("not-present-dir")
 
 			print(code)
 		`, nil

tests/appcall_windows_test.go

@@ -11,9 +11,9 @@ import (
 func TestDirCallSuccess(t *testing.T) {
 	transpileBatchFunc(t, func(dir string) (string, error) {
 		return `
-			` + fmt.Sprintf(`var a, code = @dir("/B", "%s")`, strings.ReplaceAll(dir, `\`, `\\`)) + `
+			` + fmt.Sprintf(`var stdout, stderr, code = @dir("/B", "%s")`, strings.ReplaceAll(dir, `\`, `\\`)) + `
 
-			print(a, code)
+			print(stdout, code)
 		`, nil
 	}, func(output string, err error) {
 		require.Nil(t, err)
@@ -24,9 +24,9 @@ func TestDirCallSuccess(t *testing.T) {
 func TestDirCallPipeToFindstrCallSuccess(t *testing.T) {
 	transpileBatchFunc(t, func(dir string) (string, error) {
 		return `
-			` + fmt.Sprintf(`var a, code = @dir("/B", "%s") | @findstr(".tsh")`, strings.ReplaceAll(dir, `\`, `\\`)) + `
+			` + fmt.Sprintf(`var stdout, stderr, code = @dir("/B", "%s") | @findstr(".tsh")`, strings.ReplaceAll(dir, `\`, `\\`)) + `
 
-			print(a, code)
+			print(stdout, code)
 		`, nil
 	}, func(output string, err error) {
 		require.Nil(t, err)
@@ -37,7 +37,7 @@ func TestDirCallPipeToFindstrCallSuccess(t *testing.T) {
 func TestDirCallFail(t *testing.T) {
 	transpileBatchFunc(t, func(dir string) (string, error) {
 		return `
-			var a, code = @dir("/B", "not-present-dir")
+			var stdout, stderr, code = @dir("/B", "not-present-dir")
 
 			print(code)
 		`, nil