compiler/natives: Update filter API.

dmitshur · dmitshur · commit 78919e0ff954 · 2016-05-24T01:42:26.000-07:00
Depends on shurcooL/httpfs#4. Rewrite filter in terms of Keep rather than Skip to make the logic simpler and more readable.
diff --git a/compiler/natives/fs.go b/compiler/natives/fs.go
@@ -21,9 +21,9 @@ func importPathToDir(importPath string) string {
 }
 
 // FS is a virtual filesystem that contains native packages.
-var FS = filter.New(
+var FS = filter.Keep(
 	http.Dir(importPathToDir("github.com/gopherjs/gopherjs/compiler/natives")),
 	func(path string, fi os.FileInfo) bool {
-		return path != "/" && path != "/src" && !strings.HasPrefix(path, "/src/")
+		return path == "/" || path == "/src" || strings.HasPrefix(path, "/src/")
 	},
 )

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ func importPathToDir(importPath string) string {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`// FS is a virtual filesystem that contains native packages.`
`24`		`-var FS = filter.New(`
	`24`	`+var FS = filter.Keep(`
`25`	`25`	`http.Dir(importPathToDir("github.com/gopherjs/gopherjs/compiler/natives")),`
`26`	`26`	`func(path string, fi os.FileInfo) bool {`
`27`		`- return path != "/" && path != "/src" && !strings.HasPrefix(path, "/src/")`
	`27`	`+ return path == "/" \|\| path == "/src" \|\| strings.HasPrefix(path, "/src/")`
`28`	`28`	`},`
`29`	`29`	`)`