commit 0ed63eff298e9f51c82b9f9a27893b7f695ada29
author Jamie Gennis <jgennis@google.com> Mon Jun 30 18:07:17 2014 -0700
committer Jamie Gennis <jgennis@google.com> Mon Jun 30 18:26:28 2014 -0700
tree 865052e9243da2bdb87fe6bc0073590d8abc53b7
parent 3159cb7673585dc4f9aee00abadf09d6fcb42cf0

Fix scoping logic to respect the caller's package.

This change makes the ModuleContext and SingletonContext methods respect the
caller's Go package when performing name lookups.  It does this by re-parenting
the module or singleton's scope to the scope of the caller's package, thus
allowing a Module or Singleton to pass its context to a function defined in
another Go package and have the called function access variables and rules
defined in its own Go package.

Change-Id: Ifdec87ba3095a453b36fb00e38c0bb3a928a2b9b

blueprint/module_ctx.go

diff --git a/blueprint/module_ctx.go b/blueprint/module_ctx.go
index 0029d11..0de8c4e 100644
--- a/blueprint/module_ctx.go
+++ b/blueprint/module_ctx.go
@@ -93,6 +93,9 @@
 }
 
 func (m *moduleContext) Variable(name, value string) {
+	const skip = 2
+	m.scope.ReparentToCallerPackage(skip)
+
 	v, err := m.scope.AddLocalVariable(name, value)
 	if err != nil {
 		panic(err)
@@ -104,6 +107,9 @@
 func (m *moduleContext) Rule(name string, params RuleParams,
 	argNames ...string) Rule {
 
+	const skip = 2
+	m.scope.ReparentToCallerPackage(skip)
+
 	r, err := m.scope.AddLocalRule(name, &params, argNames...)
 	if err != nil {
 		panic(err)
@@ -115,6 +121,9 @@
 }
 
 func (m *moduleContext) Build(params BuildParams) {
+	const skip = 2
+	m.scope.ReparentToCallerPackage(skip)
+
 	def, err := parseBuildParams(m.scope, &params)
 	if err != nil {
 		panic(err)