code review 4280048: go/scanner: use filepath

src/pkg/go/scanner/scanner_test.go

 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 package scanner
 
 import (
         "go/token"
         "os"
+        "path/filepath"
         "testing"
 )
 
 
 var fset = token.NewFileSet()
 
 
 const /* class */ (
         special = iota
         literal
@@ skipping 416 matching lines @@
 
                 // if the input ended in newlines, the input must tokenize the
                 // same with or without those newlines
                 for i := len(line) - 1; i >= 0 && line[i] == '\n'; i-- {
                         checkSemi(t, line[0:i], AllowIllegalChars|InsertSemis)
                         checkSemi(t, line[0:i], AllowIllegalChars|InsertSemis|ScanComments)
                 }
         }
 }
 
-
 var segments = []struct {
         srcline  string // a line of source text
         filename string // filename for current token
         line     int    // line number for current token
 }{
         // exactly one token per line since the test consumes one token per segment
-        {"  line1", "dir/TestLineComments", 1},
-        {"\nline2", "dir/TestLineComments", 2},
-        {"\nline3  //line File1.go:100", "dir/TestLineComments", 3}, // bad line comment, ignored
-        {"\nline4", "dir/TestLineComments", 4},
-        {"\n//line File1.go:100\n  line100", "dir/File1.go", 100},
-        {"\n//line File2.go:200\n  line200", "dir/File2.go", 200},
+        {"  line1", filepath.Join("dir", "TestLineComments"), 1},
+        {"\nline2", filepath.Join("dir", "TestLineComments"), 2},
+        {"\nline3  //line File1.go:100", filepath.Join("dir", "TestLineComments"), 3}, // bad line comment, ignored
+        {"\nline4", filepath.Join("dir", "TestLineComments"), 4},
+        {"\n//line File1.go:100\n  line100", filepath.Join("dir", "File1.go"), 100},
+        {"\n//line File2.go:200\n  line200", filepath.Join("dir", "File2.go"), 200},
         {"\n//line :1\n  line1", "dir", 1},
-        {"\n//line foo:42\n  line42", "dir/foo", 42},
-        {"\n //line foo:42\n  line44", "dir/foo", 44},           // bad line comment, ignored
-        {"\n//line foo 42\n  line46", "dir/foo", 46},            // bad line comment, ignored
-        {"\n//line foo:42 extra text\n  line48", "dir/foo", 48}, // bad line comment, ignored
-        {"\n//line /bar:42\n  line42", "/bar", 42},
-        {"\n//line ./foo:42\n  line42", "dir/foo", 42},
-        {"\n//line a/b/c/File1.go:100\n  line100", "dir/a/b/c/File1.go", 100},
+        {"\n//line foo:42\n  line42", filepath.Join("dir", "foo"), 42},
+        {"\n //line foo:42\n  line44", filepath.Join("dir", "foo"), 44},           // bad line comment, ignored
+        {"\n//line foo 42\n  line46", filepath.Join("dir", "foo"), 46},            // bad line comment, ignored
+        {"\n//line foo:42 extra text\n  line48", filepath.Join("dir", "foo"), 48}, // bad line comment, ignored
+        {"\n//line /bar:42\n  line42", string(filepath.Separator) + "bar", 42},
+        {"\n//line ./foo:42\n  line42", filepath.Join("dir", "foo"), 42},
+        {"\n//line a/b/c/File1.go:100\n  line100", filepath.Join("dir", "a", "b", "c", "File1.go"), 100},
 }
 
 
 // Verify that comments of the form "//line filename:line" are interpreted correctly.
 func TestLineComments(t *testing.T) {
         // make source
         var src string
         for _, e := range segments {
                 src += e.srcline
         }
 
         // verify scan
         var S Scanner
-        file := fset.AddFile("dir/TestLineComments", fset.Base(), len(src))
+        file := fset.AddFile(filepath.Join("dir", "TestLineComments"), fset.Base(), len(src))
         S.Init(file, []byte(src), nil, 0)
         for _, s := range segments {
                 p, _, lit := S.Scan()
                 pos := file.Position(p)
                 checkPos(t, string(lit), p, token.Position{s.filename, pos.Offset, s.line, pos.Column})
         }
 
         if S.ErrorCount != 0 {
                 t.Errorf("found %d errors", S.ErrorCount)
         }
@@ skipping 172 matching lines @@
         {"\"abc\x00def\"", token.STRING, 4, "illegal character NUL"},
         {"\"abc\x80def\"", token.STRING, 4, "illegal UTF-8 encoding"},
 }
 
 
 func TestScanErrors(t *testing.T) {
         for _, e := range errors {
                 checkError(t, e.src, e.tok, e.pos, e.err)
         }
 }