Skip to content

Instead of switching over to module typedefs when appropriate, recurs… #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HRogge wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Instead of switching over to module typedefs when appropriate, recurs… #108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 25 additions & 16 deletions meta/compile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,22 +374,7 @@ func (c *compiler) findTypedef(y *Type, parent Definition, qualifiedIdent string

var found *Typedef
if searchHeirarcy {
p := parent
for p != nil {
if ptd, ok := p.(HasTypedefs); ok {
if found = ptd.Typedefs()[ident]; found != nil {
break
}
}
p = p.getOriginalParent()
if p != nil {
// issue #50 - submodules can reference types in parent and in any
// other submodule w/o prefix
if m, isModule := p.(*Module); isModule && m.belongsTo != nil {
p = m.Parent().(Definition)
}
}
}
found = searchTypedef(parent, ident)
} else {
found = module.Typedefs()[ident]
}
Expand All @@ -406,6 +391,30 @@ func (c *compiler) findTypedef(y *Type, parent Definition, qualifiedIdent string
return found, nil
}

func searchTypedef(p Definition, ident string) *Typedef {
if ptd, ok := p.(HasTypedefs); ok {
if found := ptd.Typedefs()[ident]; found != nil {
return found
}
}
p = p.getOriginalParent()
if p == nil {
return nil
}

// issue #50 - submodules can reference types in parent and in any
// other submodule w/o prefix
if m, isModule := p.(*Module); isModule && m.belongsTo != nil {
found := searchTypedef(m.Parent().(Definition), ident)
if found != nil {
return found
}
}

// continue searching the original parent
return searchTypedef(p, ident)
}

func (c *compiler) typedef(t *Typedef) error {
if t.dtype == nil {
return fmt.Errorf("%s - %s type required", SchemaPath(t), t.ident)
Expand Down