Merge pull request #1646 from xushiwei/ov

stringLitEx bugfix: stringex3

parser/_testdata/stringex3/parser.expect

@@ -0,0 +1,38 @@
+package main
+
+file string_lit.gop
+noEntrypoint
+ast.FuncDecl:
+  Name:
+    ast.Ident:
+      Name: main
+  Type:
+    ast.FuncType:
+      Params:
+        ast.FieldList:
+  Body:
+    ast.BlockStmt:
+      List:
+        ast.ExprStmt:
+          X:
+            ast.CallExpr:
+              Fun:
+                ast.Ident:
+                  Name: println
+              Args:
+                ast.BasicLit:
+                  Kind: STRING
+                  Value: "file:${args[0]}?${query}"
+                    Extra:
+                      file:
+                      ast.IndexExpr:
+                        X:
+                          ast.Ident:
+                            Name: args
+                        Index:
+                          ast.BasicLit:
+                            Kind: INT
+                            Value: 0
+                      ?
+                      ast.Ident:
+                        Name: query

parser/_testdata/stringex3/string_lit.gop

@@ -0,0 +1 @@
+println "file:${args[0]}?${query}"

parser/parser.go

@@ -1635,7 +1635,7 @@ loop:
 		}
 		to := pos + token.Pos(from+end)
 		parts = p.stringLitExpr(parts, pos+token.Pos(from), to)
-		pos = to
+		pos = to + 1
 		text = left[end+1:]
 	case '$': // $$
 		parts = append(parts, text[:at+2])
@@ -1674,7 +1674,8 @@ func hasExtra(text string) bool {
 func (p *parser) stringLitExpr(parts []any, off, end token.Pos) []any {
 	file := p.file
 	base := file.Base()
-	expr, err := parseExprEx(p.file, p.scanner.CodeTo(int(end)-base), int(off)-base, 0)
+	src := p.scanner.CodeTo(int(end) - base)
+	expr, err := parseExprEx(p.file, src, int(off)-base, 0)
 	if err != nil {
 		p.errors = append(p.errors, err...)
 		expr = &ast.BadExpr{From: off, To: end}