commit aeffbf776abff483634d1fc1bba0abce15b6d72e
author Dan Willemsen <dwillemsen@google.com> Wed Nov 25 15:29:32 2015 -0800
committer Dan Willemsen <dwillemsen@google.com> Mon Nov 30 17:03:34 2015 -0800
tree f66d827ac5177a7b5dabe2d1137581f816a4488d
parent 6afb72ff1bde8ad53bb0da4b85fa15e73e1bb1fe

Allow wrapping of PackageContext

Turn PackageContext into an interface so that build systems can wrap it
to add more custom helpers.

This does introduce an API change, though it should be fairly simple.
NewPackageContext used to provide an opaque *PackageContext struct, now it
provides a PackageContext interface.

Change-Id: I383c64a303d857ef5e0dec86ad77f791ba4c9639

scope.go

diff --git a/scope.go b/scope.go
index ef4eb2c..84db0cf 100644
--- a/scope.go
+++ b/scope.go
@@ -25,9 +25,9 @@
 // to the output .ninja file.  A variable may contain references to other global
 // Ninja variables, but circular variable references are not allowed.
 type Variable interface {
-	packageContext() *PackageContext
+	packageContext() *packageContext
 	name() string                                        // "foo"
-	fullName(pkgNames map[*PackageContext]string) string // "pkg.foo" or "path.to.pkg.foo"
+	fullName(pkgNames map[*packageContext]string) string // "pkg.foo" or "path.to.pkg.foo"
 	value(config interface{}) (*ninjaString, error)
 	String() string
 }
@@ -35,9 +35,9 @@
 // A Pool represents a Ninja pool that will be written to the output .ninja
 // file.
 type Pool interface {
-	packageContext() *PackageContext
+	packageContext() *packageContext
 	name() string                                        // "foo"
-	fullName(pkgNames map[*PackageContext]string) string // "pkg.foo" or "path.to.pkg.foo"
+	fullName(pkgNames map[*packageContext]string) string // "pkg.foo" or "path.to.pkg.foo"
 	def(config interface{}) (*poolDef, error)
 	String() string
 }
@@ -45,9 +45,9 @@
 // A Rule represents a Ninja build rule that will be written to the output
 // .ninja file.
 type Rule interface {
-	packageContext() *PackageContext
+	packageContext() *packageContext
 	name() string                                        // "foo"
-	fullName(pkgNames map[*PackageContext]string) string // "pkg.foo" or "path.to.pkg.foo"
+	fullName(pkgNames map[*packageContext]string) string // "pkg.foo" or "path.to.pkg.foo"
 	def(config interface{}) (*ruleDef, error)
 	scope() *basicScope
 	isArg(argName string) bool
@@ -260,8 +260,8 @@
 // package context.  This allows a ModuleContext and SingletonContext to call
 // a function defined in a different Go package and have that function retain
 // access to all of the package-scoped variables of its own package.
-func (s *localScope) ReparentTo(pctx *PackageContext) {
-	s.scope.parent = pctx.scope
+func (s *localScope) ReparentTo(pctx PackageContext) {
+	s.scope.parent = pctx.getScope()
 }
 
 func (s *localScope) LookupVariable(name string) (Variable, error) {
@@ -354,7 +354,7 @@
 	value_     *ninjaString
 }
 
-func (l *localVariable) packageContext() *PackageContext {
+func (l *localVariable) packageContext() *packageContext {
 	return nil
 }
 
@@ -362,7 +362,7 @@
 	return l.name_
 }
 
-func (l *localVariable) fullName(pkgNames map[*PackageContext]string) string {
+func (l *localVariable) fullName(pkgNames map[*packageContext]string) string {
 	return l.namePrefix + l.name_
 }
 
@@ -382,7 +382,7 @@
 	scope_     *basicScope
 }
 
-func (l *localRule) packageContext() *PackageContext {
+func (l *localRule) packageContext() *packageContext {
 	return nil
 }
 
@@ -390,7 +390,7 @@
 	return l.name_
 }
 
-func (l *localRule) fullName(pkgNames map[*PackageContext]string) string {
+func (l *localRule) fullName(pkgNames map[*packageContext]string) string {
 	return l.namePrefix + l.name_
 }