Fix imported functions evaluated wrongly if not used as an expression (#68)

Author: monstermichl

parser/parser.go

@@ -561,6 +561,14 @@ func (p *Parser) eat() lexer.Token {
 	return token
 }
 
+func (p *Parser) vomit(amount uint) lexer.Token {
+	for amount > 0 && p.index > 0 {
+		p.index--
+		amount--
+	}
+	return p.peek()
+}
+
 func (p *Parser) isShortVarInit() bool {
 	_, err := p.findAllowed(lexer.SHORT_INIT_OPERATOR, lexer.IDENTIFIER, lexer.COMMA)
 
@@ -3144,6 +3152,14 @@ func (p *Parser) evaluateStatement(ctx context) (Statement, error) {
 			}
 
 			if err == nil && stmt == nil {
+				// If importAlias has already been evaluated, but no case was hit, reset
+				// the token pointer by 2 to set it back to the import-alias token. This
+				// is kinda ugly but the importAlias does not belong into the context
+				// and this way it's not necessary to propagate it from function to
+				// function.
+				if len(importAlias) > 0 {
+					p.vomit(2)
+				}
 				stmt, err = p.evaluateExpression(ctx)
 			}
 		}

tests/import.go

@@ -85,6 +85,17 @@ func testImportsFromExternalSourceSuccess(t *testing.T, transpilerFunc transpile
 	})
 }
 
+func testCallImportedFunctionAsStatementSuccess(t *testing.T, transpilerFunc transpilerCalloutFunc) {
+	transpilerFunc(t, func(dir string) (string, error) {
+		return `
+			import "strings"
+			strings.Contains("Hello World", "Wor")
+		`, nil
+	}, func(output string, err error) {
+		require.Nil(t, err)
+	})
+}
+
 func testImportVariableSuccess(t *testing.T, transpilerFunc transpilerCalloutFunc) {
 	value := "Hello World"
 

tests/import_linux_test.go

@@ -24,6 +24,10 @@ func TestImportsFromExternalSourceSuccess(t *testing.T) {
 	testImportsFromExternalSourceSuccess(t, transpileBashFunc)
 }
 
+func TestCallImportedFunctionAsStatementSuccess(t *testing.T) {
+	testCallImportedFunctionAsStatementSuccess(t, transpileBashFunc)
+}
+
 func TestImportVariableSuccess(t *testing.T) {
 	testImportVariableSuccess(t, transpileBashFunc)
 }

tests/import_windows_test.go

@@ -24,6 +24,10 @@ func TestImportsFromExternalSourceSuccess(t *testing.T) {
 	testImportsFromExternalSourceSuccess(t, transpileBatchFunc)
 }
 
+func TestCallImportedFunctionAsStatementSuccess(t *testing.T) {
+	testCallImportedFunctionAsStatementSuccess(t, transpileBatchFunc)
+}
+
 func TestImportVariableSuccess(t *testing.T) {
 	testImportVariableSuccess(t, transpileBatchFunc)
 }