Add Position to detect remaining words

This should be useful to detect the line has multiple-commands, redirect
or etc, like below.

foo; bar
foo && bar
foo || bar
foo < file
foo > file

Author: mattn

shellwords.go

@@ -34,10 +34,11 @@ func replaceEnv(s string) string {
 type Parser struct {
 	ParseEnv      bool
 	ParseBacktick bool
+	Position      int
 }
 
 func NewParser() *Parser {
-	return &Parser{ParseEnv, ParseBacktick}
+	return &Parser{ParseEnv, ParseBacktick, 0}
 }
 
 func (p *Parser) Parse(line string) ([]string, error) {
@@ -46,7 +47,10 @@ func (p *Parser) Parse(line string) ([]string, error) {
 	var escaped, doubleQuoted, singleQuoted, backQuote bool
 	backtick := ""
 
-	for _, r := range line {
+	pos := -1
+
+loop:
+	for i, r := range line {
 		if escaped {
 			buf += string(r)
 			escaped = false
@@ -104,6 +108,11 @@ func (p *Parser) Parse(line string) ([]string, error) {
 				singleQuoted = !singleQuoted
 				continue
 			}
+		case ';', '&', '|', '<', '>':
+			if !(escaped || singleQuoted || doubleQuoted || backQuote) {
+				pos = i
+				break loop
+			}
 		}
 
 		buf += string(r)
@@ -123,6 +132,8 @@ func (p *Parser) Parse(line string) ([]string, error) {
 		return nil, errors.New("invalid command line string")
 	}
 
+	p.Position = pos
+
 	return args, nil
 }
 

shellwords_test.go

@@ -146,3 +146,36 @@ func TestDupEnv(t *testing.T) {
 		t.Fatalf("Expected %v, but %v:", expected, args)
 	}
 }
+
+func TestHaveMore(t *testing.T) {
+	parser := NewParser()
+	parser.ParseEnv = true
+
+	line := "echo foo; seq 1 10"
+	args, err := parser.Parse(line)
+	if err != nil {
+		t.Fatalf(err.Error())
+	}
+	expected := []string{"echo", "foo"}
+	if !reflect.DeepEqual(args, expected) {
+		t.Fatalf("Expected %v, but %v:", expected, args)
+	}
+
+	if parser.Position == 0 {
+		t.Fatalf("Commands should be remaining")
+	}
+
+	line = string([]rune(line)[parser.Position+1:])
+	args, err = parser.Parse(line)
+	if err != nil {
+		t.Fatalf(err.Error())
+	}
+	expected = []string{"seq", "1", "10"}
+	if !reflect.DeepEqual(args, expected) {
+		t.Fatalf("Expected %v, but %v:", expected, args)
+	}
+
+	if parser.Position > 0 {
+		t.Fatalf("Commands should not be remaining")
+	}
+}