suwako
/
activity
1
0
フォーク 0
コード イシュー プルリクエスト パッケージ プロジェクト リリース Wiki アクティビティ

Add generation of referenced values. 

Fix the package qualified naming for value types and also correctly
reference the net/url package in the owl ontology.
このコミットが含まれているのは:
Cory Slep 2019-01-05 00:00:51 +01:00
親 df9ff825c2
コミット 54f8549b10
6個のファイルの変更、105行の追加、26行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

8
tools/exp/codegen/method.go
ファイルの表示

@ -58,6 +58,14 @@ func NewFunction(pkg, name string,
}
}
// CloneToPackage copies this Function into a new one defined in the provided
// package
func (m Function) CloneToPackage(pkg string) *Function {
f := m
f.qual = jen.Qual(pkg, m.name)
return &f
}
// Definition generates the Go code required to define and implement this
// function.
func (m Function) Definition() jen.Code {

103
tools/exp/convert/convert.go
ファイルの表示

@ -15,19 +15,21 @@ type File struct {
}
type vocabulary struct {
Kinds map[string]*props.Kind
FProps map[string]*props.FunctionalPropertyGenerator
NFProps map[string]*props.NonFunctionalPropertyGenerator
Types map[string]*props.TypeGenerator
Manager *props.ManagerGenerator
Values map[string]*props.Kind
FProps map[string]*props.FunctionalPropertyGenerator
NFProps map[string]*props.NonFunctionalPropertyGenerator
Types map[string]*props.TypeGenerator
Manager *props.ManagerGenerator
References map[string]*vocabulary
}
func newVocabulary() vocabulary {
return vocabulary{
Kinds: make(map[string]*props.Kind, 0),
FProps: make(map[string]*props.FunctionalPropertyGenerator, 0),
NFProps: make(map[string]*props.NonFunctionalPropertyGenerator, 0),
Types: make(map[string]*props.TypeGenerator, 0),
Values: make(map[string]*props.Kind, 0),
FProps: make(map[string]*props.FunctionalPropertyGenerator, 0),
NFProps: make(map[string]*props.NonFunctionalPropertyGenerator, 0),
Types: make(map[string]*props.TypeGenerator, 0),
References: make(map[string]*vocabulary, 0),
}
}
@ -74,6 +76,7 @@ const (
type Converter struct {
Registry *rdf.RDFRegistry
VocabularyRoot *props.PackageManager
ValueRoot *props.PackageManager
PropertyPackagePolicy PropertyPackagePolicy
PropertyPackageRoot *props.PackageManager
TypePackagePolicy TypePackagePolicy
@ -86,14 +89,36 @@ func (c Converter) Convert(p *rdf.ParsedVocabulary) (f []*File, e error) {
if e != nil {
return
}
for k, refVocab := range p.References {
// Create a copy, but with the Reference moved to Vocab.
refP := p
refP.Vocab = *refVocab
delete(refP.References, k)
var refV vocabulary
refV, e = c.convertVocabulary(refP)
if e != nil {
return
}
v.References[k] = &refV
}
f, e = c.convertToFiles(v)
return
}
func (c Converter) convertToFiles(v vocabulary) (f []*File, e error) {
for _, _ = range v.Kinds {
// TODO: Implement
// Values -- include all referenced values too.
for _, v := range v.Values {
pkg := c.valuePackage(v)
f = append(f, convertValue(pkg, v))
}
for _, ref := range v.References {
for _, v := range ref.Values {
pkg := c.valuePackage(v)
f = append(f, convertValue(pkg, v))
}
}
// Functional Properties
for _, i := range v.FProps {
var pm *props.PackageManager
pm, e = c.propertyPackageManager(i)
@ -119,6 +144,7 @@ func (c Converter) convertToFiles(v vocabulary) (f []*File, e error) {
Directory: pub.WriteDir(),
})
}
// Non-Functional Properties
for _, i := range v.NFProps {
var pm *props.PackageManager
pm, e = c.propertyPackageManager(i)
@ -135,7 +161,7 @@ func (c Converter) convertToFiles(v vocabulary) (f []*File, e error) {
FileName: fmt.Sprintf("gen_%s.go", i.PropertyName()),
Directory: priv.WriteDir(),
})
// TODO: Interface
// Interface
pub := pm.PublicPackage()
file = jen.NewFilePath(pub.Path())
for _, intf := range i.InterfaceDefinitions(pm.PublicPackage()) {
@ -147,6 +173,7 @@ func (c Converter) convertToFiles(v vocabulary) (f []*File, e error) {
Directory: pub.WriteDir(),
})
}
// Types
for _, i := range v.Types {
var pm *props.PackageManager
pm, e = c.typePackageManager(i)
@ -162,7 +189,7 @@ func (c Converter) convertToFiles(v vocabulary) (f []*File, e error) {
FileName: fmt.Sprintf("gen_%s.go", i.TypeName()),
Directory: priv.WriteDir(),
})
// TODO: Interface
// Interface
pub := pm.PublicPackage()
file = jen.NewFilePath(pub.Path())
file.Add(i.InterfaceDefinition(pm.PublicPackage()).Definition())
@ -197,13 +224,13 @@ func (c Converter) convertToFiles(v vocabulary) (f []*File, e error) {
func (c Converter) convertVocabulary(p *rdf.ParsedVocabulary) (v vocabulary, e error) {
v = newVocabulary()
for k, val := range p.Vocab.Values {
v.Kinds[k] = c.convertValue(val)
v.Values[k] = c.convertValue(val)
}
for k, prop := range p.Vocab.Properties {
if prop.Functional {
v.FProps[k], e = c.convertFunctionalProperty(prop, v.Kinds, p.Vocab, p.References)
v.FProps[k], e = c.convertFunctionalProperty(prop, v.Values, p.Vocab, p.References)
} else {
v.NFProps[k], e = c.convertNonFunctionalProperty(prop, v.Kinds, p.Vocab, p.References)
v.NFProps[k], e = c.convertNonFunctionalProperty(prop, v.Values, p.Vocab, p.References)
}
if e != nil {
return
@ -326,6 +353,9 @@ func (c Converter) convertType(t rdf.VocabularyType,
// Pass in properties whose range is this type so it can build
// references properly.
//
// Note that the Kinds container on properties contains both types and
// values.
//
// TODO: Enable this for referenced properties.
name := c.convertTypeToName(t)
var rangeProps []props.Property
@ -401,14 +431,20 @@ func (c Converter) convertNonFunctionalProperty(p rdf.VocabularyProperty,
}
func (c Converter) convertValue(v rdf.VocabularyValue) (k *props.Kind) {
s := v.SerializeFn.CloneToPackage(c.vocabValuePackage(v).Path())
d := v.DeserializeFn.CloneToPackage(c.vocabValuePackage(v).Path())
l := v.LessFn.CloneToPackage(c.vocabValuePackage(v).Path())
k = &props.Kind{
Name: c.toIdentifier(v),
// TODO: Add Qualifier
ConcreteKind: jen.Id(v.DefinitionType),
Nilable: c.isNilable(v.DefinitionType),
SerializeFn: v.SerializeFn.QualifiedName(),
DeserializeFn: v.DeserializeFn.QualifiedName(),
LessFn: v.LessFn.QualifiedName(),
ConcreteKind: jen.Id(v.DefinitionType),
Nilable: c.isNilable(v.DefinitionType),
SerializeFn: s.QualifiedName(),
DeserializeFn: d.QualifiedName(),
LessFn: l.QualifiedName(),
SerializeDef: s,
DeserializeDef: d,
LessDef: l,
}
return
}
@ -423,7 +459,7 @@ func (c Converter) convertTypeToKind(v rdf.VocabularyType) (k *props.Kind, e err
// - DeserializeFn
// - LessFn
//
// The TypeGenerator is responsible for calling setKindFns on
// The TypeGenerator is responsible for calling SetKindFns on
// the properties, to property wire a Property's Kind back to
// the Type's implementation.
}
@ -490,6 +526,14 @@ func (c Converter) propertyKinds(v rdf.VocabularyProperty,
return
}
func (c Converter) valuePackage(v *props.Kind) props.Package {
return c.ValueRoot.Sub(v.Name.LowerName).PublicPackage()
}
func (c Converter) vocabValuePackage(v rdf.VocabularyValue) props.Package {
return c.ValueRoot.Sub(c.toIdentifier(v).LowerName).PublicPackage()
}
func (c Converter) typePackageManager(v typeNamer) (pkg *props.PackageManager, e error) {
switch c.TypePackagePolicy {
case TypeFlatUnderRoot:
@ -559,3 +603,18 @@ func allExtendsAreIn(t rdf.VocabularyType, v map[string]*props.TypeGenerator) bo
}
return true
}
func convertValue(pkg props.Package, v *props.Kind) *File {
file := jen.NewFilePath(pkg.Path())
file.Add(
v.SerializeDef.Definition(),
).Line().Add(
v.DeserializeDef.Definition(),
).Line().Add(
v.LessDef.Definition())
return &File{
F: file,
FileName: fmt.Sprintf("gen_%s.go", v.Name.LowerName),
Directory: pkg.WriteDir(),
}
}

1
tools/exp/main.go
ファイルの表示

@ -86,6 +86,7 @@ func main() {
c := &convert.Converter{
Registry: registry,
VocabularyRoot: props.NewPackageManager(*prefix, "gen/as"),
ValueRoot: props.NewPackageManager(*prefix, "gen/vals"),
PropertyPackagePolicy: convert.PropertyFlatUnderRoot,
PropertyPackageRoot: props.NewPackageManager(*prefix, "gen/as/props"),
TypePackagePolicy: convert.TypeFlatUnderRoot,

3
tools/exp/props/pkg.go
ファイルの表示

@ -19,7 +19,7 @@ func NewPackageManager(prefix, root string) *PackageManager {
prefix: prefix,
root: root,
public: "",
private: "internal",
private: "impl",
}
}
@ -36,6 +36,7 @@ func (p *PackageManager) PrivatePackage() Package {
// Sub creates a PackageManager clone that manages a subdirectory.
func (p *PackageManager) Sub(name string) *PackageManager {
return &PackageManager{
prefix: p.prefix,
root: fmt.Sprintf("%s/%s", p.root, name),
public: p.public,
private: p.private,

10
tools/exp/props/property.go
ファイルの表示

@ -65,12 +65,22 @@ type Kind struct {
// ConcreteKind is expected to be properly qualified.
ConcreteKind *jen.Statement
Nilable bool
// TODO: Untangle the package management mess so that the below do not
// need to be duplicated.
// These <FuncName>Fn types are for qualified names of the functions.
// Expected to always be non-nil: a function is needed to deserialize.
DeserializeFn *jen.Statement
// If any of these are nil at generation time, assume to call the method
// on the object directly (instead of a qualified function).
SerializeFn *jen.Statement
LessFn *jen.Statement
// The following are only used for values, not types, as actual implementations
SerializeDef *codegen.Function
DeserializeDef *codegen.Function
LessDef *codegen.Function
}
func (k Kind) lessFnCode(this, other *jen.Statement) *jen.Statement {

6
tools/exp/rdf/xsd/ontology.go
ファイルの表示

@ -201,21 +201,21 @@ func (a *anyURI) Apply(key string, value interface{}, ctx *rdf.ParsingContext) (
SerializeFn: rdf.SerializeValueFunction(
a.pkg,
anyURISpec,
jen.Op("*").Qual("url", "URL"),
jen.Op("*").Qual("net/url", "URL"),
[]jen.Code{
// TODO
}),
DeserializeFn: rdf.DeserializeValueFunction(
a.pkg,
anyURISpec,
jen.Op("*").Qual("url", "URL"),
jen.Op("*").Qual("net/url", "URL"),
[]jen.Code{
// TODO
}),
LessFn: rdf.LessFunction(
a.pkg,
anyURISpec,
jen.Op("*").Qual("url", "URL"),
jen.Op("*").Qual("net/url", "URL"),
[]jen.Code{
// TODO
}),