Merge pull request #1557 from visualfc/line2

cl: offsetFileLine use slash
goplus · Nov 25, 2023 · 87b526f · 87b526f
2 parents 8cf27b4 + 7eff8fb
commit 87b526f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cl/compile_test.go b/cl/compile_test.go
@@ -4710,7 +4710,7 @@ func main() {
 }
 `
 	if runtime.GOOS == "windows" {
-		expected = strings.Replace(expected, "../", `..\foo\`, -1)
+		expected = strings.Replace(expected, "../", `../foo/`, -1)
 	}
 	gopClTestEx(t, &conf, "main", src, expected)
 }
diff --git a/cl/stmt.go b/cl/stmt.go
@@ -47,7 +47,7 @@ func offsetFileLine(ctx *blockCtx, file string) string {
 		file = filepath.Join(ctx.fileLineWorkingDir, file)
 	}
 	if ret, err := filepath.Rel(ctx.fileLineRoot, file); err == nil {
-		return ret
+		return filepath.ToSlash(ret)
 	}
 	return file
 }