From 48df99f07f287706ecec12ef84a075d2e53a4d6a Mon Sep 17 00:00:00 2001 From: Cory Slep Date: Thu, 3 Jan 2019 22:27:14 +0100 Subject: [PATCH] Fix double-calling value Kind functions --- tools/exp/codegen/method.go | 5 +++++ tools/exp/convert/convert.go | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/exp/codegen/method.go b/tools/exp/codegen/method.go index 31c6157..deab0cf 100644 --- a/tools/exp/codegen/method.go +++ b/tools/exp/codegen/method.go @@ -85,6 +85,11 @@ func (m Function) Name() string { return m.name } +// QualifiedName returns the qualified identifier for this function. +func (m Function) QualifiedName() *jen.Statement { + return m.qual.Clone() +} + // Method represents a method on a type, not a free function, for Go code to be // generated. type Method struct { diff --git a/tools/exp/convert/convert.go b/tools/exp/convert/convert.go index 1622ade..39bc4db 100644 --- a/tools/exp/convert/convert.go +++ b/tools/exp/convert/convert.go @@ -404,12 +404,11 @@ func (c Converter) convertValue(v rdf.VocabularyValue) (k *props.Kind) { k = &props.Kind{ Name: c.toIdentifier(v), // TODO: Add Qualifier - ConcreteKind: jen.Id(v.DefinitionType), - Nilable: c.isNilable(v.DefinitionType), - // TODO: Fix Qualifying calls? - SerializeFn: jen.Empty().Add(v.SerializeFn.Call()), - DeserializeFn: jen.Empty().Add(v.DeserializeFn.Call()), - LessFn: jen.Empty().Add(v.LessFn.Call()), + ConcreteKind: jen.Id(v.DefinitionType), + Nilable: c.isNilable(v.DefinitionType), + SerializeFn: v.SerializeFn.QualifiedName(), + DeserializeFn: v.DeserializeFn.QualifiedName(), + LessFn: v.LessFn.QualifiedName(), } return }