Move values from moduleGroup to moduleInfo
Move most of the contents of moduleGroup into moduleInfo. This will
eventually reduce moduleGroup to a simple list of variants of the
same module.
Change-Id: I4289eb9953509751d7637558cd6db73373ccdf78
diff --git a/module_ctx.go b/module_ctx.go
index 4f65a8d..ac80d03 100644
--- a/module_ctx.go
+++ b/module_ctx.go
@@ -149,21 +149,21 @@
type baseModuleContext struct {
context *Context
config interface{}
- group *moduleGroup
+ module *moduleInfo
errs []error
}
func (d *baseModuleContext) ModuleName() string {
- return d.group.properties.Name
+ return d.module.properties.Name
}
func (d *baseModuleContext) ContainsProperty(name string) bool {
- _, ok := d.group.propertyPos[name]
+ _, ok := d.module.propertyPos[name]
return ok
}
func (d *baseModuleContext) ModuleDir() string {
- return filepath.Dir(d.group.relBlueprintsFile)
+ return filepath.Dir(d.module.relBlueprintsFile)
}
func (d *baseModuleContext) Config() interface{} {
@@ -184,14 +184,14 @@
d.errs = append(d.errs, &Error{
Err: fmt.Errorf(format, args...),
- Pos: d.group.pos,
+ Pos: d.module.pos,
})
}
func (d *baseModuleContext) PropertyErrorf(property, format string,
args ...interface{}) {
- pos, ok := d.group.propertyPos[property]
+ pos, ok := d.module.propertyPos[property]
if !ok {
panic(fmt.Errorf("property %q was not set for this module", property))
}
@@ -210,24 +210,23 @@
type moduleContext struct {
baseModuleContext
- module *moduleInfo
scope *localScope
ninjaFileDeps []string
actionDefs localBuildActions
}
-func (m *moduleContext) OtherModuleName(module Module) string {
- info := m.context.moduleInfo[module]
- return info.group.properties.Name
+func (m *moduleContext) OtherModuleName(logicModule Module) string {
+ module := m.context.moduleInfo[logicModule]
+ return module.properties.Name
}
-func (m *moduleContext) OtherModuleErrorf(module Module, format string,
+func (m *moduleContext) OtherModuleErrorf(logicModule Module, format string,
args ...interface{}) {
- info := m.context.moduleInfo[module]
+ module := m.context.moduleInfo[logicModule]
m.errs = append(m.errs, &Error{
Err: fmt.Errorf(format, args...),
- Pos: info.group.pos,
+ Pos: module.pos,
})
}
@@ -314,7 +313,6 @@
type mutatorContext struct {
baseModuleContext
- module *moduleInfo
name string
dependenciesModified bool
}